- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11683-g3f8badd
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 (commit) via b8d5cee5d7dd90aecdd109da06b3f7e4cbf8ea08 (commit) from bf9def5d50aab33dda6a38e4aa9b820a1f0c086a (commit) - Log ----------------------------------------------------------------- commit 3f8badd37f3e7ea78a718660e615ecf1c856e2f0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:53:41 2011 +0200 Replace tabs with spaces, cleanup identation commit b8d5cee5d7dd90aecdd109da06b3f7e4cbf8ea08 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:39:00 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: db_structure.php | 20 +- docs.css | 30 ++-- js/functions.js | 220 +++++++++--------- js/navigation.js | 16 +- libraries/auth/swekey/swekey.auth.lib.php | 176 +++++++------- libraries/auth/swekey/swekey.php | 208 +++++++++--------- libraries/engines/pbms.lib.php | 2 +- libraries/import.lib.php | 360 ++++++++++++++-------------- libraries/rte/rte_words.lib.php | 86 ++++---- pmd/styles/default/style1.css | 182 ++++++++-------- pmd_general.php | 142 ++++++------ server_synchronize.php | 116 +++++----- setup/config.php | 38 ++-- 13 files changed, 798 insertions(+), 798 deletions(-) diff --git a/db_structure.php b/db_structure.php index 2bae5a7..01c2156 100644 --- a/db_structure.php +++ b/db_structure.php @@ -58,17 +58,17 @@ $titles = PMA_buildActionTitles(); // 1. No tables if ($num_tables == 0) { - echo '<p>' . __('No tables found in database') . '</p>' . "\n"; + echo '<p>' . __('No tables found in database') . '</p>' . "\n"; - if (empty($db_is_information_schema)) { - require './libraries/display_create_table.lib.php'; - } // end if (Create Table dialog) + if (empty($db_is_information_schema)) { + require './libraries/display_create_table.lib.php'; + } // end if (Create Table dialog) - /** - * Displays the footer - */ - require_once './libraries/footer.inc.php'; - exit; + /** + * Displays the footer + */ + require_once './libraries/footer.inc.php'; + exit; } // else @@ -176,7 +176,7 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; - // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM // Both are aliases for MERGE case 'MRG_MyISAM' : case 'MRG_MYISAM' : diff --git a/docs.css b/docs.css index 96574d9..7e15537 100644 --- a/docs.css +++ b/docs.css @@ -18,8 +18,8 @@ img { #header { margin: 0px; padding: 1em 0.5em 0.5em 1em; - background: #036; - border: 0px; + background: #036; + border: 0px; border-bottom: 1px solid black; } @@ -31,16 +31,16 @@ img { } #header h1 a { - color: #7584b3; + color: #7584b3; } #header h1 a .myadmin { - color: #ffad17; + color: #ffad17; } #body { - margin: 2em 1em 1em 1em; - padding: 0px; + margin: 2em 1em 1em 1em; + padding: 0px; padding-right: 13em; } @@ -54,13 +54,13 @@ ul#footer { font-size: smaller; list-style: none; float: left; - padding: 1em; + padding: 1em; color: gray; border: none; } #footer a { - color: #c19e66; + color: #c19e66; } abbr, acronym { @@ -73,12 +73,12 @@ abbr, acronym { a { text-decoration: none; - color: #c17d11; + color: #c17d11; } a:hover { - text-decoration: underline; - color: #8f5902; + text-decoration: underline; + color: #8f5902; } sup { @@ -128,22 +128,22 @@ ul.header a:hover { } h2 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h3 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h4, h5 { - color: #727e0a; + color: #727e0a; max-width: 70em; } h4 a { - color: #727e0a; + color: #727e0a; } p { diff --git a/js/functions.js b/js/functions.js index dbb962d..1e2cced 100644 --- a/js/functions.js +++ b/js/functions.js @@ -28,7 +28,7 @@ var codemirror_editor = false; * @var chart_activeTimeouts object active timeouts that refresh the charts. When disabling a realtime chart, this can be used to stop the continuous ajax requests */ var chart_activeTimeouts = new Object(); - + /** * Add a hidden field to the form to indicate that this will be an @@ -140,8 +140,8 @@ function PMA_addDatepicker($this_element, options) { if ($this_element.is('.datetimefield')) { showTimeOption = true; } - - var defaultOptions = { + + var defaultOptions = { showOn: 'button', buttonImage: themeCalendarImage, // defined in js/messages.php buttonImageOnly: true, @@ -159,11 +159,11 @@ function PMA_addDatepicker($this_element, options) { // Fix wrong timepicker z-index, doesn't work without timeout setTimeout(function() { - $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) + $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) },0); }, constrainInput: false - }; + }; $this_element.datepicker($.extend(defaultOptions, options)); } @@ -630,13 +630,13 @@ $(document).ready(function() { return; } var $tr = $(this); - + // make the table unselectable (to prevent default highlighting when shift+click) $tr.parents('table').noSelect(); - + if (!e.shiftKey || last_clicked_row == -1) { // usual click - + // XXX: FF fires two click events for <label> (label and checkbox), so we need to handle this differently var $checkbox = $tr.find(':checkbox'); if ($checkbox.length) { @@ -657,14 +657,14 @@ $(document).ready(function() { $tr.toggleClass('marked'); last_click_checked = false; } - + // remember the last clicked row last_clicked_row = last_click_checked ? $('tr.odd:not(.noclick), tr.even:not(.noclick)').index(this) : -1; last_shift_clicked_row = -1; } else { // handle the shift click var start, end; - + // clear last shift click result if (last_shift_clicked_row >= 0) { if (last_shift_clicked_row >= last_clicked_row) { @@ -680,7 +680,7 @@ $(document).ready(function() { .find(':checkbox') .attr('checked', false); } - + // handle new shift click var curr_row = $('tr.odd:not(.noclick), tr.even:not(.noclick)').index(this); if (curr_row >= last_clicked_row) { @@ -695,7 +695,7 @@ $(document).ready(function() { .addClass('marked') .find(':checkbox') .attr('checked', true); - + // remember the last shift clicked row last_shift_clicked_row = curr_row; } @@ -1452,17 +1452,17 @@ function PMA_createTableDialog( div, url , target) { * realtime: { * url: adress to get the data from (will always add token, ajax_request=1 and chart_data=1 to the GET request) * type: the GET request will also add type=[value of the type property] to the request - * callback: Callback function that should draw the point, it's called with 4 parameters in this order: + * callback: Callback function that should draw the point, it's called with 4 parameters in this order: * - the chart object * - the current response value of the GET request, JSON parsed * - the previous response value of the GET request, JSON parsed * - the number of added points - * + * * @return object The created highcharts instance */ function PMA_createChart(passedSettings) { var container = passedSettings.chart.renderTo; - + var settings = { chart: { type: 'spline', @@ -1475,45 +1475,45 @@ function PMA_createChart(passedSettings) { var lastValue = null, curValue = null; var numLoadedPoints = 0, otherSum = 0; var diff; - + // No realtime updates for graphs that are being exported, and disabled when realtime is not set // Also don't do live charting if we don't have the server time - if(thisChart.options.chart.forExport == true || - ! thisChart.options.realtime || + if(thisChart.options.chart.forExport == true || + ! thisChart.options.realtime || ! thisChart.options.realtime.callback || ! server_time_diff) return; - + thisChart.options.realtime.timeoutCallBack = function() { thisChart.options.realtime.postRequest = $.post( thisChart.options.realtime.url, thisChart.options.realtime.postData, function(data) { curValue = jQuery.parseJSON(data); - + if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; else diff = parseInt(curValue.x - lastValue.x); - + thisChart.xAxis[0].setExtremes( - thisChart.xAxis[0].getExtremes().min+diff, - thisChart.xAxis[0].getExtremes().max+diff, + thisChart.xAxis[0].getExtremes().min+diff, + thisChart.xAxis[0].getExtremes().max+diff, false ); - + thisChart.options.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); - + lastValue = curValue; numLoadedPoints++; - + // Timeout has been cleared => don't start a new timeout if(chart_activeTimeouts[container] == null) return; - + chart_activeTimeouts[container] = setTimeout( - thisChart.options.realtime.timeoutCallBack, + thisChart.options.realtime.timeoutCallBack, thisChart.options.realtime.refreshRate - ); + ); }); } - + chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, 5); } } @@ -1545,7 +1545,7 @@ function PMA_createChart(passedSettings) { tooltip: { formatter: function() { return '<b>' + this.series.name +'</b><br/>' + - Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + Highcharts.numberFormat(this.y, 2); } }, @@ -1554,18 +1554,18 @@ function PMA_createChart(passedSettings) { }, series: [] } - + /* Set/Get realtime chart default values */ - if(passedSettings.realtime) { - if(!passedSettings.realtime.refreshRate) + if(passedSettings.realtime) { + if(!passedSettings.realtime.refreshRate) passedSettings.realtime.refreshRate = 5000; - - if(!passedSettings.realtime.numMaxPoints) + + if(!passedSettings.realtime.numMaxPoints) passedSettings.realtime.numMaxPoints = 30; - + // Allow custom POST vars to be added passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData); - + if(server_time_diff) { settings.xAxis.min = new Date().getTime() - server_time_diff - passedSettings.realtime.numMaxPoints * passedSettings.realtime.refreshRate; settings.xAxis.max = new Date().getTime() - server_time_diff + passedSettings.realtime.refreshRate; @@ -2284,9 +2284,9 @@ function checkIndexName(form_id) /** * function to convert the footnotes to tooltips * - * @param jquery-Object $div a div jquery object which specifies the - * domain for searching footnootes. If we - * ommit this parameter the function searches + * @param jquery-Object $div a div jquery object which specifies the + * domain for searching footnootes. If we + * ommit this parameter the function searches * the footnotes in the whole body **/ function PMA_convertFootnotesToTooltips($div) { @@ -2485,65 +2485,65 @@ var toggleButton = function ($obj) { } else { var right = 'left'; } - /** - * var h Height of the button, used to scale the - * background image and position the layers - */ - var h = $obj.height(); - $('img', $obj).height(h); - $('table', $obj).css('bottom', h-1); - /** - * var on Width of the "ON" part of the toggle switch - * var off Width of the "OFF" part of the toggle switch - */ - var on = $('.toggleOn', $obj).width(); - var off = $('.toggleOff', $obj).width(); - // Make the "ON" and "OFF" parts of the switch the same size - $('.toggleOn > div', $obj).width(Math.max(on, off)); - $('.toggleOff > div', $obj).width(Math.max(on, off)); - /** - * var w Width of the central part of the switch - */ - var w = parseInt(($('img', $obj).height() / 16) * 22, 10); - // Resize the central part of the switch on the top - // layer to match the background - $('table td:nth-child(2) > div', $obj).width(w); - /** - * var imgw Width of the background image - * var tblw Width of the foreground layer - * var offset By how many pixels to move the background - * image, so that it matches the top layer - */ - var imgw = $('img', $obj).width(); - var tblw = $('table', $obj).width(); - var offset = parseInt(((imgw - tblw) / 2), 10); - // Move the background to match the layout of the top layer - $obj.find('img').css(right, offset); - /** - * var offw Outer width of the "ON" part of the toggle switch - * var btnw Outer width of the central part of the switch - */ - var offw = $('.toggleOff', $obj).outerWidth(); - var btnw = $('table td:nth-child(2)', $obj).outerWidth(); - // Resize the main div so that exactly one side of - // the switch plus the central part fit into it. - $obj.width(offw + btnw + 2); - /** - * var move How many pixels to move the - * switch by when toggling - */ - var move = $('.toggleOff', $obj).outerWidth(); - // If the switch is initialized to the - // OFF state we need to move it now. - if ($('.container', $obj).hasClass('off')) { + /** + * var h Height of the button, used to scale the + * background image and position the layers + */ + var h = $obj.height(); + $('img', $obj).height(h); + $('table', $obj).css('bottom', h-1); + /** + * var on Width of the "ON" part of the toggle switch + * var off Width of the "OFF" part of the toggle switch + */ + var on = $('.toggleOn', $obj).width(); + var off = $('.toggleOff', $obj).width(); + // Make the "ON" and "OFF" parts of the switch the same size + $('.toggleOn > div', $obj).width(Math.max(on, off)); + $('.toggleOff > div', $obj).width(Math.max(on, off)); + /** + * var w Width of the central part of the switch + */ + var w = parseInt(($('img', $obj).height() / 16) * 22, 10); + // Resize the central part of the switch on the top + // layer to match the background + $('table td:nth-child(2) > div', $obj).width(w); + /** + * var imgw Width of the background image + * var tblw Width of the foreground layer + * var offset By how many pixels to move the background + * image, so that it matches the top layer + */ + var imgw = $('img', $obj).width(); + var tblw = $('table', $obj).width(); + var offset = parseInt(((imgw - tblw) / 2), 10); + // Move the background to match the layout of the top layer + $obj.find('img').css(right, offset); + /** + * var offw Outer width of the "ON" part of the toggle switch + * var btnw Outer width of the central part of the switch + */ + var offw = $('.toggleOff', $obj).outerWidth(); + var btnw = $('table td:nth-child(2)', $obj).outerWidth(); + // Resize the main div so that exactly one side of + // the switch plus the central part fit into it. + $obj.width(offw + btnw + 2); + /** + * var move How many pixels to move the + * switch by when toggling + */ + var move = $('.toggleOff', $obj).outerWidth(); + // If the switch is initialized to the + // OFF state we need to move it now. + if ($('.container', $obj).hasClass('off')) { if (right == 'right') { - $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0); + $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0); } else { - $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0); + $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0); } - } - // Attach an 'onclick' event to the switch - $('.container', $obj).click(function () { + } + // Attach an 'onclick' event to the switch + $('.container', $obj).click(function () { if ($(this).hasClass('isActive')) { return false; } else { @@ -2552,8 +2552,8 @@ var toggleButton = function ($obj) { var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); var $container = $(this); var callback = $('.callback', this).text(); - // Perform the actual toggle - if ($(this).hasClass('on')) { + // Perform the actual toggle + if ($(this).hasClass('on')) { if (right == 'right') { var operator = '-='; } else { @@ -2562,7 +2562,7 @@ var toggleButton = function ($obj) { var url = $(this).find('.toggleOff > span').text(); var removeClass = 'on'; var addClass = 'off'; - } else { + } else { if (right == 'right') { var operator = '+='; } else { @@ -2575,10 +2575,10 @@ var toggleButton = function ($obj) { $.post(url, {'ajax_request': true}, function(data) { if(data.success == true) { PMA_ajaxRemoveMessage($msg); - $container - .removeClass(removeClass) - .addClass(addClass) - .animate({'left': operator + move + 'px'}, function () { + $container + .removeClass(removeClass) + .addClass(addClass) + .animate({'left': operator + move + 'px'}, function () { $container.removeClass('isActive'); }); eval(callback); @@ -2587,7 +2587,7 @@ var toggleButton = function ($obj) { $container.removeClass('isActive'); } }); - }); + }); }; /** @@ -2598,8 +2598,8 @@ $(window).load(function () { $(this) .show() .find('.toggleButton') - toggleButton($(this)); - }); + toggleButton($(this)); + }); }); /** @@ -2641,7 +2641,7 @@ $(document).ready(function() { $checkbox.attr('checked', checked); } // for all td of the same vertical row, toggle the marked class - if (checked) { + if (checked) { $('.vmarker').filter('.row_' + row_num).addClass('marked'); } else { $('.vmarker').filter('.row_' + row_num).removeClass('marked'); @@ -2905,7 +2905,7 @@ $(document).ready(function() { else $(this).removeAttr('unselectable', 'on'); }); } - }; //end noSelect + }; //end noSelect })(jQuery); /** @@ -2943,7 +2943,7 @@ function PMA_createqTip($elements, content, options) { } } } - + $elements.qtip($.extend(true, o, options)); } diff --git a/js/navigation.js b/js/navigation.js index 167eb37..5ce805c 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -58,7 +58,7 @@ function PMA_saveFrameSizeReal() if (parent.text_dir == 'ltr') { pma_navi_width = parseInt(parent.document.getElementById('mainFrameset').cols) } else { - pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/) + pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/) } if ((pma_navi_width > 0) && (pma_navi_width != PMA_getCookie('pma_navi_width'))) { PMA_setCookie('pma_navi_width', pma_navi_width, expires); @@ -209,18 +209,18 @@ $(document).ready(function(){ /* Create table */ $('#newtable a.ajax').click(function(event){ event.preventDefault(); - /*Getting the url */ + /*Getting the url */ var url = $('#newtable a').attr("href"); if (url.substring(0, 15) == "tbl_create.php?") { url = url.substring(15); } - url = url +"&num_fields=&ajax_request=true"; - /*Creating a div on the frame_content frame */ - var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); - var target = "tbl_create.php"; + url = url +"&num_fields=&ajax_request=true"; + /*Creating a div on the frame_content frame */ + var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); + var target = "tbl_create.php"; - /*Calling to the createTableDialog function*/ - PMA_createTableDialog(div , url , target); + /*Calling to the createTableDialog function*/ + PMA_createTableDialog(div , url , target); });//end of create new table });//end of document get ready diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index c5f613b..184c845 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -11,24 +11,24 @@ function Swekey_auth_check() global $cfg; $confFile = $cfg['Server']['auth_swekey_config']; - if (! isset($_SESSION['SWEKEY'])) { + if (! isset($_SESSION['SWEKEY'])) { $_SESSION['SWEKEY'] = array(); } $_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && file_exists($confFile)); // Load the swekey.conf file the first time - if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { + if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { $_SESSION['SWEKEY']['CONF_LOADED'] = true; $_SESSION['SWEKEY']['VALID_SWEKEYS'] = array(); $valid_swekeys = explode("\n", @file_get_contents($confFile)); foreach ($valid_swekeys as $line) { if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false) - { - $items = explode(":", $line); - if (count($items) == 2) + { + $items = explode(":", $line); + if (count($items) == 2) $_SESSION['SWEKEY']['VALID_SWEKEYS'][$items[0]] = trim($items[1]); - } + } else if (preg_match("/^[A-Z_]+=.*$/", $line) != false) { $items = explode("=", $line); $_SESSION['SWEKEY']['CONF_'.trim($items[0])] = trim($items[1]); @@ -36,27 +36,27 @@ function Swekey_auth_check() } // Set default values for settings - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_CHECK'])) - $_SESSION['SWEKEY']['CONF_SERVER_CHECK'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'])) - $_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_SERVER_STATUS'])) - $_SESSION['SWEKEY']['CONF_SERVER_STATUS'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_CA_FILE'])) - $_SESSION['SWEKEY']['CONF_CA_FILE'] = ""; - if (! isset($_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'])) - $_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'] = true; - if (! isset($_SESSION['SWEKEY']['CONF_DEBUG'])) - $_SESSION['SWEKEY']['CONF_DEBUG'] = false; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_CHECK'])) + $_SESSION['SWEKEY']['CONF_SERVER_CHECK'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'])) + $_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_SERVER_STATUS'])) + $_SESSION['SWEKEY']['CONF_SERVER_STATUS'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_CA_FILE'])) + $_SESSION['SWEKEY']['CONF_CA_FILE'] = ""; + if (! isset($_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'])) + $_SESSION['SWEKEY']['CONF_ENABLE_TOKEN_CACHE'] = true; + if (! isset($_SESSION['SWEKEY']['CONF_DEBUG'])) + $_SESSION['SWEKEY']['CONF_DEBUG'] = false; } // check if a web key has been authenticated if ($_SESSION['SWEKEY']['ENABLED']) { if (empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) return false; - } + } - return true; + return true; } @@ -68,32 +68,32 @@ function Swekey_auth_error() if (! isset($_SESSION['SWEKEY'])) return null; - if (! $_SESSION['SWEKEY']['ENABLED']) + if (! $_SESSION['SWEKEY']['ENABLED']) return null; - require_once './libraries/auth/swekey/authentication.inc.php'; + require_once './libraries/auth/swekey/authentication.inc.php'; ?> <script> function Swekey_GetValidKey() - { - var valids = "<?php - foreach ($_SESSION['SWEKEY']['VALID_SWEKEYS'] as $key => $value) - echo $key.','; - ?>"; - var connected_keys = Swekey_ListKeyIds().split(","); - for (i in connected_keys) - if (connected_keys[i] != null && connected_keys[i].length == 32) - if (valids.indexOf(connected_keys[i]) >= 0) - return connected_keys[i]; + { + var valids = "<?php + foreach ($_SESSION['SWEKEY']['VALID_SWEKEYS'] as $key => $value) + echo $key.','; + ?>"; + var connected_keys = Swekey_ListKeyIds().split(","); + for (i in connected_keys) + if (connected_keys[i] != null && connected_keys[i].length == 32) + if (valids.indexOf(connected_keys[i]) >= 0) + return connected_keys[i]; if (connected_keys.length > 0) - if (connected_keys[0].length == 32) - return "unknown_key_" + connected_keys[0]; + if (connected_keys[0].length == 32) + return "unknown_key_" + connected_keys[0]; - return "none"; - } + return "none"; + } var key = Swekey_GetValidKey(); @@ -103,16 +103,16 @@ function Swekey_auth_error() { window.location.search = "?swekey_reset"; } - else - setTimeout("timedCheck()",1000); + else + setTimeout("timedCheck()",1000); } - setTimeout("timedCheck()",1000); + setTimeout("timedCheck()",1000); </script> - <?php + <?php - if (! empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) - return null; + if (! empty($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'])) + return null; if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0) return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']); @@ -158,7 +158,7 @@ function Swekey_auth_error() } else { $_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'] = $swekey_id; - $_SESSION['SWEKEY']['FORCE_USER'] = $_SESSION['SWEKEY']['VALID_SWEKEYS'][$swekey_id]; + $_SESSION['SWEKEY']['FORCE_USER'] = $_SESSION['SWEKEY']['VALID_SWEKEYS'][$swekey_id]; return null; } } @@ -184,19 +184,19 @@ function Swekey_auth_error() if (! isset($swekey_id)) { ?> <script> - if (key.length != 32) - { - window.location.search="?swekey_id=" + key; - } - else - { - var url = "" + window.location; - if (url.indexOf("?") > 0) - url = url.substr(0, url.indexOf("?")); - Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>"); - var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); - window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp; - } + if (key.length != 32) + { + window.location.search="?swekey_id=" + key; + } + else + { + var url = "" + window.location; + if (url.indexOf("?") > 0) + url = url.substr(0, url.indexOf("?")); + Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>"); + var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); + window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp; + } </script> <?php return __('Authenticating...'); @@ -225,7 +225,7 @@ function Swekey_login($input_name, $input_go) echo '<script type="text/javascript">'; if (empty($_SESSION['SWEKEY']['FORCE_USER'])) echo 'var user = null;'; - else + else echo 'var user = "'.$_SESSION['SWEKEY']['FORCE_USER'].'";'; ?> @@ -236,47 +236,47 @@ function Swekey_login($input_name, $input_go) var input_username = document.getElementById("<?php echo $input_name; ?>"); var input_go = document.getElementById("<?php echo $input_go; ?>"); - var swekey_status = document.createElement('img'); - swekey_status.setAttribute('onClick', 'open_swekey_site()'); - swekey_status.setAttribute('style', 'width:8px; height:16px; border:0px; vspace:0px; hspace:0px; frameborder:no'); + var swekey_status = document.createElement('img'); + swekey_status.setAttribute('onClick', 'open_swekey_site()'); + swekey_status.setAttribute('style', 'width:8px; height:16px; border:0px; vspace:0px; hspace:0px; frameborder:no'); if (user == null) - { - swekey_status.setAttribute('src', 'http://artwork.swekey.com/unplugged-8x16.png'); - //swekey_status.setAttribute('title', 'No swekey plugged'); - input_go.disabled = true; - } - else - { - swekey_status.setAttribute('src', 'http://artwork.swekey.com/plugged-8x16.png'); - //swekey_status.setAttribute('title', 'swekey plugged'); - input_username.value = user; - } - input_username.readOnly = true; - - if (input_username.nextSibling == null) - input_username.parentNode.appendChild(swekey_status); - else - input_username.parentNode.insertBefore(swekey_status, input_username.nextSibling); - - <?php + { + swekey_status.setAttribute('src', 'http://artwork.swekey.com/unplugged-8x16.png'); + //swekey_status.setAttribute('title', 'No swekey plugged'); + input_go.disabled = true; + } + else + { + swekey_status.setAttribute('src', 'http://artwork.swekey.com/plugged-8x16.png'); + //swekey_status.setAttribute('title', 'swekey plugged'); + input_username.value = user; + } + input_username.readOnly = true; + + if (input_username.nextSibling == null) + input_username.parentNode.appendChild(swekey_status); + else + input_username.parentNode.insertBefore(swekey_status, input_username.nextSibling); + + <?php echo '</script>'; - } + } } if (!empty($_GET['session_to_unset'])) { - session_write_close(); - session_id($_GET['session_to_unset']); - session_start(); - $_SESSION = array(); - session_write_close(); - session_destroy(); - exit; + session_write_close(); + session_id($_GET['session_to_unset']); + session_start(); + $_SESSION = array(); + session_write_close(); + session_destroy(); + exit; } if (isset($_GET['swekey_reset'])) { - unset($_SESSION['SWEKEY']); + unset($_SESSION['SWEKEY']); } ?> diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index b456061..869d3d5 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -128,7 +128,7 @@ function Swekey_SetStatusServer($server) function Swekey_SetCAFile($cafile) { global $gSwekeyCA; - $gSwekeyCA = $cafile; + $gSwekeyCA = $cafile; } /** @@ -142,7 +142,7 @@ function Swekey_SetCAFile($cafile) function Swekey_EnableTokenCache($enable) { global $gSwekeyTokenCacheEnabled; - $gSwekeyTokenCacheEnabled = ! empty($enable); + $gSwekeyTokenCacheEnabled = ! empty($enable); } @@ -186,51 +186,51 @@ function Swekey_HttpGet($url, &$response_code) global $gSwekeyLastResult; $gSwekeyLastResult = "<not set>"; - // use curl if available - if (function_exists('curl_init')) - { - $sess = curl_init($url); - if (substr($url, 0, 8) == "https://") - { - global $gSwekeyCA; - - if (! empty($gSwekeyCA)) - { - if (file_exists($gSwekeyCA)) - { - if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) - error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); - else - $caFileOk = true; - } - else - error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); - } - - curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); - curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); - curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); - curl_setopt($sess, CURLOPT_TIMEOUT, '20'); - } - else - { - curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); - curl_setopt($sess, CURLOPT_TIMEOUT, '5'); - } - - curl_setopt($sess, CURLOPT_RETURNTRANSFER, '1'); - $res=curl_exec($sess); - $response_code = curl_getinfo($sess, CURLINFO_HTTP_CODE); - $curlerr = curl_error($sess); - curl_close($sess); - - if ($response_code == 200) - { - $gSwekeyLastResult = $res; - return $res; - } - - if (! empty($response_code)) + // use curl if available + if (function_exists('curl_init')) + { + $sess = curl_init($url); + if (substr($url, 0, 8) == "https://") + { + global $gSwekeyCA; + + if (! empty($gSwekeyCA)) + { + if (file_exists($gSwekeyCA)) + { + if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) + error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); + else + $caFileOk = true; + } + else + error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); + } + + curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); + curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); + curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); + curl_setopt($sess, CURLOPT_TIMEOUT, '20'); + } + else + { + curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); + curl_setopt($sess, CURLOPT_TIMEOUT, '5'); + } + + curl_setopt($sess, CURLOPT_RETURNTRANSFER, '1'); + $res=curl_exec($sess); + $response_code = curl_getinfo($sess, CURLINFO_HTTP_CODE); + $curlerr = curl_error($sess); + curl_close($sess); + + if ($response_code == 200) + { + $gSwekeyLastResult = $res; + return $res; + } + + if (! empty($response_code)) { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $gSwekeyLastError ($curlerr) getting $url"); @@ -241,9 +241,9 @@ function Swekey_HttpGet($url, &$response_code) $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $curlerr getting $url"); return ""; - } + } - // use pecl_http if available + // use pecl_http if available if (class_exists('HttpRequest')) { // retry if one of the server is down @@ -276,18 +276,18 @@ function Swekey_HttpGet($url, &$response_code) { $reply = $r->send(); $res = $reply->getBody(); - $info = $r->getResponseInfo(); - $response_code = $info['response_code']; - if ($response_code != 200) - { + $info = $r->getResponseInfo(); + $response_code = $info['response_code']; + if ($response_code != 200) + { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error ".$gSwekeyLastError." getting ".$url); return ""; } - $gSwekeyLastResult = $res; - return $res; + $gSwekeyLastResult = $res; + return $res; } // catch (HttpException $e) // { @@ -301,14 +301,14 @@ function Swekey_HttpGet($url, &$response_code) return ""; } - global $http_response_header; - $res = @file_get_contents($url); - $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 - if ($response_code == 200) - { - $gSwekeyLastResult = $res; - return $res; - } + global $http_response_header; + $res = @file_get_contents($url); + $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 + if ($response_code == 200) + { + $gSwekeyLastResult = $res; + return $res; + } $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error ".$response_code." getting ".$url); @@ -336,7 +336,7 @@ function Swekey_GetRndToken() function Swekey_GetHalfRndToken() { global $gSwekeyRndTokenServer; - return Swekey_HttpGet($gSwekeyRndTokenServer.'/HALF-RND-TOKEN', $response_code); + return Swekey_HttpGet($gSwekeyRndTokenServer.'/HALF-RND-TOKEN', $response_code); } /** @@ -357,7 +357,7 @@ function Swekey_GetFastHalfRndToken() // We check if we have a valid RT is the session if (isset($_SESSION['rnd-token-date'])) if (time() - $_SESSION['rnd-token-date'] < 30) - $res = $_SESSION['rnd-token']; + $res = $_SESSION['rnd-token']; // If not we try to get it from a temp file (PHP >= 5.2.1 only) if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) @@ -367,18 +367,18 @@ function Swekey_GetFastHalfRndToken() $tempdir = sys_get_temp_dir(); $cachefile = $tempdir."/swekey-rnd-token-".get_current_user(); $modif = filemtime($cachefile); - if ($modif != false) + if ($modif != false) if (time() - $modif < 30) - { - $res = @file_get_contents($cachefile); - if (strlen($res) != 32) - $res = ""; - else - { - $_SESSION['rnd-token'] = $res; - $_SESSION['rnd-token-date'] = $modif; - } - } + { + $res = @file_get_contents($cachefile); + if (strlen($res) != 32) + $res = ""; + else + { + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = $modif; + } + } } } @@ -390,14 +390,14 @@ function Swekey_GetFastHalfRndToken() $_SESSION['rnd-token-date'] = time(); if (! empty($cachefile)) { - // we unlink the file so no possible tempfile race attack - unlink($cachefile); - $file = fopen($cachefile , "x"); - if ($file != false) - { - @fwrite($file, $res); - @fclose($file); - } + // we unlink the file so no possible tempfile race attack + unlink($cachefile); + $file = fopen($cachefile , "x"); + if ($file != false) + { + @fwrite($file, $res); + @fclose($file); + } } } @@ -434,8 +434,8 @@ function Swekey_GetFastRndToken() function Swekey_CheckOtp($id, $rt, $otp) { global $gSwekeyCheckServer; - $res = Swekey_HttpGet($gSwekeyCheckServer.'/CHECK-OTP/'.$id.'/'.$rt.'/'.$otp, $response_code); - return $response_code == 200 && $res == "OK"; + $res = Swekey_HttpGet($gSwekeyCheckServer.'/CHECK-OTP/'.$id.'/'.$rt.'/'.$otp, $response_code); + return $response_code == 200 && $res == "OK"; } /** @@ -445,9 +445,9 @@ function Swekey_CheckOtp($id, $rt, $otp) define ("SWEKEY_STATUS_OK",0); define ("SWEKEY_STATUS_NOT_FOUND",1); // The key does not exist in the db define ("SWEKEY_STATUS_INACTIVE",2); // The key has never been activated -define ("SWEKEY_STATUS_LOST",3); // The user has lost his key -define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen -define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid +define ("SWEKEY_STATUS_LOST",3); // The user has lost his key +define ("SWEKEY_STATUS_STOLEN",4); // The key was stolen +define ("SWEKEY_STATUS_FEE_DUE",5); // The annual fee was not paid define ("SWEKEY_STATUS_OBSOLETE",6); // The hardware is no longer supported define ("SWEKEY_STATUS_UNKOWN",201); // We could not connect to the authentication server @@ -455,7 +455,7 @@ define ("SWEKEY_STATUS_UNKOWN",201); // We could not connect to the authentica * Values that are associated with a key. * The Javascript Api can also return the following values */ -define ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key +define ("SWEKEY_STATUS_REPLACED",100); // This key has been replaced by a backup key define ("SWEKEY_STATUS_BACKUP_KEY",101); // This key is a backup key that is not activated yet define ("SWEKEY_STATUS_NOTPLUGGED",200); // This key is not plugged in the computer @@ -469,21 +469,21 @@ define ("SWEKEY_STATUS_NOTPLUGGED",200); // This key is not plugged in the compu */ function Swekey_GetStatusStr($status) { - switch($status) - { - case SWEKEY_STATUS_OK : return 'OK'; - case SWEKEY_STATUS_NOT_FOUND : return 'Key does not exist in the db'; - case SWEKEY_STATUS_INACTIVE : return 'Key not activated'; - case SWEKEY_STATUS_LOST : return 'Key was lost'; - case SWEKEY_STATUS_STOLEN : return 'Key was stolen'; - case SWEKEY_STATUS_FEE_DUE : return 'The annual fee was not paid'; - case SWEKEY_STATUS_OBSOLETE : return 'Key no longer supported'; - case SWEKEY_STATUS_REPLACED : return 'This key has been replaced by a backup key'; + switch($status) + { + case SWEKEY_STATUS_OK : return 'OK'; + case SWEKEY_STATUS_NOT_FOUND : return 'Key does not exist in the db'; + case SWEKEY_STATUS_INACTIVE : return 'Key not activated'; + case SWEKEY_STATUS_LOST : return 'Key was lost'; + case SWEKEY_STATUS_STOLEN : return 'Key was stolen'; + case SWEKEY_STATUS_FEE_DUE : return 'The annual fee was not paid'; + case SWEKEY_STATUS_OBSOLETE : return 'Key no longer supported'; + case SWEKEY_STATUS_REPLACED : return 'This key has been replaced by a backup key'; case SWEKEY_STATUS_BACKUP_KEY : return 'This key is a backup key that is not activated yet'; case SWEKEY_STATUS_NOTPLUGGED : return 'This key is not plugged in the computer'; - case SWEKEY_STATUS_UNKOWN : return 'Unknow Status, could not connect to the authentication server'; - } - return 'unknown status '.$status; + case SWEKEY_STATUS_UNKOWN : return 'Unknow Status, could not connect to the authentication server'; + } + return 'unknown status '.$status; } /** @@ -497,7 +497,7 @@ function Swekey_GetStatusStr($status) function Swekey_GetStatus($id) { global $gSwekeyStatusServer; - $res = Swekey_HttpGet($gSwekeyStatusServer.'/GET-STATUS/'.$id, $response_code); + $res = Swekey_HttpGet($gSwekeyStatusServer.'/GET-STATUS/'.$id, $response_code); if ($response_code == 200) return intval($res); diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php index 7f8c44b..7f8f58c 100644 --- a/libraries/engines/pbms.lib.php +++ b/libraries/engines/pbms.lib.php @@ -23,7 +23,7 @@ class PMA_StorageEngine_pbms extends PMA_StorageEngine $this->support = PMA_ENGINE_SUPPORT_YES; } - function getVariables() + function getVariables() { return array( 'pbms_garbage_threshold' => array( diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 73f9008..f257205 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -336,35 +336,35 @@ function PMA_importGetNextChunk($size = 32768) */ function PMA_getColumnAlphaName($num) { - $A = 65; // ASCII value for capital "A" - $col_name = ""; - - if ($num > 26) { - $div = (int)($num / 26); - $remain = (int)($num % 26); - - // subtract 1 of divided value in case the modulus is 0, - // this is necessary because A-Z has no 'zero' - if ($remain == 0) { - $div--; - } - - // recursive function call - $col_name = PMA_getColumnAlphaName($div); - // use modulus as new column number - $num = $remain; - } - - if ($num == 0) { - // use 'Z' if column number is 0, - // this is necessary because A-Z has no 'zero' - $col_name .= chr(($A + 26) - 1); - } else { - // convert column number to ASCII character - $col_name .= chr(($A + $num) - 1); - } - - return $col_name; + $A = 65; // ASCII value for capital "A" + $col_name = ""; + + if ($num > 26) { + $div = (int)($num / 26); + $remain = (int)($num % 26); + + // subtract 1 of divided value in case the modulus is 0, + // this is necessary because A-Z has no 'zero' + if ($remain == 0) { + $div--; + } + + // recursive function call + $col_name = PMA_getColumnAlphaName($div); + // use modulus as new column number + $num = $remain; + } + + if ($num == 0) { + // use 'Z' if column number is 0, + // this is necessary because A-Z has no 'zero' + $col_name .= chr(($A + 26) - 1); + } else { + // convert column number to ASCII character + $col_name .= chr(($A + $num) - 1); + } + + return $col_name; } /** @@ -387,19 +387,19 @@ function PMA_getColumnNumberFromName($name) { $num_chars = strlen($name); $column_number = 0; for ($i = 0; $i < $num_chars; ++$i) { - // read string from back to front - $char_pos = ($num_chars - 1) - $i; - - // convert capital character to ASCII value - // and subtract 64 to get corresponding decimal value - // ASCII value of "A" is 65, "B" is 66, etc. - // Decimal equivalent of "A" is 1, "B" is 2, etc. - $number = (ord($name[$char_pos]) - 64); - - // base26 to base10 conversion : multiply each number - // with corresponding value of the position, in this case - // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... - $column_number += $number * pow(26,$i); + // read string from back to front + $char_pos = ($num_chars - 1) - $i; + + // convert capital character to ASCII value + // and subtract 64 to get corresponding decimal value + // ASCII value of "A" is 65, "B" is 66, etc. + // Decimal equivalent of "A" is 1, "B" is 2, etc. + $number = (ord($name[$char_pos]) - 64); + + // base26 to base10 conversion : multiply each number + // with corresponding value of the position, in this case + // $i=0 : 1; $i=1 : 26; $i=2 : 676; ... + $column_number += $number * pow(26,$i); } return $column_number; } else { @@ -453,7 +453,7 @@ function PMA_getM($last_cumulative_size) { * @return int Scale of the given decimal size notation */ function PMA_getD($last_cumulative_size) { - return (int)substr($last_cumulative_size, (strpos($last_cumulative_size, ",") + 1), (strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))); + return (int)substr($last_cumulative_size, (strpos($last_cumulative_size, ",") + 1), (strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))); } /** @@ -489,7 +489,7 @@ function PMA_getDecimalSize(&$cell) { * @return string Size of the given cell in the type-appropriate format */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { - $curr_size = strlen((string)$cell); + $curr_size = strlen((string)$cell); /** * If the cell is NULL, don't treat it as a varchar @@ -500,17 +500,17 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * What to do if the current cell is of type VARCHAR */ - elseif ($curr_type == VARCHAR) { + elseif ($curr_type == VARCHAR) { /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($last_cumulative_type == VARCHAR) { + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ @@ -522,7 +522,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } else { return $oldM; } - } + } /** * The last cumulative type was BIGINT or INT */ @@ -532,7 +532,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } else { return $last_cumulative_size; } - } + } /** * This is the first row to be analyzed */ @@ -549,7 +549,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type return -1; } - } + } /** * What to do if the current cell is of type DECIMAL */ @@ -557,66 +557,66 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { + if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - if ($size[M] >= $last_cumulative_size) { - return $size[M]; + if ($size[M] >= $last_cumulative_size) { + return $size[M]; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - $oldM = PMA_getM($last_cumulative_size); - $oldD = PMA_getD($last_cumulative_size); + $oldM = PMA_getM($last_cumulative_size); + $oldD = PMA_getD($last_cumulative_size); - /* New val if M or D is greater than current largest */ - if ($size[M] > $oldM || $size[D] > $oldD) { - /* Take the largest of both types */ - return (string)((($size[M] > $oldM) ? $size[M] : $oldM) . "," . (($size[D] > $oldD) ? $size[D] : $oldD)); + /* New val if M or D is greater than current largest */ + if ($size[M] > $oldM || $size[D] > $oldD) { + /* Take the largest of both types */ + return (string)((($size[M] > $oldM) ? $size[M] : $oldM) . "," . (($size[D] > $oldD) ? $size[D] : $oldD)); } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was BIGINT or INT */ elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { - /* Convert $last_cumulative_size from int to decimal format */ - $size = PMA_getDecimalSize($cell); + /* Convert $last_cumulative_size from int to decimal format */ + $size = PMA_getDecimalSize($cell); - if ($size[M] >= $last_cumulative_size) { - return $size[FULL]; + if ($size[M] >= $last_cumulative_size) { + return $size[FULL]; } else { - return ($last_cumulative_size.",".$size[D]); + return ($last_cumulative_size.",".$size[D]); } - } + } /** * This is the first row to be analyzed */ elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) { /* First row of the column */ - $size = PMA_getDecimalSize($cell); + $size = PMA_getDecimalSize($cell); - return $size[FULL]; - } + return $size[FULL]; + } /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ return -1; } - } + } /** * What to do if the current cell is of type BIGINT or INT */ @@ -624,41 +624,41 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * The last cumulative type was VARCHAR */ - if ($last_cumulative_type == VARCHAR) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($last_cumulative_type == VARCHAR) { + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); - $oldD = PMA_getD($last_cumulative_size); - $oldInt = $oldM - $oldD; - $newInt = strlen((string)$cell); - - /* See which has the larger integer length */ - if ($oldInt >= $newInt) { - /* Use old decimal size */ - return $last_cumulative_size; + $oldD = PMA_getD($last_cumulative_size); + $oldInt = $oldM - $oldD; + $newInt = strlen((string)$cell); + + /* See which has the larger integer length */ + if ($oldInt >= $newInt) { + /* Use old decimal size */ + return $last_cumulative_size; } else { - /* Use $newInt + $oldD as new M */ - return (($newInt + $oldD) . "," . $oldD); + /* Use $newInt + $oldD as new M */ + return (($newInt + $oldD) . "," . $oldD); } - } + } /** * The last cumulative type was BIGINT or INT */ elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { - if ($curr_size >= $last_cumulative_size) { - return $curr_size; + if ($curr_size >= $last_cumulative_size) { + return $curr_size; } else { - return $last_cumulative_size; + return $last_cumulative_size; } - } + } /** * This is the first row to be analyzed */ @@ -668,18 +668,18 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ return -1; } - } + } /** * An error has DEFINITELY occurred */ - else { + else { /** * TODO: Handle this MUCH more elegantly */ @@ -713,11 +713,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - if (abs($cell) > 2147483647) { - return BIGINT; - } else { - return INT; - } + if (abs($cell) > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -737,62 +737,62 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @return array array(array $types, array $sizes) */ function PMA_analyzeTable(&$table) { - /* Get number of rows in table */ - $numRows = count($table[ROWS]); - /* Get number of columns */ - $numCols = count($table[COL_NAMES]); - /* Current type for each column */ - $types = array(); - $sizes = array(); - - /* Initialize $sizes to all 0's */ - for ($i = 0; $i < $numCols; ++$i) { - $sizes[$i] = 0; - } + /* Get number of rows in table */ + $numRows = count($table[ROWS]); + /* Get number of columns */ + $numCols = count($table[COL_NAMES]); + /* Current type for each column */ + $types = array(); + $sizes = array(); + + /* Initialize $sizes to all 0's */ + for ($i = 0; $i < $numCols; ++$i) { + $sizes[$i] = 0; + } /* Initialize $types to NONE */ for ($i = 0; $i < $numCols; ++$i) { $types[$i] = NONE; } - /* Temp vars */ - $curr_type = NONE; - $curr_size = 0; - - /* If the passed array is not of the correct form, do not process it */ - if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) { - /* Analyze each column */ - for ($i = 0; $i < $numCols; ++$i) { - /* Analyze the column in each row */ - for ($j = 0; $j < $numRows; ++$j) { - /* Determine type of the current cell */ - $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]); - /* Determine size of the current cell */ - $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); - - /** - * If a type for this column has already been declared, - * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { - if ($curr_type == VARCHAR) { - $types[$i] = VARCHAR; - } else if ($curr_type == DECIMAL) { - if ($types[$i] != VARCHAR) { - $types[$i] = DECIMAL; - } - } else if ($curr_type == BIGINT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = BIGINT; - } - } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { - $types[$i] = INT; - } - } - } - } - } + /* Temp vars */ + $curr_type = NONE; + $curr_size = 0; + + /* If the passed array is not of the correct form, do not process it */ + if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) { + /* Analyze each column */ + for ($i = 0; $i < $numCols; ++$i) { + /* Analyze the column in each row */ + for ($j = 0; $j < $numRows; ++$j) { + /* Determine type of the current cell */ + $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]); + /* Determine size of the current cell */ + $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); + + /** + * If a type for this column has already been declared, + * only alter it if it was a number and a varchar was found + */ + if ($curr_type != NONE) { + if ($curr_type == VARCHAR) { + $types[$i] = VARCHAR; + } else if ($curr_type == DECIMAL) { + if ($types[$i] != VARCHAR) { + $types[$i] = DECIMAL; + } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } + } else if ($curr_type == INT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } + } + } + } /* Check to ensure that all types are valid */ $len = count($types); @@ -803,16 +803,16 @@ function PMA_analyzeTable(&$table) { } } - return array($types, $sizes); - } - else - { + return array($types, $sizes); + } + else + { /** * TODO: Handle this better */ - return false; - } + return false; + } } /* Needed to quell the beast that is PMA_Message */ @@ -944,10 +944,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = * * Only one insert query is formed for each table */ - $tempSQLStr = ""; - $col_count = 0; + $tempSQLStr = ""; + $col_count = 0; $num_tables = count($tables); - for ($i = 0; $i < $num_tables; ++$i) { + for ($i = 0; $i < $num_tables; ++$i) { $num_cols = count($tables[$i][COL_NAMES]); $num_rows = count($tables[$i][ROWS]); @@ -963,10 +963,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = $tempSQLStr .= ") VALUES "; - for ($j = 0; $j < $num_rows; ++$j) { + for ($j = 0; $j < $num_rows; ++$j) { $tempSQLStr .= "("; - for ($k = 0; $k < $num_cols; ++$k) { + for ($k = 0; $k < $num_cols; ++$k) { if ($analyses != null) { $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR); } else { @@ -979,22 +979,22 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = } $tempSQLStr .= (($is_varchar) ? "'" : ""); - $tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]); - $tempSQLStr .= (($is_varchar) ? "'" : ""); + $tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]); + $tempSQLStr .= (($is_varchar) ? "'" : ""); - if ($k != ($num_cols - 1)) { - $tempSQLStr .= ", "; + if ($k != ($num_cols - 1)) { + $tempSQLStr .= ", "; } - if ($col_count == ($num_cols - 1)) { - $col_count = 0; - } else { - $col_count++; + if ($col_count == ($num_cols - 1)) { + $col_count = 0; + } else { + $col_count++; } /* Delete the cell after we are done with it */ unset($tables[$i][ROWS][$j][$k]); - } + } $tempSQLStr .= ")"; @@ -1002,10 +1002,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = $tempSQLStr .= ",\n "; } - $col_count = 0; + $col_count = 0; /* Delete the row after we are done with it */ unset($tables[$i][ROWS][$j]); - } + } $tempSQLStr .= ";"; @@ -1015,7 +1015,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = * to store them in a (possibly large) buffer */ PMA_importRunQuery($tempSQLStr, $tempSQLStr); - } + } /* No longer needed */ unset($tempSQLStr); diff --git a/libraries/rte/rte_words.lib.php b/libraries/rte/rte_words.lib.php index 6e7836a..e046ac2 100644 --- a/libraries/rte/rte_words.lib.php +++ b/libraries/rte/rte_words.lib.php @@ -1,5 +1,5 @@ <?php - +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * This function is used to retreive some language strings that are used * in functionalities that are common to routines, triggers and events. @@ -10,49 +10,49 @@ */ function PMA_RTE_getWord($index) { - global $_PMA_RTE; + global $_PMA_RTE; - switch ($_PMA_RTE) { - case 'RTN': - $words = array( - 'add' => __('Add routine'), - 'docu' => 'STORED_ROUTINES', - 'export' => __('Export of routine %s'), - 'human' => __('routine'), - 'no_create' => __('You do not have the necessary privileges to create a routine'), - 'not_found' => __('No routine with name %1$s found in database %2$s'), - 'nothing' => __('There are no routines to display.'), - 'title' => __('Routines'), - ); - break; - case 'TRI': - $words = array( - 'add' => __('Add trigger'), - 'docu' => 'TRIGGERS', - 'export' => __('Export of trigger %s'), - 'human' => __('trigger'), - 'no_create' => __('You do not have the necessary privileges to create a trigger'), - 'not_found' => __('No trigger with name %1$s found in database %2$s'), - 'nothing' => __('There are no triggers to display.'), - 'title' => __('Triggers'), - ); - break; - case 'EVN': - $words = array( - 'add' => __('Add event'), - 'docu' => 'EVENTS', - 'export' => __('Export of event %s'), - 'human' => __('event'), - 'no_create' => __('You do not have the necessary privileges to create an event'), - 'not_found' => __('No event with name %1$s found in database %2$s'), - 'nothing' => __('There are no events to display.'), - 'title' => __('Events'), - ); - break; - default: - $words = array(); - break; - } + switch ($_PMA_RTE) { + case 'RTN': + $words = array( + 'add' => __('Add routine'), + 'docu' => 'STORED_ROUTINES', + 'export' => __('Export of routine %s'), + 'human' => __('routine'), + 'no_create' => __('You do not have the necessary privileges to create a routine'), + 'not_found' => __('No routine with name %1$s found in database %2$s'), + 'nothing' => __('There are no routines to display.'), + 'title' => __('Routines'), + ); + break; + case 'TRI': + $words = array( + 'add' => __('Add trigger'), + 'docu' => 'TRIGGERS', + 'export' => __('Export of trigger %s'), + 'human' => __('trigger'), + 'no_create' => __('You do not have the necessary privileges to create a trigger'), + 'not_found' => __('No trigger with name %1$s found in database %2$s'), + 'nothing' => __('There are no triggers to display.'), + 'title' => __('Triggers'), + ); + break; + case 'EVN': + $words = array( + 'add' => __('Add event'), + 'docu' => 'EVENTS', + 'export' => __('Export of event %s'), + 'human' => __('event'), + 'no_create' => __('You do not have the necessary privileges to create an event'), + 'not_found' => __('No event with name %1$s found in database %2$s'), + 'nothing' => __('There are no events to display.'), + 'title' => __('Events'), + ); + break; + default: + $words = array(); + break; + } return isset($words[$index]) ? $words[$index] : ''; } // end PMA_RTE_getWord() diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css index eb3d690..21ddbce 100644 --- a/pmd/styles/default/style1.css +++ b/pmd/styles/default/style1.css @@ -147,19 +147,19 @@ form { } .option_tab { - padding-left: 2px; - padding-right: 2px; - width: 5px; + padding-left: 2px; + padding-right: 2px; + width: 5px; } .select_all { - vertical-align: top; - padding-left: 2px; - padding-right: 2px; - cursor: default; - width: 1px; - color: #000000; - background-image: url(images/Header.png); + vertical-align: top; + padding-left: 2px; + padding-right: 2px; + cursor: default; + width: 1px; + color: #000000; + background-image: url(images/Header.png); background-repeat: repeat-x; } @@ -456,127 +456,127 @@ z-index:999; } h2.tiger{ - background-repeat: repeat-x; + background-repeat: repeat-x; padding: 1px; font-weight: bold; - font-size:14px; - padding: 50 20 50 20px; - margin: 0 0 5px 0; - width: 250px; - float: left; - color : #333; - text-align: center; + font-size:14px; + padding: 50 20 50 20px; + margin: 0 0 5px 0; + width: 250px; + float: left; + color : #333; + text-align: center; } h2.tiger a { - background-image: url(images/Header.png); - text-align: center; - text-decoration: none; - color : #333; - display: block; + background-image: url(images/Header.png); + text-align: center; + text-decoration: none; + color : #333; + display: block; } h2.tiger a:hover { - color: #000; - background-image: url(images/Header_Linked.png); + color: #000; + background-image: url(images/Header_Linked.png); } h2.active { - background-image: url(images/Header.png); + background-image: url(images/Header.png); background-repeat: repeat-x; padding: 1px; - background-position: left bottom; + background-position: left bottom; } .toggle_container { - margin: 0 0 5px; - padding: 0; - border-top: 1px solid #d6d6d6; - background: #FFF ; - width: 250px; - overflow: hidden; - font-size: 1.2em; - clear: both; + margin: 0 0 5px; + padding: 0; + border-top: 1px solid #d6d6d6; + background: #FFF ; + width: 250px; + overflow: hidden; + font-size: 1.2em; + clear: both; } .toggle_container .block { - background-color: #DBE4E8; - padding:40 15 40 15px; /*--Padding of Container--*/ - border:1px solid #999; - color:#000; + background-color: #DBE4E8; + padding:40 15 40 15px; /*--Padding of Container--*/ + border:1px solid #999; + color:#000; } .history_table { - text-align: center; - background-color: #9999CC; + text-align: center; + background-color: #9999CC; } .history_table2 { - text-align: center; - background-color: #DBE4E8; + text-align: center; + background-color: #DBE4E8; } #filter { - display: none; - position: absolute; - top: 0%; - left: 0%; - width: 100%; - height: 100%; - background-color: #CCA; - z-index:10; - opacity:0.5; - filter: alpha(opacity=50); + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: #CCA; + z-index:10; + opacity:0.5; + filter: alpha(opacity=50); } #box { - display: none; - position: absolute; - top: 20%; - left: 30%; - width: 500px; - height: 220px; - padding: 48px; - margin:0; - border: 1px solid black; - background-color: white; - z-index:101; - overflow: visible; + display: none; + position: absolute; + top: 20%; + left: 30%; + width: 500px; + height: 220px; + padding: 48px; + margin:0; + border: 1px solid black; + background-color: white; + z-index:101; + overflow: visible; } #boxtitle { - position:absolute; - float:center; - top:0; - left:0; - width:593px; - height:20px; - padding:0; - padding-top:4px; - left-padding:8px; - margin:0; - border-bottom:4px solid #3CF; - background-color: #D0DCE0; //#09c; - color:black; - font-weight:bold; - padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; - text-align:left; + position:absolute; + float:center; + top:0; + left:0; + width:593px; + height:20px; + padding:0; + padding-top:4px; + left-padding:8px; + margin:0; + border-bottom:4px solid #3CF; + background-color: #D0DCE0; //#09c; + color:black; + font-weight:bold; + padding-left: 2px; + font-family:"Times New Roman", Times, serif; + font-size:16px; + text-align:left; } #tblfooter { - background-color: D3DCE3; - float: right; - padding-top:10px; - color: black; - font-weight: normal; + background-color: D3DCE3; + float: right; + padding-top:10px; + color: black; + font-weight: normal; } input.btn { - color:#333; - font: bold 84%'trebuchet ms',helvetica,sans-serif; - background-color: #D0DCE0; + color:#333; + font: bold 84%'trebuchet ms',helvetica,sans-serif; + background-color: #D0DCE0; } diff --git a/pmd_general.php b/pmd_general.php index 74ff124..a93265e 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -41,23 +41,23 @@ echo ' var server = "' . PMA_escapeJsString($server) . '"; var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; - echo "\n"; - if ($_REQUEST['query']) { - echo ' - $(document).ready(function() { - $(".trigger").click(function() { - $(".panel").toggle("fast"); - $(this).toggleClass("active"); - return false; - }); - });'; - } + echo "\n"; + if ($_REQUEST['query']) { + echo ' + $(document).ready(function() { + $(".trigger").click(function() { + $(".panel").toggle("fast"); + $(this).toggleClass("active"); + return false; + }); + });'; + } ?> // ]]> </script> <script src="pmd/scripts/ajax.js" type="text/javascript"></script> <script src="pmd/scripts/history.js" type="text/javascript"></script> - <script src="pmd/scripts/move.js" type="text/javascript"></script> + <script src="pmd/scripts/move.js" type="text/javascript"></script>  @@ -205,12 +205,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <thead> <tr> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="select_all">'; - echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; + if (isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" '; echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url) .'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>'; - }?> + }?> <td class="small_tab" onmouseover="this.className='small_tab2';" onmouseout="this.className='small_tab';" id="id_hide_tbody_<?php echo $t_n_url ?>" @@ -238,11 +238,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; + if (isset($_REQUEST['query'])) { + echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"'; echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">'; - }?> + }?> </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" @@ -274,13 +274,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?>)"> <?php - if (isset($_REQUEST['query'])) { - echo '<td class="select_all">'; - echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; + if (isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; - echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; - echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>'; - }?> + echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; + echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>'; + }?> <td width="10px" colspan="3" id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>"> <div style="white-space:nowrap"> @@ -316,12 +316,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </td> <?php if (isset($_REQUEST['query'])) { - //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; - echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; - echo 'onmouseout="this.className=\'small_tab_pref\';"'; - echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; - echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; - } ?> + //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; + echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; + echo 'onmouseout="this.className=\'small_tab_pref\';"'; + echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; + echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; + } ?> </tr> <?php } @@ -451,7 +451,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> <thead> <tr> - <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td> + <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td> </tr> </thead> <tbody id="where"> @@ -480,7 +480,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr><td align="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> - <td width="102"><input type="text" value="" id="new_name"/></td> + <td width="102"><input type="text" value="" id="new_name"/></td> </tr> <tr><td align="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr> <tr> @@ -495,11 +495,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </select> </td></tr> <tr> - <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td> + <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td> <td><input type="checkbox" value="groupby" id="groupby"/></td> </tr> <tr> - <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td> + <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td> <td><input type="checkbox" value="orderby" id="orderby"/></td> </tr> <tr><td align="center" nowrap="nowrap"><b>HAVING</b></td></tr> @@ -514,7 +514,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <option value="avg"> AVG </option> <option value="count"> COUNT </option> </select> - </td></tr> + </td></tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td> <td width="102"><select name="h_rel_opt" id="h_rel_opt"> @@ -530,11 +530,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <option value="NOT IN"> NOT IN </option> </select> </td> - </tr> + </tr> <tr> <td width="58" nowrap="nowrap"><?php echo __('Value'); ?>/<br/><?php echo __('subquery'); ?></td> - <td width="102"><textarea id="having" value="" cols="18"></textarea></td> - </tr> + <td width="102"><textarea id="having" value="" cols="18"></textarea></td> + </tr> </tbody> <tbody> <tr> @@ -580,7 +580,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> <td width="102"> - <input type="text" value="" id="e_rename"/> + <input type="text" value="" id="e_rename"/> </td> </tr> </tbody> @@ -610,11 +610,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table id="query_having" style="visibility:<?php echo $hidden ?>;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> - <tr> - <td class="frams1" width="10px"></td> - <td class="frams5" width="99%" ></td> - <td class="frams2" width="10px"><div class="bor"></div></td> - </tr> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> <tr> <td class="frams8"></td> <td class="input_tab"> @@ -641,7 +641,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"><select name="hrel_opt" id="hrel_opt"> - <option value="--" selected="selected"> -- </option> + <option value="--" selected="selected"> -- </option> <option value="=" > = </option> <option value=">"> > </option> <option value="<"> < </option> @@ -658,7 +658,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> <td><textarea id="hQuery" value="" cols="18"></textarea> </td> - </tr> + </tr> </tbody> <tbody> <tr> @@ -704,13 +704,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"> - <select name="operator" id="e_operator"> - <option value="---" selected="selected">---</option> - <option value="sum" > SUM </option> - <option value="min"> MIN </option> - <option value="max"> MAX </option> - <option value="avg"> AVG </option> - <option value="avg"> COUNT </option> + <select name="operator" id="e_operator"> + <option value="---" selected="selected">---</option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="avg"> COUNT </option> </select> </td></tr> </tbody> @@ -740,11 +740,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <table id="query_where" style="visibility:<?php echo $hidden ?>;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> - <tr> - <td class="frams1" width="10px"></td> - <td class="frams5" width="99%" ></td> - <td class="frams2" width="10px"><div class="bor"></div></td> - </tr> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> <tr> <td class="frams8"></td> <td class="input_tab"> @@ -758,7 +758,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <tr> <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> <td width="102"><select name="erel_opt" id="erel_opt"> - <option value="--" selected="selected"> -- </option> + <option value="--" selected="selected"> -- </option> <option value="=" > = </option> <option value=">"> > </option> <option value="<"> < </option> @@ -775,7 +775,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> <td><textarea id="eQuery" value="" cols="18"></textarea> </td> - </tr> + </tr> </tbody> <tbody> <tr> @@ -802,16 +802,16 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <?php if ($_REQUEST['query']) { - echo '<div class="panel">'; - echo '<div style="clear:both;"></div>'; - echo '<div id="ab"></div>'; - echo '<div style="clear:both;"></div>'; - echo '</div>'; - echo '<a class="trigger" href="#">' . __('Active options') . '</a>'; - echo '<div id="filter"></div>'; - echo '<div id="box">'; - echo '<span id="boxtitle"></span>'; - echo '<form method="post" action="db_qbe.php" >'; + echo '<div class="panel">'; + echo '<div style="clear:both;"></div>'; + echo '<div id="ab"></div>'; + echo '<div style="clear:both;"></div>'; + echo '</div>'; + echo '<a class="trigger" href="#">' . __('Active options') . '</a>'; + echo '<div id="filter"></div>'; + echo '<div id="box">'; + echo '<span id="boxtitle"></span>'; + echo '<form method="post" action="db_qbe.php" >'; echo '<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea><div id="tblfooter">'; echo ' <input type="submit" name="submit_sql" class="btn">'; echo ' <input type="button" name="cancel" value="Cancel" onClick="closebox()" class="btn">'; diff --git a/server_synchronize.php b/server_synchronize.php index 431ae6b..6c23d97 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -60,22 +60,22 @@ if ((isset($_REQUEST['submit_connect']))) { ${"{$con}_port"} = $_REQUEST[$con . '_port']; ${"{$con}_socket"} = $_REQUEST[$con . '_socket']; ${"{$con}_db"} = $_REQUEST[$con . '_db']; - ${"{$con}_type"} = $_REQUEST[$con . '_type']; + ${"{$con}_type"} = $_REQUEST[$con . '_type']; if (${"{$con}_type"} == 'cur') { - ${"{$con}_connection"} = null; - ${"{$con}_server"} = null; - ${"{$con}_db"} = $_REQUEST[$con . '_db_sel']; - continue; + ${"{$con}_connection"} = null; + ${"{$con}_server"} = null; + ${"{$con}_db"} = $_REQUEST[$con . '_db_sel']; + continue; } if (isset(${"{$con}_socket"}) && ! empty(${"{$con}_socket"})) { - ${"{$con}_server"}['socket'] = ${"{$con}_socket"}; + ${"{$con}_server"}['socket'] = ${"{$con}_socket"}; } else { - ${"{$con}_server"}['host'] = ${"{$con}_host"}; - if (isset(${"{$con}_port"}) && ! empty(${"{$con}_port"}) && ((int)${"{$con}_port"} * 1) > 0) { - ${"{$con}_server"}['port'] = (int)${"{$con}_port"}; - } + ${"{$con}_server"}['host'] = ${"{$con}_host"}; + if (isset(${"{$con}_port"}) && ! empty(${"{$con}_port"}) && ((int)${"{$con}_port"} * 1) > 0) { + ${"{$con}_server"}['port'] = (int)${"{$con}_port"}; + } } ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}, $auxiliary_connection = true); @@ -102,14 +102,14 @@ if ((isset($_REQUEST['submit_connect']))) { * Creating the link object for both source and target databases and * selecting the source and target databases using these links */ - foreach ($cons as $con) { - if (${"{$con}_connection"} != null) { - ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); - } else { + foreach ($cons as $con) { + if (${"{$con}_connection"} != null) { + ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); + } else { ${"{$con}_link"} = null; } - ${"{$con}_db_selected"} = PMA_DBI_select_db(${"{$con}_db"}, ${"{$con}_link"}); - } // end foreach ($cons as $con) + ${"{$con}_db_selected"} = PMA_DBI_select_db(${"{$con}_db"}, ${"{$con}_link"}); + } // end foreach ($cons as $con) if (($src_db_selected != 1) || ($trg_db_selected != 1)) { /** @@ -225,10 +225,10 @@ if ((isset($_REQUEST['submit_connect']))) { $_SESSION['src_password'] = $src_password; $_SESSION['trg_password'] = $trg_password; $_SESSION['trg_password'] = $trg_password; - $_SESSION['src_server'] = $src_server; - $_SESSION['trg_server'] = $trg_server; - $_SESSION['src_type'] = $src_type; - $_SESSION['trg_type'] = $trg_type; + $_SESSION['src_server'] = $src_server; + $_SESSION['trg_server'] = $trg_server; + $_SESSION['src_type'] = $src_type; + $_SESSION['trg_type'] = $trg_type; $_SESSION['matching_tables_keys'] = $matching_tables_keys; $_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields; $_SESSION['uncommon_tables_row_count'] = $row_count; @@ -731,7 +731,7 @@ if (isset($_REQUEST['Table_ids'])) { if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; } @@ -799,7 +799,7 @@ if (isset($_REQUEST['Table_ids'])) { if (!(in_array($j, $uncommon_table_data_diff))) { if (isset($row_count[$j]) && ($row_count > 0)) { echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; } @@ -1117,8 +1117,8 @@ if (isset($_REQUEST['synchronize_db'])) { <table id="serverconnection_<?php echo $type; ?>_remote" class="data"> <caption class="tblHeaders"><?php echo $database_header; ?></caption> <tr class="odd"> - <td colspan="2" style="text-align: center"> - <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector"> + <td colspan="2" style="text-align: center"> + <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector"> <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { $preselected_option = 'rmt'; @@ -1162,53 +1162,53 @@ if (isset($_REQUEST['synchronize_db'])) { . htmlspecialchars(sprintf(__('Configuration: %s'), $label)) . '</option>'; } // end foreach ?> - </select> - </td> + </select> + </td> </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Server'); ?></td> + <tr class="even toggler remote-server"> + <td><?php echo __('Server'); ?></td> <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('Port'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('Port'); ?></td> <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td> - </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Socket'); ?></td> + </tr> + <tr class="even toggler remote-server"> + <td><?php echo __('Socket'); ?></td> <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('User name'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('User name'); ?></td> <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" /></td> - </tr> - <tr class="even toggler remote-server"> - <td><?php echo __('Password'); ?></td> + </tr> + <tr class="even toggler remote-server"> + <td><?php echo __('Password'); ?></td> <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td> - </tr> - <tr class="odd toggler remote-server"> - <td><?php echo __('Database'); ?></td> + </tr> + <tr class="odd toggler remote-server"> + <td><?php echo __('Database'); ?></td> <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td> - </tr> - <tr class="even toggler current-server" style="display: none;"> - <td><?php echo __('Database'); ?></td> - <td> + </tr> + <tr class="even toggler current-server" style="display: none;"> + <td><?php echo __('Database'); ?></td> + <td> <?php // these unset() do not complain if the elements do not exist unset($databases['mysql']); unset($databases['information_schema']); - if (count($databases) == 0) { - echo __('No databases'); - } else { - echo ' - <select name="' . $type . '_db_sel"> - '; - foreach ($databases as $db) { - echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; - } + if (count($databases) == 0) { + echo __('No databases'); + } else { + echo ' + <select name="' . $type . '_db_sel"> + '; + foreach ($databases as $db) { + echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>'; + } echo '</select>'; - } - echo '</td> </tr> + } + echo '</td> </tr> </table>'; } unset ($types, $type); diff --git a/setup/config.php b/setup/config.php index 193b57f..5333cb0 100644 --- a/setup/config.php +++ b/setup/config.php @@ -26,34 +26,34 @@ if (isset($_POST['eol'])) { } if (PMA_ifSetOr($_POST['submit_clear'], '')) { - // - // Clear current config and return to main page - // - ConfigFile::getInstance()->resetConfigData(); + // + // Clear current config and return to main page + // + ConfigFile::getInstance()->resetConfigData(); // drop post data header('HTTP/1.1 303 See Other'); header('Location: index.php'); exit; } elseif (PMA_ifSetOr($_POST['submit_download'], '')) { - // - // Output generated config file - // + // + // Output generated config file + // header('Content-Type: text/plain'); header('Content-Disposition: attachment; filename="config.inc.php"'); echo ConfigGenerator::getConfigFile(); exit; } elseif (PMA_ifSetOr($_POST['submit_save'], '')) { - // - // Save generated config file on the server - // + // + // Save generated config file on the server + // file_put_contents($config_file_path, ConfigGenerator::getConfigFile()); header('HTTP/1.1 303 See Other'); header('Location: index.php?action_done=config_saved'); exit; } elseif (PMA_ifSetOr($_POST['submit_load'], '')) { - // - // Load config file from the server - // + // + // Load config file from the server + // $cfg = array(); require_once $config_file_path; ConfigFile::getInstance()->setConfigData($cfg); @@ -61,17 +61,17 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) { header('Location: index.php'); exit; } elseif (PMA_ifSetOr($_POST['submit_delete'], '')) { - // - // Delete config file on the server - // + // + // Delete config file on the server + // @unlink($config_file_path); header('HTTP/1.1 303 See Other'); header('Location: index.php'); exit; } else { - // - // Show generated config file in a <textarea> - // + // + // Show generated config file in a <textarea> + // header('HTTP/1.1 303 See Other'); header('Location: index.php?page=config'); exit; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11681-gbf9def5
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via bf9def5d50aab33dda6a38e4aa9b820a1f0c086a (commit) from 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa (commit) - Log ----------------------------------------------------------------- commit bf9def5d50aab33dda6a38e4aa9b820a1f0c086a Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:29:41 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 91ec780..fa77136 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -72,7 +72,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { global $timer; $t = $timer; - $arr[] = array('type' => $type, 'data' => $data, 'pos' => $pos, 'time' => $t); + $arr[] = array( + 'type' => $type, + 'data' => $data, + 'pos' => $pos, + 'time' => $t); $timer = microtime(); $arrsize++; } // end of the "PMA_SQP_arrayAdd()" function @@ -151,7 +155,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { global $SQP_errorString; $debugstr = 'ERROR: ' . $message . "\n"; $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n"; - $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n"; + $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' '; + $debugstr .= PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n"; $debugstr .= 'PMA: ' . PMA_VERSION . "\n"; $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n"; $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n"; @@ -161,7 +166,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (@function_exists('gzcompress')) { $encodedstr = gzcompress($debugstr, 9); } - $encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr))); + $encodedstr = preg_replace( + "/(\015\012)|(\015)|(\012)/", + '<br />' . "\n", + chunk_split(base64_encode($encodedstr))); $SQP_errorString .= __('There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:') @@ -2706,7 +2714,9 @@ function PMA_SQP_buildCssData() } for ($i = 0; $i < 8; $i++) { - $css_string .= PMA_SQP_buildCssRule('syntax_indent' . $i, 'margin-left', ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']); + $css_string .= PMA_SQP_buildCssRule( + 'syntax_indent' . $i, 'margin-left', + ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']); } return $css_string; @@ -2725,7 +2735,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace( + "@((\015\012)|(\015)|(\012)){3,}@", + "\n\n", + $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11680-g6b75d60
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa (commit) from 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) - Log ----------------------------------------------------------------- commit 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:27:49 2011 +0200 Document that this is IPv4 only ----------------------------------------------------------------------- Summary of changes: libraries/ip_allow_deny.lib.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 2b969d1..ad4b4a3 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -4,6 +4,8 @@ * This library is used with the server IP allow/deny host authentication * feature * + * @todo Broken for IPv6 + * * @package phpMyAdmin */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11679-g236582f
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) from 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) - Log ----------------------------------------------------------------- commit 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:25:14 2011 +0200 Fix mistakenly broken regexp ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- libraries/ip_allow_deny.lib.php | 4 ++-- libraries/sqlparser.lib.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1607d6e..27d99bc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index c8481ba..2b969d1 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; @@ -46,7 +46,7 @@ function PMA_getIp() * Based on IP Pattern Matcher * Originally by J.Adams <jna(a)retina.net> * Found on <http://www.php.net/manual/en/function.ip2long.php> - * Modified for phpMyAdmin + * Modified for phpMyAdmin * * Matches: * xxx.xxx.xxx.xxx (exact) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 267d99b..91ec780 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11678-g9405dbb
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) from 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) - Log ----------------------------------------------------------------- commit 9405dbb82a38ca03e0d5a54e06b73be80ec51692 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:21:55 2011 +0200 Fix spacing after @param ----------------------------------------------------------------------- Summary of changes: db_search.php | 8 +- export.php | 2 +- libraries/Config.class.php | 30 ++-- libraries/Error.class.php | 18 +- libraries/Error_Handler.class.php | 22 ++-- libraries/File.class.php | 32 ++-- libraries/Index.class.php | 28 ++-- libraries/List.class.php | 6 +- libraries/List_Database.class.php | 14 +- libraries/Message.class.php | 72 ++++---- libraries/StorageEngine.class.php | 16 +- libraries/Table.class.php | 108 ++++++------ libraries/Theme.class.php | 16 +- libraries/Theme_Manager.class.php | 10 +- libraries/Tracker.class.php | 72 ++++---- libraries/blowfish.php | 8 +- libraries/bookmark.lib.php | 20 +- libraries/charset_conversion.lib.php | 6 +- libraries/common.lib.php | 222 +++++++++++++------------- libraries/core.lib.php | 58 ++++---- libraries/database_interface.lib.php | 122 +++++++------- libraries/db_info.inc.php | 6 +- libraries/db_structure.lib.php | 10 +- libraries/display_select_lang.lib.php | 4 +- libraries/display_tbl.lib.php | 148 ++++++++-------- libraries/export/codegen.php | 16 +- libraries/export/csv.php | 16 +- libraries/export/htmlword.php | 36 ++-- libraries/export/json.php | 16 +- libraries/export/latex.php | 38 ++-- libraries/export/mediawiki.php | 16 +- libraries/export/ods.php | 16 +- libraries/export/odt.php | 36 ++-- libraries/export/pdf.php | 16 +- libraries/export/php_array.php | 16 +- libraries/export/sql.php | 70 ++++---- libraries/export/texytext.php | 36 ++-- libraries/export/xls.php | 16 +- libraries/export/xlsx.php | 16 +- libraries/export/xml.php | 16 +- libraries/export/yaml.php | 16 +- libraries/file_listing.php | 10 +- libraries/grab_globals.lib.php | 6 +- libraries/iconv_wrapper.lib.php | 6 +- libraries/import.lib.php | 50 +++--- libraries/ip_allow_deny.lib.php | 6 +- libraries/js_escape.lib.php | 6 +- libraries/kanji-encoding.lib.php | 14 +- libraries/mysql_charsets.lib.php | 4 +- libraries/opendocument.lib.php | 4 +- libraries/plugin_interface.lib.php | 40 +++--- libraries/relation.lib.php | 86 +++++----- libraries/sanitizing.lib.php | 4 +- libraries/select_lang.lib.php | 6 +- libraries/select_server.lib.php | 4 +- libraries/server_synchronize.lib.php | 294 ++++++++++++++++---------------- libraries/sql_query_form.lib.php | 12 +- libraries/sqlparser.lib.php | 34 ++-- libraries/sqlvalidator.class.php | 68 ++++---- libraries/sqlvalidator.lib.php | 2 +- libraries/string.lib.php | 16 +- libraries/string_mb.lib.php | 16 +- libraries/string_native.lib.php | 16 +- libraries/string_type_ctype.lib.php | 14 +- libraries/string_type_native.lib.php | 14 +- libraries/transformations.lib.php | 22 ++-- libraries/url_generating.lib.php | 16 +- libraries/zip.lib.php | 8 +- libraries/zip_extension.lib.php | 4 +- main.php | 16 +- navigation.php | 14 +- pmd_common.php | 2 +- server_privileges.php | 14 +- tbl_relation.php | 8 +- tbl_tracking.php | 8 +- 75 files changed, 1147 insertions(+), 1147 deletions(-) diff --git a/db_search.php b/db_search.php index 6191b14..acbe0cb 100644 --- a/db_search.php +++ b/db_search.php @@ -113,10 +113,10 @@ if (isset($_REQUEST['submit_search'])) { * explode * count * strlen - * @param string the table name - * @param string restrict the search to this field - * @param string the string to search - * @param integer type of search (1 -> 1 word at least, 2 -> all words, + * @param string the table name + * @param string restrict the search to this field + * @param string the string to search + * @param integer type of search (1 -> 1 word at least, 2 -> all words, * 3 -> exact string, 4 -> regexp) * * @return array 3 SQL querys (for count, display and delete results) diff --git a/export.php b/export.php index 36c1d58..d7c2f87 100644 --- a/export.php +++ b/export.php @@ -129,7 +129,7 @@ $time_start = time(); * Output handler for all exports, if needed buffering, it stores data into * $dump_buffer, otherwise it prints thems out. * - * @param string $line the insert statement + * @param string $line the insert statement * @return bool Whether output suceeded */ function PMA_exportOutputHandler($line) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 28f9ac3..0130252 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -75,7 +75,7 @@ class PMA_Config /** * constructor * - * @param string source to read config from + * @param string source to read config from */ function __construct($source = null) { @@ -333,7 +333,7 @@ class PMA_Config * loads configuration from $source, usally the config file * should be called on object creation * - * @param string $source config file + * @param string $source config file */ function load($source = null) { @@ -563,7 +563,7 @@ class PMA_Config /** * set source - * @param string $source + * @param string $source */ function setSource($source) { @@ -635,7 +635,7 @@ class PMA_Config /** * returns specific config setting - * @param string $setting + * @param string $setting * @return mixed value */ function get($setting) @@ -649,8 +649,8 @@ class PMA_Config /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option */ function set($setting, $value) { @@ -1075,7 +1075,7 @@ class PMA_Config * returns options for font size selection * * @static - * @param string $current_size current selected font size with unit + * @param string $current_size current selected font size with unit * @return array selectable font sizes */ static protected function _getFontsizeOptions($current_size = '82%') @@ -1135,7 +1135,7 @@ class PMA_Config * returns html selectbox for font sizes * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static protected function _getFontsizeSelection() @@ -1169,7 +1169,7 @@ class PMA_Config * return complete font size selection form * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static public function getFontsizeForm() @@ -1187,7 +1187,7 @@ class PMA_Config /** * removes cookie * - * @param string $cookie name of cookie to remove + * @param string $cookie name of cookie to remove * @return boolean result of setcookie() */ function removeCookie($cookie) @@ -1200,11 +1200,11 @@ class PMA_Config * sets cookie if value is different from current cokkie value, * or removes if value is equal to default * - * @param string $cookie name of cookie to remove - * @param mixed $value new cookie value - * @param string $default default value - * @param int $validity validity of cookie in seconds (default is one month) - * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) + * @param string $cookie name of cookie to remove + * @param mixed $value new cookie value + * @param string $default default value + * @param int $validity validity of cookie in seconds (default is one month) + * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) * @return boolean result of setcookie() */ function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index e5d105c..1925a61 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -93,10 +93,10 @@ class PMA_Error extends PMA_Message /** * Constructor * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function __construct($errno, $errstr, $errfile, $errline) { @@ -116,7 +116,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_backtrace * - * @param array $backtrace + * @param array $backtrace */ public function setBacktrace($backtrace) { @@ -126,7 +126,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_line * - * @param integer $line + * @param integer $line */ public function setLine($line) { @@ -136,7 +136,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_file * - * @param string $file + * @param string $file */ public function setFile($file) { @@ -147,7 +147,7 @@ class PMA_Error extends PMA_Message /** * returns unique PMA_Error::$_hash, if not exists it will be created * - * @param string $file + * @param string $file * @return string PMA_Error::$_hash */ public function getHash() @@ -329,7 +329,7 @@ class PMA_Error extends PMA_Message * and make users feel save to submit error reports * * @static - * @param string $dest path to be shorten + * @param string $dest path to be shorten * @return string shortened path */ static function relPath($dest) diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index f65dc4b..1a9cdb0 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -83,10 +83,10 @@ class PMA_Error_Handler * Do not use the context parameter as we want to avoid storing the * complete $GLOBALS inside $_SESSION['errors'] * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function handleError($errno, $errstr, $errfile, $errline) { @@ -126,7 +126,7 @@ class PMA_Error_Handler * log error to configured log facility * * @todo finish! - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _logError($error) { @@ -136,10 +136,10 @@ class PMA_Error_Handler /** * trigger a custom error * - * @param string $errorInfo - * @param integer $errorNumber - * @param string $file - * @param integer $line + * @param string $errorInfo + * @param integer $errorNumber + * @param string $file + * @param integer $line */ public function triggerError($errorInfo, $errorNumber = null, $file = null, $line = null) { @@ -150,7 +150,7 @@ class PMA_Error_Handler /** * display fatal error and exit * - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _dispFatalError($error) { @@ -191,7 +191,7 @@ class PMA_Error_Handler /** * display HTML header * - * @param PMA_error $error + * @param PMA_error $error */ protected function _dispPageStart($error = null) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 031a266..bad9bca 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -78,7 +78,7 @@ class PMA_File * constructor * * @access public - * @param string $name file name + * @param string $name file name */ function __construct($name = false) { @@ -129,7 +129,7 @@ class PMA_File * file objects with temp flags are deleted with object destruction * * @access public - * @param boolean sets the temp flag + * @param boolean sets the temp flag * @return boolean PMA_File::$_is_temp */ function isTemp($is_temp = null) @@ -145,7 +145,7 @@ class PMA_File * accessor * * @access public - * @param string $name file name + * @param string $name file name */ function setName($name) { @@ -208,7 +208,7 @@ class PMA_File /** * @access public - * @param string name of file uploaded + * @param string name of file uploaded * @return boolean success */ function setUploadedFile($name) @@ -226,8 +226,8 @@ class PMA_File /** * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setUploadedFromTblChangeRequest($key, $rownumber) @@ -319,9 +319,9 @@ class PMA_File * * @access public * @static - * @param array $file the array - * @param string $rownumber - * @param string $key + * @param array $file the array + * @param string $rownumber + * @param string $key * @return array */ function fetchUploadedFromTblChangeRequestMultiple($file, $rownumber, $key) @@ -341,8 +341,8 @@ class PMA_File * sets the name if the file to the one selected in the tbl_change form * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setSelectedFromTblChangeRequest($key, $rownumber = null) @@ -421,8 +421,8 @@ class PMA_File * and uses the submitted/selected file * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function checkTblChangeForm($key, $rownumber) @@ -444,7 +444,7 @@ class PMA_File /** * * @access public - * @param string $name + * @param string $name * @return boolean success */ function setLocalSelectedFile($name) @@ -672,7 +672,7 @@ class PMA_File /** * advances the file pointer in the file handle by $length bytes/chars * - * @param integer $length numbers of chars/bytes to skip + * @param integer $length numbers of chars/bytes to skip * @return boolean * @todo this function is unused */ @@ -808,7 +808,7 @@ class PMA_File * sets reference to most recent BLOB repository reference * * @access public - * @param string - BLOB repository reference + * @param string - BLOB repository reference */ static function setRecentBLOBReference($ref) { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 7cc4799..25f613f 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -86,7 +86,7 @@ class PMA_Index /** * Constructor * - * @param array $params + * @param array $params */ public function __construct($params = array()) { @@ -111,8 +111,8 @@ class PMA_Index /** * returns an array with all indexes from the given table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return array */ static public function getFromTable($table, $schema) @@ -129,8 +129,8 @@ class PMA_Index /** * return primary if set, false otherwise * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return mixed primary index or false if no one exists */ static public function getPrimary($table, $schema) @@ -147,8 +147,8 @@ class PMA_Index /** * Load index data for table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return boolean */ static protected function _loadIndexes($table, $schema) @@ -176,7 +176,7 @@ class PMA_Index /** * Add column to index * - * @param array $params column params + * @param array $params column params */ public function addColumn($params) { @@ -216,7 +216,7 @@ class PMA_Index /** * Returns true if $column indexed in this index * - * @param string $column + * @param string $column * @return boolean */ public function hasColumn($column) @@ -403,10 +403,10 @@ class PMA_Index /** * Show index data * - * @param string $table The tablename - * @param array $indexes_info Referenced info array - * @param array $indexes_data Referenced data array - * @param boolean $print_mode + * @param string $table The tablename + * @param array $indexes_info Referenced info array + * @param array $indexes_data Referenced data array + * @param boolean $print_mode * @access public * @return array Index collection array */ @@ -539,7 +539,7 @@ class PMA_Index * Function to check over array of indexes and look for common problems * * @access public - * @param string name of table + * @param string name of table * @return string Output HTML */ static public function findDuplicates($table, $schema) diff --git a/libraries/List.class.php b/libraries/List.class.php index 83a42c1..694546a 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -52,7 +52,7 @@ abstract class PMA_List extends ArrayObject * checks if the given db names exists in the current list, if there is * missing at least one item it returns false otherwise true * - * @param string $db_name,.. one or more mysql result resources + * @param string $db_name,.. one or more mysql result resources * @return boolean true if all items exists, otheriwse false */ public function exists() @@ -70,8 +70,8 @@ abstract class PMA_List extends ArrayObject /** * returns HTML <option>-tags to be used inside <select></select> * - * @param mixed $selected the selected db or true for selecting current db - * @param boolean $include_information_schema + * @param mixed $selected the selected db or true for selecting current db + * @param boolean $include_information_schema * @return string HTML option tags */ public function getHtmlOptions($selected = '', $include_information_schema = true) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 7616f60..259bbf8 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -56,8 +56,8 @@ require_once './libraries/List.class.php'; /** * Constructor * - * @param mixed $db_link_user user database link resource|object - * @param mixed $db_link_control control database link resource|object + * @param mixed $db_link_user user database link resource|object + * @param mixed $db_link_control control database link resource|object */ public function __construct($db_link_user = null, $db_link_control = null) { @@ -89,7 +89,7 @@ require_once './libraries/List.class.php'; * retrieves database list from server * * @todo we could also search mysql tables if all fail? - * @param string $like_db_name usally a db_name containing wildcards + * @param string $like_db_name usally a db_name containing wildcards */ protected function _retrieve($like_db_name = null) { @@ -219,8 +219,8 @@ require_once './libraries/List.class.php'; /** * returns array with dbs grouped with extended infos * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array db list */ public function getGroupedDetails($offset, $count) @@ -297,8 +297,8 @@ require_once './libraries/List.class.php'; /** * returns a part of the items * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array some items */ public function getLimitedItems($offset, $count) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index d5e7d07..5a6afac 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -137,10 +137,10 @@ class PMA_Message /** * Constructor * - * @param string $string - * @param integer $number - * @param array $params - * @param integer $sanitize + * @param string $string + * @param integer $number + * @param array $params + * @param integer $sanitize */ public function __construct($string = '', $number = PMA_Message::NOTICE, $params = array(), $sanitize = PMA_Message::SANITIZE_NONE) @@ -166,7 +166,7 @@ class PMA_Message * shorthand for getting a simple success message * * @static - * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') + * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') * @return PMA_Message */ static public function success($string = '') @@ -184,7 +184,7 @@ class PMA_Message * shorthand for getting a simple error message * * @static - * @param string $string a localized string e.g. __('Error') + * @param string $string a localized string e.g. __('Error') * @return PMA_Message */ static public function error($string = '') @@ -202,7 +202,7 @@ class PMA_Message * shorthand for getting a simple notice message * * @static - * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') + * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') * @return PMA_Message */ static public function notice($string) @@ -216,8 +216,8 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param string $message - * @param integer $type + * @param string $message + * @param integer $type * @return PMA_Message */ static public function raw($message, $type = PMA_Message::NOTICE) @@ -233,7 +233,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function affected_rows($rows) @@ -249,7 +249,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function deleted_rows($rows) @@ -265,7 +265,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function inserted_rows($rows) @@ -281,7 +281,7 @@ class PMA_Message * shorthand for getting a customized error message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawError($message) @@ -295,7 +295,7 @@ class PMA_Message * shorthand for getting a customized notice message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawNotice($message) @@ -309,7 +309,7 @@ class PMA_Message * shorthand for getting a customized success message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawSuccess($message) @@ -321,7 +321,7 @@ class PMA_Message * returns whether this message is a success message or not * and optionaly makes this message a success message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a success message or not */ public function isSuccess($set = false) @@ -337,7 +337,7 @@ class PMA_Message * returns whether this message is a notice message or not * and optionally makes this message a notice message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a notice message or not */ public function isNotice($set = false) @@ -353,7 +353,7 @@ class PMA_Message * returns whether this message is an error message or not * and optionally makes this message an error message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is an error message or not */ public function isError($set = false) @@ -368,8 +368,8 @@ class PMA_Message /** * set raw message (overrides string) * - * @param string $message - * @param boolean $sanitize whether to sanitize $message or not + * @param string $message + * @param boolean $sanitize whether to sanitize $message or not */ public function setMessage($message, $sanitize = false) { @@ -382,8 +382,8 @@ class PMA_Message /** * set string (does not take effect if raw message is set) * - * @param string $_string - * @param boolean $sanitize whether to sanitize $string or not + * @param string $_string + * @param boolean $sanitize whether to sanitize $string or not */ public function setString($_string, $sanitize = true) { @@ -396,7 +396,7 @@ class PMA_Message /** * set message type number * - * @param integer $number + * @param integer $number */ public function setNumber($number) { @@ -413,8 +413,8 @@ class PMA_Message * $message->addParam('<img src="img" />', false); * </code> * - * @param mixed $param - * @param boolean $raw + * @param mixed $param + * @param boolean $raw */ public function addParam($param, $raw = true) { @@ -430,8 +430,8 @@ class PMA_Message /** * add another string to be concatenated on displaying * - * @param string $string to be added - * @param string $separator to use between this and previous string/message + * @param string $string to be added + * @param string $separator to use between this and previous string/message */ public function addString($string, $separator = ' ') { @@ -442,8 +442,8 @@ class PMA_Message /** * add a bunch of messages at once * - * @param array $messages to be added - * @param string $separator to use between this and previous string/message + * @param array $messages to be added + * @param string $separator to use between this and previous string/message */ public function addMessages($messages, $separator = ' ') { @@ -455,8 +455,8 @@ class PMA_Message /** * add another raw message to be concatenated on displaying * - * @param mixed $message to be added - * @param string $separator to use between this and previous string/message + * @param mixed $message to be added + * @param string $separator to use between this and previous string/message */ public function addMessage($message, $separator = ' ') { @@ -474,8 +474,8 @@ class PMA_Message /** * set all params at once, usually used in conjunction with string * - * @param array $params - * @param boolean $sanitize + * @param array $params + * @param boolean $sanitize */ public function setParams($params, $sanitize = false) { @@ -509,7 +509,7 @@ class PMA_Message * Sanitizes $message * * @static - * @param mixed $message the message(s) + * @param mixed $message the message(s) * @return mixed the sanitized message(s) * @access public */ @@ -531,7 +531,7 @@ class PMA_Message * for formatting * * @static - * @param string $message the message + * @param string $message the message * @return string the decoded message * @access public */ @@ -662,7 +662,7 @@ class PMA_Message /** * sets and returns whether the message was displayed or not * - * @param boolean $is_displayed + * @param boolean $is_displayed * @return boolean PMA_Message::$_is_displayed */ public function isDisplayed($is_displayed = false) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index d3e1019..bf5de9d 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -68,10 +68,10 @@ class PMA_StorageEngine * returns HTML code for storage engine select box * * @static - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param string $selected The selected engine - * @param boolean $offerUnavailableEngines + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines * Should unavailable storage engines be offered? * @return string html selectbox */ @@ -106,7 +106,7 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @param string $engine The engine ID + * @param string $engine The engine ID * @return object The engine plugin */ static public function getEngine($engine) @@ -127,7 +127,7 @@ class PMA_StorageEngine * return true if given engine name is supported/valid, otherwise false * * @static - * @param string $engine name of engine + * @param string $engine name of engine * @return boolean whether $engine is valid or not */ static public function isValid($engine) @@ -248,7 +248,7 @@ class PMA_StorageEngine /** * Constructor * - * @param string $engine The engine ID + * @param string $engine The engine ID */ function __construct($engine) { @@ -381,7 +381,7 @@ class PMA_StorageEngine * Generates the requested information page * * @abstract - * @param string $id The page ID + * @param string $id The page ID * * @return string The page * boolean or false on error. diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 66ceaea..d2a0dbe 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -63,8 +63,8 @@ class PMA_Table /** * Constructor * - * @param string $table_name table name - * @param string $db_name database name + * @param string $table_name table name + * @param string $db_name database name */ function __construct($table_name, $db_name) { @@ -96,7 +96,7 @@ class PMA_Table /** * sets table name * - * @param string $table_name new table name + * @param string $table_name new table name */ function setName($table_name) { @@ -106,7 +106,7 @@ class PMA_Table /** * returns table name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string table name */ function getName($backquoted = false) @@ -120,7 +120,7 @@ class PMA_Table /** * sets database name for this table * - * @param string $db_name + * @param string $db_name */ function setDbName($db_name) { @@ -130,7 +130,7 @@ class PMA_Table /** * returns database name for this table * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string database name for this table */ function getDbName($backquoted = false) @@ -144,7 +144,7 @@ class PMA_Table /** * returns full name for table, including database name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string */ function getFullName($backquoted = false) @@ -175,7 +175,7 @@ class PMA_Table /** * returns value for given setting/param * - * @param string $param name for value to return + * @param string $param name for value to return * @return mixed value for $param */ function get($param) @@ -226,8 +226,8 @@ class PMA_Table * * @deprecated * @todo see what we could do with the possible existence of $table_is_view - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean whether this is a view */ static protected function _isView($db, $table) @@ -247,8 +247,8 @@ class PMA_Table * * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. * - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean true if it is a merge table */ static public function isMerge($db = null, $table = null) @@ -313,19 +313,19 @@ class PMA_Table * * @todo move into class PMA_Column * @todo on the interface, some js to clear the default value when the default current_timestamp is checked - * @param string $name name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $name name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index * @return string field specification */ static function generateFieldSpec($name, $type, $length = '', $attribute = '', @@ -424,10 +424,10 @@ class PMA_Table * Revision 13 July 2001: Patch for limiting dump size from * vinay(a)sanisoft.com & girish(a)sanisoft.com * - * @param string $db the current database name - * @param string $table the current table name - * @param bool $force_exact whether to force an exact count - * @param bool $is_view + * @param string $db the current database name + * @param string $table the current table name + * @param bool $force_exact whether to force an exact count + * @param bool $is_view * * @return mixed the number of records if "retain" param is true, * otherwise true @@ -498,21 +498,21 @@ class PMA_Table * Generates column specification for ALTER syntax * * @see PMA_Table::generateFieldSpec() - * @param string $oldcol old column name - * @param string $newcol new column name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $oldcol old column name + * @param string $newcol new column name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index - * @param mixed $default_orig + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index + * @param mixed $default_orig * @return string field specification */ static public function generateAlter($oldcol, $newcol, $type, $length, @@ -529,11 +529,11 @@ class PMA_Table * Inserts existing entries in a PMA_* table by reading a value from an old entry * * @global relation variable - * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) - * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) - * @param array $get_fields Which fields will be SELECT'ed from the old entry - * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) - * @param array $new_fields Which fields will be used as new VALUES. These are the important + * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) + * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) + * @param array $get_fields Which fields will be SELECT'ed from the old entry + * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) + * @param array $new_fields Which fields will be used as new VALUES. These are the important * keys which differ from the old entry. * (array('FIELDNAME' => 'NEW FIELDVALUE')) * @return int|true @@ -995,7 +995,7 @@ class PMA_Table * * @todo add check for valid chars in filename on current system/os * @see http://dev.mysql.com/doc/refman/5.0/en/legal-names.html - * @param string $table_name name to check + * @param string $table_name name to check * @return boolean whether the string is valid or not */ function isValidName($table_name) @@ -1021,9 +1021,9 @@ class PMA_Table /** * renames table * - * @param string $new_name new table name - * @param string $new_db new database name - * @param bool $is_view is this for a VIEW rename? + * @param string $new_name new table name + * @param string $new_db new database name + * @param bool $is_view is this for a VIEW rename? * @return bool success */ function rename($new_name, $new_db = null, $is_view = false) @@ -1161,7 +1161,7 @@ class PMA_Table * - UNIQUE(x,y) // NONE * * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getUniqueColumns($backquoted = true) @@ -1188,7 +1188,7 @@ class PMA_Table * * e.g. index(col1, col2) would only return col1 * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getIndexedColumns($backquoted = true) @@ -1209,7 +1209,7 @@ class PMA_Table * * returns an array with all columns * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getColumns($backquoted = true) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index d1b79fd..7b01fa8 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -107,7 +107,7 @@ class PMA_Theme { * * @static * @access public - * @param string $folder path to theme + * @param string $folder path to theme * @return object PMA_Theme */ static public function load($folder) @@ -172,7 +172,7 @@ class PMA_Theme { * set path to theme * * @access public - * @param string $path path to theme + * @param string $path path to theme */ function setPath($path) { @@ -183,7 +183,7 @@ class PMA_Theme { * sets version * * @access public - * @param string new version + * @param string new version */ function setVersion($version) { @@ -206,7 +206,7 @@ class PMA_Theme { * returns true if theme version is equal or higher to $version * * @access public - * @param string $version version to compare to + * @param string $version version to compare to * @return boolean */ function checkVersion($version) @@ -218,7 +218,7 @@ class PMA_Theme { * sets name * * @access public - * @param string $name new name + * @param string $name new name */ function setName($name) { @@ -240,7 +240,7 @@ class PMA_Theme { * sets id * * @access public - * @param string $id new id + * @param string $id new id */ function setId($id) { @@ -260,7 +260,7 @@ class PMA_Theme { /** * @access public - * @param string path to images for this theme + * @param string path to images for this theme */ function setImgPath($path) { @@ -280,7 +280,7 @@ class PMA_Theme { * load css (send to stdout, normally the browser) * * @access public - * @param string $type left, right or print + * @param string $type left, right or print */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index b179ccc..86ddc8d 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -55,7 +55,7 @@ class PMA_Theme_Manager /** * sets path to folder containing the themes * - * @param string $path path to themes folder + * @param string $path path to themes folder * @return boolean success */ function setThemesPath($path) @@ -80,7 +80,7 @@ class PMA_Theme_Manager /** * sets if there are different themes per server * - * @param boolean $per_server + * @param boolean $per_server */ function setThemePerServer($per_server) { @@ -200,7 +200,7 @@ class PMA_Theme_Manager /** * @private - * @param string $folder + * @param string $folder * @return boolean */ /*private*/ function _checkThemeFolder($folder) @@ -252,7 +252,7 @@ class PMA_Theme_Manager /** * checks if given theme name is a known theme * - * @param string $theme name fo theme to check for + * @param string $theme name fo theme to check for */ function checkTheme($theme) { @@ -266,7 +266,7 @@ class PMA_Theme_Manager /** * returns HTML selectbox, with or without form enclosed * - * @param boolean $form whether enclosed by from tags or not + * @param boolean $form whether enclosed by from tags or not */ function getHtmlSelectBox($form = true) { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index da9a56a..c82d0d9 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -168,7 +168,7 @@ class PMA_Tracker * * @static * - * @param string $string part of SQL statement + * @param string $string part of SQL statement * * @return string the name of table */ @@ -198,8 +198,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return boolean true or false */ @@ -250,11 +250,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @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 string $dbname name of database + * @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 * * @return int result of version insertion */ @@ -357,8 +357,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return int result of version insertion */ @@ -378,10 +378,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $version version - * @param string $query query - * @param string $tracking_set set of tracking statements + * @param string $dbname name of database + * @param string $version version + * @param string $query query + * @param string $tracking_set set of tracking statements * * @return int result of version insertion */ @@ -443,10 +443,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param integer $new_state the new state of tracking + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param integer $new_state the new state of tracking * * @return int result of SQL query */ @@ -469,11 +469,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 */ @@ -514,9 +514,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -531,9 +531,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -549,9 +549,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $statement tracked statement + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $statement tracked statement * * @return int (-1 if no version exists | > 0 if a version exists) */ @@ -581,9 +581,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version number + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version number * * @return mixed record DDM log, DDL log, structure snapshot, tracked statements. */ @@ -892,7 +892,7 @@ class PMA_Tracker * * * @static - * @param string $query a SQL query + * @param string $query a SQL query */ static public function handleQuery($query) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 710015f..69abf52 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -483,8 +483,8 @@ class Horde_Cipher_blowfish /** * Encryption using blowfish algorithm * - * @param string original data - * @param string the secret + * @param string original data + * @param string the secret * * @return string the encrypted result * @@ -511,8 +511,8 @@ function PMA_blowfish_encrypt($data, $secret) /** * Decryption using blowfish algorithm * - * @param string encrypted data - * @param string the secret + * @param string encrypted data + * @param string the secret * * @return string original data * diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index c978730..723b042 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -41,7 +41,7 @@ function PMA_Bookmark_getParams() * * @global resource the controluser db connection handle * - * @param string the current database name + * @param string the current database name * * @return array the bookmarks list (key as index, label as value) * @@ -86,11 +86,11 @@ function PMA_Bookmark_getList($db) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param mixed the id of the bookmark to get - * @param string which field to look up the $id - * @param boolean true: get all bookmarks regardless of the owning user - * @param boolean whether to ignore bookmarks with no user + * @param string the current database name + * @param mixed the id of the bookmark to get + * @param string which field to look up the $id + * @param boolean true: get all bookmarks regardless of the owning user + * @param boolean whether to ignore bookmarks with no user * * @return string the sql query * @@ -127,9 +127,9 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal * * @global resource the controluser db connection handle * - * @param array the properties of the bookmark to add; here, + * @param array the properties of the bookmark to add; here, * $fields['query'] is urlencoded - * @param boolean whether to make the bookmark available for all users + * @param boolean whether to make the bookmark available for all users * * @return boolean whether the INSERT succeeds or not * @@ -156,8 +156,8 @@ function PMA_Bookmark_save($fields, $all_users = false) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param integer the id of the bookmark to get + * @param string the current database name + * @param integer the id of the bookmark to get * * @access public */ diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 9acd184..b3ae693 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -58,9 +58,9 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { * Converts encoding of text according to parameters with detected * conversion function. * - * @param string source charset - * @param string target charset - * @param string what to convert + * @param string source charset + * @param string target charset + * @param string what to convert * * @return string converted text * diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 34d20d9..1607d6e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -207,7 +207,7 @@ function PMA_escape_mysql_wildcards($name) * removes slashes before "_" and "%" characters * Note: This function does not unescape backslashes! * - * @param string $name the string to escape + * @param string $name the string to escape * @return string the escaped string * @access public */ @@ -439,9 +439,9 @@ function PMA_showPHPDocu($target) { /** * returns HTML for a footnote marker and add the messsage to the footnotes * - * @param string $message the error message - * @param bool $bbcode - * @param string $type + * @param string $message the error message + * @param bool $bbcode + * @param string $type * @return string html code for a footnote marker * @access public */ @@ -480,11 +480,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') /** * Displays a MySQL error message in the right frame. * - * @param string $error_message the error message - * @param string $the_query the sql query that failed - * @param bool $is_modify_link whether to show a "modify" link or not - * @param string $back_url the "back" link url (full path is not required) - * @param bool $exit EXIT the page? + * @param string $error_message the error message + * @param string $the_query the sql query that failed + * @param bool $is_modify_link whether to show a "modify" link or not + * @param string $back_url the "back" link url (full path is not required) + * @param bool $exit EXIT the page? * * @global string the curent table * @global string the current db @@ -630,10 +630,10 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * returns array with tables of given db with extended information and grouped * - * @param string $db name of db - * @param string $tables name of tables - * @param integer $limit_offset list offset - * @param int|bool $limit_count max tables to return + * @param string $db name of db + * @param string $tables name of tables + * @param integer $limit_offset list offset + * @param int|bool $limit_count max tables to return * @return array (recursive) grouped table list */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) @@ -760,9 +760,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * </code> * - * @param mixed $a_name the database, table or field name to "backquote" + * @param mixed $a_name the database, table or field name to "backquote" * or array of it - * @param boolean $do_it a flag to bypass this function (used by dump + * @param boolean $do_it a flag to bypass this function (used by dump * functions) * @return mixed the "backquoted" database, table or field name * @access public @@ -854,10 +854,10 @@ if (!$jsonly) * displays the message and the query * usually the message is the result of the query executed * - * @param string $message the message to display - * @param string $sql_query the query to display - * @param string $type the type (level) of the message - * @param boolean $is_view is this a message after a VIEW operation? + * @param string $message the message to display + * @param string $sql_query the query to display + * @param string $type the type (level) of the message + * @param boolean $is_view is this a message after a VIEW operation? * @return string * @access public */ @@ -1237,7 +1237,7 @@ function PMA_profilingSupported() /** * Displays a form with the Profiling checkbox * - * @param string $sql_query + * @param string $sql_query * @access public */ function PMA_profilingCheckbox($sql_query) @@ -1329,11 +1329,11 @@ function PMA_localizeNumber($value) * echo PMA_formatNumber(0, 6); // 0 * * </code> - * @param double $value the value to format - * @param integer $digits_left number of digits left of the comma - * @param integer $digits_right number of digits right of the comma - * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * @param double $value the value to format + * @param integer $digits_left number of digits left of the comma + * @param integer $digits_right number of digits right of the comma + * @param boolean $only_down do not reformat numbers below 1 + * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) * * @return string the formatted value and its unit * @@ -1411,7 +1411,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow /** * Returns the number of bytes when a formatted size is given * - * @param string $formatted_size the size expression (for example 8MB) + * @param string $formatted_size the size expression (for example 8MB) * @return integer The numerical part of the expression (for example 8) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1500,8 +1500,8 @@ function PMA_localisedDate($timestamp = -1, $format = '') * returns a tab for tabbed navigation. * If the variables $link and $args ar left empty, an inactive tab is created * - * @param array $tab array with all options - * @param array $url_params + * @param array $tab array with all options + * @param array $url_params * @return string html code for one tab, a link if valid otherwise a span * @access public */ @@ -1599,8 +1599,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') /** * returns html-code for a tab navigation * - * @param array $tabs one element per tab - * @param string $url_params + * @param array $tabs one element per tab + * @param string $url_params * @return string html-code for tab-navigation */ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') @@ -1627,14 +1627,14 @@ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') * Displays a link, or a button if the link's URL is too large, to * accommodate some browsers' limitations * - * @param string $url the URL - * @param string $message the link message - * @param mixed $tag_params string: js confirmation + * @param string $url the URL + * @param string $message the link message + * @param mixed $tag_params string: js confirmation * array: additional tag params (f.e. style="") - * @param boolean $new_form we set this to false when we are already in + * @param boolean $new_form we set this to false when we are already in * a form, to avoid generating nested forms - * @param boolean $strip_img - * @param string $target + * @param boolean $strip_img + * @param string $target * * @return string the results to be echoed or saved in an array */ @@ -1762,7 +1762,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Returns a given timespan value in a readable format. * - * @param int $seconds the timespan + * @param int $seconds the timespan * * @return string the formatted value */ @@ -1791,8 +1791,8 @@ function PMA_timespanFormat($seconds) * http://sf.net/tracker/?func=detail&aid=544361&group_id=23067&atid=377411 * * @todo add a multibyte safe function PMA_STR_split() - * @param string $string The string - * @param string $Separator The Separator (defaults to "<br />\n") + * @param string $string The string + * @param string $Separator The Separator (defaults to "<br />\n") * * @access public * @return string The flipped string @@ -1838,11 +1838,11 @@ function PMA_flipstring($string, $Separator = "<br />\n") * would have to check if the error message file is always available * * @todo use PMA_fatalError() if $die === true? - * @param array $params The names of the parameters needed by the calling script. - * @param bool $die Stop the execution? + * @param array $params The names of the parameters needed by the calling script. + * @param bool $die Stop the execution? * (Set this manually to false in the calling script * until you know all needed parameters to check). - * @param bool $request Whether to include this list in checking for special params. + * @param bool $request Whether to include this list in checking for special params. * @global string path to current script * @global boolean flag whether any special variable was required * @@ -1889,11 +1889,11 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or unique + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk or unique * * @access public * @return array the calculated condition and whether condition is unique @@ -2011,12 +2011,12 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force /** * Generate a button or image tag * - * @param string $button_name name of button element - * @param string $button_class class of button element - * @param string $image_name name of image element - * @param string $text text to display - * @param string $image image to display - * @param string $value + * @param string $button_name name of button element + * @param string $button_class class of button element + * @param string $image_name name of image element + * @param string $text text to display + * @param string $image image to display + * @param string $value * * @access public */ @@ -2052,17 +2052,17 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /** * Generate a pagination selector for browsing resultsets * - * @param int $rows Number of rows in the pagination set - * @param int $pageNow current page number - * @param int $nbTotalPage number of total pages - * @param int $showAll If the number of pages is lower than this + * @param int $rows Number of rows in the pagination set + * @param int $pageNow current page number + * @param int $nbTotalPage number of total pages + * @param int $showAll If the number of pages is lower than this * variable, no pages will be omitted in pagination - * @param int $sliceStart How many rows at the beginning should always be shown? - * @param int $sliceEnd How many rows at the end should always be shown? - * @param int $percent Percentage of calculation page offsets to hop to a next page - * @param int $range Near the current page, how many pages should + * @param int $sliceStart How many rows at the beginning should always be shown? + * @param int $sliceEnd How many rows at the end should always be shown? + * @param int $percent Percentage of calculation page offsets to hop to a next page + * @param int $range Near the current page, how many pages should * be considered "nearby" and displayed as well? - * @param string $prompt The prompt to display (sometimes empty) + * @param string $prompt The prompt to display (sometimes empty) * * @return string * @access public @@ -2151,12 +2151,12 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, * Generate navigation for a list * * @todo use $pos from $_url_params - * @param int $count number of elements in the list - * @param int $pos current position in the list - * @param array $_url_params url parameters - * @param string $script script name for form target - * @param string $frame target frame - * @param int $max_count maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public */ @@ -2238,7 +2238,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> - * @param string $dir with wildcard for user + * @param string $dir with wildcard for user * @return string per user directory */ function PMA_userDir($dir) @@ -2254,7 +2254,7 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @param string $database + * @param string $database * @return string html link to default db page */ function PMA_getDbLink($database = null) @@ -2277,10 +2277,10 @@ function PMA_getDbLink($database = null) * Displays a lightbulb hint explaining a known external bug * that affects a functionality * - * @param string $functionality localized message explaining the func. - * @param string $component 'mysql' (eventually, 'php') - * @param string $minimum_version of this component - * @param string $bugref bug reference for this component + * @param string $functionality localized message explaining the func. + * @param string $component 'mysql' (eventually, 'php') + * @param string $minimum_version of this component + * @param string $bugref bug reference for this component */ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) { @@ -2292,10 +2292,10 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) /** * Generates and echoes an HTML checkbox * - * @param string $html_field_name the checkbox HTML field - * @param string $label - * @param boolean $checked is it initially checked? - * @param boolean $onclick should it submit the form on click? + * @param string $html_field_name the checkbox HTML field + * @param string $label + * @param boolean $checked is it initially checked? + * @param boolean $onclick should it submit the form on click? */ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { @@ -2305,12 +2305,12 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) /** * Generates and echoes a set of radio HTML fields * - * @param string $html_field_name the radio HTML field - * @param array $choices the choices values and labels - * @param string $checked_choice the choice to check by default - * @param boolean $line_break whether to add an HTML line break after a choice - * @param boolean $escape_label whether to use htmlspecialchars() on label - * @param string $class enclose each choice with a div of this class + * @param string $html_field_name the radio HTML field + * @param array $choices the choices values and labels + * @param string $checked_choice the choice to check by default + * @param boolean $line_break whether to add an HTML line break after a choice + * @param boolean $escape_label whether to use htmlspecialchars() on label + * @param string $class enclose each choice with a div of this class */ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='') { foreach ($choices as $choice_value => $choice_label) { @@ -2337,10 +2337,10 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' /** * Generates and returns an HTML dropdown * - * @param string $select_name - * @param array $choices choices values - * @param string $active_choice the choice to select by default - * @param string $id id of the select element; can be different in case + * @param string $select_name + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case * the dropdown is present more than once on the page * @return string * @todo support titles @@ -2365,8 +2365,8 @@ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) * controlling the slider; you have to generate the </div> yourself * after the sliding section. * - * @param string $id the id of the <div> on which to apply the effect - * @param string $message the message to show as a link + * @param string $id the id of the <div> on which to apply the effect + * @param string $message the message to show as a link */ function PMA_generate_slider_effect($id, $message) { @@ -2389,10 +2389,10 @@ function PMA_generate_slider_effect($id, $message) /** * Creates an AJAX sliding toggle button (or and equivalent form when AJAX is disabled) * - * @param string $action The URL for the request to be executed - * @param string $select_name The name for the dropdown box - * @param array $options An array of options (see rte_footer.lib.php) - * @param string $callback A JS snippet to execute when the request is + * @param string $action The URL for the request to be executed + * @param string $select_name The name for the dropdown box + * @param array $options An array of options (see rte_footer.lib.php) + * @param string $callback A JS snippet to execute when the request is * successfully processed * * @return string HTML code for the toggle button @@ -2543,8 +2543,8 @@ function PMA_cacheUnset($var, $server = 0) * in MySQL a BIT field can be from 1 to 64 bits so we need this * function because in PHP, decbin() supports only 32 bits * - * @param numeric $value coming from a BIT field - * @param integer $length + * @param numeric $value coming from a BIT field + * @param integer $length * @return string the printable value */ function PMA_printable_bit_value($value, $length) { @@ -2559,7 +2559,7 @@ function PMA_printable_bit_value($value, $length) { /** * Verifies whether the value contains a non-printable character * - * @param string $value + * @param string $value * @return boolean */ function PMA_contains_nonprintable_ascii($value) { @@ -2570,7 +2570,7 @@ function PMA_contains_nonprintable_ascii($value) { * Converts a BIT type default value * for example, b'010' becomes 010 * - * @param string $bit_default_value + * @param string $bit_default_value * @return string the converted value */ function PMA_convert_bit_default_value($bit_default_value) { @@ -2580,7 +2580,7 @@ function PMA_convert_bit_default_value($bit_default_value) { /** * Extracts the various parts from a field type spec * - * @param string $fieldspec + * @param string $fieldspec * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ @@ -2656,7 +2656,7 @@ function PMA_extractFieldSpec($fieldspec) { /** * Verifies if this table's engine supports foreign keys * - * @param string $engine + * @param string $engine * @return boolean */ function PMA_foreignkey_supported($engine) { @@ -2671,7 +2671,7 @@ function PMA_foreignkey_supported($engine) { /** * Replaces some characters by a displayable equivalent * - * @param string $content + * @param string $content * @return string the content with characters replaced */ function PMA_replace_binary_contents($content) { @@ -2798,9 +2798,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 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 * */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) @@ -2924,8 +2924,8 @@ function PMA_buildActionTitles() { * $cfg['ColumnTypes'] and either returns an array (useful for quickly checking * if a datatype is supported) or an HTML snippet that creates a drop-down list. * - * @param bool $html Whether to generate an html snippet or an array - * @param string $selected The value to mark as selected in HTML mode + * @param bool $html Whether to generate an html snippet or an array + * @param string $selected The value to mark as selected in HTML mode * * @return mixed An HTML snippet or an array of datatypes. * @@ -3007,9 +3007,9 @@ function PMA_unsupportedDatatypes() { /** * Creates a dropdown box with MySQL functions for a particular column. * - * @param array $field Data about the column for which + * @param array $field Data about the column for which * to generate the dropdown - * @param bool $insert_mode Whether the operation is 'insert' + * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration * @global array $analyzed_sql Analyzed SQL query @@ -3112,10 +3112,10 @@ function PMA_getFunctionsForField($field, $insert_mode) * // user has this privilege on database 'mydb'. * * - * @param string $priv The privilege to check - * @param mixed $db null, to only check global privileges + * @param string $priv The privilege to check + * @param mixed $db null, to only check global privileges * string, db name where to also check for privileges - * @param mixed $tbl null, to only check global privileges + * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges * @return bool */ diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fe533e3..bb542ba 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -30,9 +30,9 @@ * </code> * * @see PMA_isValid() - * @param mixed $var param to check - * @param mixed $default default value - * @param mixed $type var type or array of values to check against $var + * @param mixed $var param to check + * @param mixed $default default value + * @param mixed $type var type or array of values to check against $var * @return mixed $var or $default */ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') @@ -80,9 +80,9 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') * @todo create some testsuites * @todo add some more var types like hex, bin, ...? * @see http://php.net/gettype - * @param mixed $var variable to check - * @param mixed $type var type or array of valid values to check against $var - * @param mixed $compare var to compare with $var + * @param mixed $var variable to check + * @param mixed $type var type or array of valid values to check against $var + * @param mixed $compare var to compare with $var * @return boolean whether valid or not */ function PMA_isValid(&$var, $type = 'length', $compare = null) @@ -171,7 +171,7 @@ function PMA_isValid(&$var, $type = 'length', $compare = null) * require() when a part of the path comes from an insecure source * like a cookie or form. * - * @param string The path to check + * @param string The path to check * * @return string The secured path * @@ -192,8 +192,8 @@ function PMA_securePath($path) * loads language file if not loaded already * * @todo use detected argument separator (PMA_Config) - * @param string $error_message the error message or named error message - * @param string|array $message_args arguments applied to $error_message + * @param string $error_message the error message or named error message + * @param string|array $message_args arguments applied to $error_message * @return exit */ function PMA_fatalError($error_message, $message_args = null) @@ -276,7 +276,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') /** * returns count of tables in given db * - * @param string $db database to count tables for + * @param string $db database to count tables for * @return integer count of tables in $db */ function PMA_getTableCount($db) @@ -308,7 +308,7 @@ function PMA_getTableCount($db) * (renamed with PMA prefix to avoid double definition when embedded * in Moodle) * - * @param string $size + * @param string $size * @return integer $size */ function PMA_get_real_size($size = 0) @@ -343,9 +343,9 @@ function PMA_get_real_size($size = 0) * * @see http://php.net/array_merge * @see http://php.net/array_merge_recursive - * @param array array to merge - * @param array array to merge - * @param array ... + * @param array array to merge + * @param array array to merge + * @param array ... * @return array merged array */ function PMA_array_merge_recursive() @@ -398,8 +398,8 @@ function PMA_array_merge_recursive() * @see http://www.php-security.org/MOPB/MOPB-02-2007.html * @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549 * - * @param array $array array to walk - * @param string $function function to call for every array element + * @param array $array array to walk + * @param string $function function to call for every array element */ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) { @@ -431,8 +431,8 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) * checks given given $page against given $whitelist and returns true if valid * it ignores optionaly query paramters in $page (script.php?ignored) * - * @param string &$page page to check - * @param array $whitelist whitelist to check page against + * @param string &$page page to check + * @param array $whitelist whitelist to check page against * @return boolean whether $page is valid or not (in $whitelist or not) */ function PMA_checkPageValidity(&$page, $whitelist) @@ -460,7 +460,7 @@ function PMA_checkPageValidity(&$page, $whitelist) * searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv() * in this order * - * @param string $var_name variable name + * @param string $var_name variable name * @return string value of $var or empty string */ function PMA_getenv($var_name) { @@ -481,7 +481,7 @@ function PMA_getenv($var_name) { /** * Send HTTP header, taking IIS limits into account (600 seems ok) * - * @param string $uri the header to send + * @param string $uri the header to send * @return boolean always true */ function PMA_sendHeaderLocation($uri) @@ -542,9 +542,9 @@ function PMA_sendHeaderLocation($uri) * $path is a string describing position of an element in an associative array, * eg. Servers/1/host refers to $array[Servers][1][host] * - * @param string $path - * @param array $array - * @param mixed $default + * @param string $path + * @param array $array + * @param mixed $default * @return mixed array element or $default */ function PMA_array_read($path, $array, $default = null) @@ -563,9 +563,9 @@ function PMA_array_read($path, $array, $default = null) /** * Stores value in an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_write($path, &$array, $value) { @@ -584,9 +584,9 @@ function PMA_array_write($path, &$array, $value) /** * Removes value from an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_remove($path, &$array) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index e7d08a5..42bd352 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -22,7 +22,7 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Checks one of the mysql extensions * - * @param string $extension mysql extension to check + * @param string $extension mysql extension to check */ function PMA_DBI_checkMysqlExtension($extension = 'mysql') { if (! function_exists($extension . '_connect')) { @@ -145,7 +145,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r * uses language to charset mapping from mysql/share/errmsg.txt * and charset names to ISO charset from information_schema.CHARACTER_SETS * - * @param string $message + * @param string $message * @return string $message */ function PMA_DBI_convert_message($message) { @@ -218,8 +218,8 @@ function PMA_DBI_convert_message($message) { /** * returns array with table names for given db * - * @param string $database name of database - * @param mixed $link mysql link resource|object + * @param string $database name of database + * @param mixed $link mysql link resource|object * @return array tables names */ function PMA_DBI_get_tables($database, $link = null) @@ -231,8 +231,8 @@ function PMA_DBI_get_tables($database, $link = null) /** * usort comparison callback * - * @param string $a first argument to sort - * @param string $b second argument to sort + * @param string $a first argument to sort + * @param string $b second argument to sort * * @return integer a value representing whether $a should be before $b in the * sorted array or not @@ -275,14 +275,14 @@ function PMA_usort_comparison_callback($a, $b) * </code> * * @todo move into PMA_Table - * @param string $database database - * @param string|false $table table - * @param boolean|string $tbl_is_group $table is a table group - * @param resource $link mysql link - * @param integer $limit_offset zero-based offset for the count - * @param boolean|integer $limit_count number of tables to return - * @param string $sort_by table attribute to sort by - * @param string $sort_order direction to sort (ASC or DESC) + * @param string $database database + * @param string|false $table table + * @param boolean|string $tbl_is_group $table is a table group + * @param resource $link mysql link + * @param integer $limit_offset zero-based offset for the count + * @param boolean|integer $limit_count number of tables to return + * @param string $sort_by table attribute to sort by + * @param string $sort_order direction to sort (ASC or DESC) * @return array list of tables in given db(s) */ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, @@ -526,13 +526,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * returns array with databases containing extended infos about them * * @todo move into PMA_List_Database? - * @param string $database database - * @param boolean $force_stats retrieve stats also for MySQL < 5 - * @param resource $link mysql link - * @param string $sort_by column to order by - * @param string $sort_order ASC or DESC - * @param integer $limit_offset starting offset for LIMIT - * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] + * @param string $database database + * @param boolean $force_stats retrieve stats also for MySQL < 5 + * @param resource $link mysql link + * @param string $sort_by column to order by + * @param string $sort_order ASC or DESC + * @param integer $limit_offset starting offset for LIMIT + * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, @@ -698,10 +698,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * returns detailed array with all columns for given table in database, * or all tables/databases * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of specific column - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of specific column + * @param mixed $link mysql link resource * @return array */ function PMA_DBI_get_columns_full($database = null, $table = null, @@ -825,10 +825,10 @@ function PMA_DBI_get_columns_full($database = null, $table = null, /** * array PMA_DBI_get_columns(string $database, string $table, bool $full = false, mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param boolean $full whether to return full info or only column names - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param boolean $full whether to return full info or only column names + * @param mixed $link mysql link resource * @return array column names */ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) @@ -846,9 +846,9 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) /** * returns value of given mysql server variable * - * @param string $var mysql server variable name - * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL - * @param mixed $link mysql link resource|object + * @param string $var mysql server variable name + * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL + * @param mixed $link mysql link resource|object * @return mixed value for mysql server variable */ @@ -881,8 +881,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null * Function called just after a connection to the MySQL database server has been established * It sets the connection collation, and determins the version of MySQL which is running. * - * @param mixed $link mysql link resource|object - * @param boolean $is_controluser + * @param mixed $link mysql link resource|object + * @param boolean $is_controluser */ function PMA_DBI_postConnect($link, $is_controluser = false) { @@ -938,13 +938,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @param string|mysql_result $result query or mysql result - * @param integer $row_number row to fetch the value from, + * @param string|mysql_result $result query or mysql result + * @param integer $row_number row to fetch the value from, * starting at 0, with 0 beeing default - * @param integer|string $field field to fetch the value from, + * @param integer|string $field field to fetch the value from, * starting at 0, with 0 beeing default - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return mixed value of first field in first row from result * or false if not found */ @@ -993,12 +993,12 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, * // $user = array('id' => 123, 'name' => 'John Doe') * </code> * - * @param string|mysql_result $result query or mysql result - * @param string $type NUM|ASSOC|BOTH + * @param string|mysql_result $result query or mysql result + * @param string $type NUM|ASSOC|BOTH * returned array should either numeric * associativ or booth - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array|boolean first row from result * or false if result is empty */ @@ -1072,13 +1072,13 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio * // $users['admin']['John Doe'] = '123' * </code> * - * @param string|mysql_result $result query or mysql result - * @param string|integer $key field-name or offset + * @param string|mysql_result $result query or mysql result + * @param string|integer $key field-name or offset * used as key for array - * @param string|integer $value value-name or offset + * @param string|integer $value value-name or offset * used as value for array - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array resultrows or values indexed by $key */ function PMA_DBI_fetch_result($result, $key = null, $value = null, @@ -1202,7 +1202,7 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @param resource $link mysql link resource + * @param resource $link mysql link resource * @return array warnings */ function PMA_DBI_get_warnings($link = null) @@ -1245,9 +1245,9 @@ function PMA_isSuperuser() /** * returns an array of PROCEDURE or FUNCTION names for a db * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION + * @param resource $link mysql link * * @return array the procedure names or function names */ @@ -1266,10 +1266,10 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) /** * returns the definition of a specific PROCEDURE, FUNCTION or EVENT * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION | EVENT - * @param string $name the procedure|function|event name - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION | EVENT + * @param string $name the procedure|function|event name + * @param resource $link mysql link * * @return string the definition */ @@ -1287,9 +1287,9 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) /** * returns details about the TRIGGERs for a specific table or database * - * @param string $db db name - * @param string $table table name - * @param string $delimiter the delimiter to use (may be empty) + * @param string $db db name + * @param string $table tablme delimiter to use (may be empty)null) null) $optioull)abel = true, $class='') { find out why click %shere%s.')ɣ��*�D��*��*��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��e name + * @param string $delimiter the delimiter to use (may be empty) * * @return array information about triggers (may be empty) */ @@ -1352,8 +1352,8 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') /** * Returns true if $db.$view_name is a view, false if not * - * @param string $db database name - * @param string $view_name view/table name + * @param string $db database name + * @param string $view_name view/table name * * @return bool true if $db.$view_name is a view, false if not */ diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index de56e83..dc82af4 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -35,9 +35,9 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; /** * fills given tooltip arrays * - * @param array $tooltip_truename tooltip data - * @param array $tooltip_aliasname tooltip data - * @param array $table tabledata + * @param array $tooltip_truename tooltip data + * @param array $tooltip_aliasname tooltip data + * @param array $table tabledata */ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 82a3f58..179e752 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -13,8 +13,8 @@ if (! defined('PHPMYADMIN')) { * void PMA_TableHeader([bool $db_is_information_schema = false]) * display table header (<table><thead>...</thead><tbody>) * - * @param boolean $db_is_information_schema - * @param boolean $replication + * @param boolean $db_is_information_schema + * @param boolean $replication */ function PMA_TableHeader($db_is_information_schema = false, $replication = false) { @@ -65,9 +65,9 @@ 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 + * @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 */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 4f846bf..4ed3ec2 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Sorts available languages by their true english names * - * @param array the array to be sorted - * @param mixed a required parameter + * @param array the array to be sorted + * @param mixed a required parameter * @return the sorted array * @access private */ diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index adaa407..9e02c24 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -28,9 +28,9 @@ require_once './libraries/Index.class.php'; * the "display printable view" option. * Of course '0'/'1' means the feature won't/will be enabled. * - * @param string &$the_disp_mode the synthetic value for display_mode (see a few + * @param string &$the_disp_mode the synthetic value for display_mode (see a few * lines above for explanations) - * @param integer &$the_total the total number of rows returned by the SQL query + * @param integer &$the_total the total number of rows returned by the SQL query * without any programmatically appended "LIMIT" clause * (just a copy of $unlim_num_rows if it exists, else * computed inside this function) @@ -463,10 +463,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di /** * Displays the headers of the results table * - * @param array which elements to display - * @param array the list of fields properties - * @param integer the total number of fields returned by the SQL query - * @param array the analyzed query + * @param array which elements to display + * @param array the list of fields properties + * @param integer the total number of fields returned by the SQL query + * @param array the analyzed query * * @return boolean $clause_is_unique * @@ -1060,9 +1060,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ /** * Prepares the display for a value * - * @param string $class - * @param string $condition_field - * @param string $value + * @param string $class + * @param string $condition_field + * @param string $value * * @return string the td */ @@ -1073,8 +1073,8 @@ function PMA_buildValueDisplay($class, $condition_field, $value) { /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class + * @param string $condition_field * * @return string the td */ @@ -1086,9 +1086,9 @@ function PMA_buildNullDisplay($class, $condition_field) { /** * Prepares the display for an empty value * - * @param string $class - * @param string $condition_field - * @param string $align + * @param string $class + * @param string $condition_field + * @param string $align * * @return string the td */ @@ -1142,11 +1142,11 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca /** * Displays the body of the results table * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array which elements to display - * @param array the list of relations - * @param array the analyzed query + * @param array which elements to display + * @param array the list of relations + * @param array the analyzed query * * @return boolean always true * @@ -2026,10 +2026,10 @@ function PMA_displayTable_checkConfigParams() * Displays a table of results returned by a SQL query. * This function is called by the "sql.php" script. * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2392,8 +2392,8 @@ function default_function($buffer) { /** * Displays operations that are available on results. * - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2535,12 +2535,12 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * - * @param string $category BLOB|BINARY|GEOMETRY - * @param string $content the binary content - * @param string $transform_function - * @param string $transform_options - * @param string $default_function - * @param object $meta the meta-information about this field + * @param string $category BLOB|BINARY|GEOMETRY + * @param string $content the binary content + * @param string $transform_function + * @param string $transform_options + * @param string $default_function + * @param object $meta the meta-information about this field * @return mixed string or float */ function PMA_handle_non_printable_contents($category, $content, $transform_function, $transform_options, $default_function, $meta, $url_params = array()) { @@ -2580,17 +2580,17 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct * Prepares the displayable content of a data cell in Browse mode, * taking into account foreign key description field and transformations * - * @param string $class - * @param string $condition_field - * @param string $analyzed_sql - * @param object $meta the meta-information about this field - * @param string $map - * @param string $data - * @param string $transform_function - * @param string $default_function - * @param string $nowrap - * @param string $where_comparison - * @param bool $is_field_truncated + * @param string $class + * @param string $condition_field + * @param string $analyzed_sql + * @param object $meta the meta-information about this field + * @param string $map + * @param string $data + * @param string $transform_function + * @param string $default_function + * @param string $nowrap + * @param string $where_comparison + * @param bool $is_field_truncated * @return string formatted data */ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) { @@ -2681,13 +2681,13 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m /** * Generates a checkbox for multi-row submits * - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $class + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $class * @return string the generated HTML */ @@ -2710,11 +2710,11 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla /** * Generates an Edit link * - * @param string $edit_url - * @param string $class - * @param string $edit_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $edit_url + * @param string $class + * @param string $edit_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html) { @@ -2737,10 +2737,10 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher /** * Generates an Copy link * - * @param string $copy_url - * @param string $copy_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $copy_url + * @param string $copy_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause_html, $class) { @@ -2767,10 +2767,10 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause /** * Generates a Delete link * - * @param string $del_url - * @param string $del_str - * @param string $js_conf - * @param string $class + * @param string $del_url + * @param string $del_str + * @param string $js_conf + * @param string $class * @return string the generated HTML */ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { @@ -2791,20 +2791,20 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { * Generates checkbox and links at some position (left or right) * (only called for horizontal mode) * - * @param string $position - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $edit_url - * @param string $copy_url - * @param string $class - * @param string $edit_str - * @param string $del_str - * @param string $js_conf + * @param string $position + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $edit_url + * @param string $copy_url + * @param string $class + * @param string $edit_str + * @param string $del_str + * @param string $js_conf * @return string the generated HTML */ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf) { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 35fe21d..357eac0 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -73,7 +73,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -86,7 +86,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -99,7 +99,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -112,11 +112,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in NHibernate format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 0240e9b..19ca573 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -96,7 +96,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,7 +108,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -120,7 +120,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -132,11 +132,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in CSV format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 049cdc6..6604ac6 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -69,7 +69,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,7 +93,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,11 +105,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in HTML (Microsoft Word) format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -170,20 +170,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/json.php b/libraries/export/json.php index 989ef88..e008f0c 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -67,7 +67,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -94,7 +94,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -107,11 +107,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in JSON format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 0742109..080d0ac 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -85,7 +85,7 @@ if (isset($plugin_list)) { /** * Escapes some special characters for use in TeX/LaTeX * - * @param string the string to convert + * @param string the string to convert * * @return string the converted string with escape codes * @@ -140,7 +140,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -156,7 +156,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -168,7 +168,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -180,11 +180,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -277,20 +277,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 7599df9..8ec3749 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -49,7 +49,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -61,7 +61,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -73,7 +73,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -85,11 +85,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in MediaWiki format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 9d9ff13..fa62a96 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -102,7 +102,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -114,7 +114,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -126,7 +126,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -138,11 +138,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/odt.php b/libraries/export/odt.php index f2b13a0..dba6e1c 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -100,7 +100,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -113,7 +113,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -125,7 +125,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -137,11 +137,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODT format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -209,20 +209,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index e135bc8..01ffc88 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -408,7 +408,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -421,7 +421,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -434,7 +434,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -447,11 +447,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in PDF format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 1996e6f..783afe0 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -68,7 +68,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -82,7 +82,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -95,7 +95,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,11 +108,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table as a fragment of PHP code * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 81058a8..0781db4 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -304,7 +304,7 @@ if (! isset($sql_backquotes)) { /** * Exports routines (procedures and functions) * - * @param string $db + * @param string $db * @return bool Whether it suceeded * * @access public @@ -371,7 +371,7 @@ function PMA_exportRoutines($db) { /** * Possibly outputs comment * - * @param string $text Text of comment + * @param string $text Text of comment * @return string The formatted comment * * @access private @@ -536,7 +536,7 @@ function PMA_exportHeader() /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -572,7 +572,7 @@ function PMA_exportDBCreate($db) /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -588,7 +588,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -642,9 +642,9 @@ function PMA_exportDBFooter($db) /** * Returns a stand-in CREATE definition to resolve view dependencies * - * @param string $db the database name - * @param string $view the view name - * @param string $crlf the end of line sequence + * @param string $db the database name + * @param string $view the view name + * @param string $crlf the end of line sequence * @return string resulting definition * * @access public @@ -673,13 +673,13 @@ function PMA_getTableDefStandIn($db, $view, $crlf) { /** * Returns $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $show_dates whether to include creation/update/check dates - * @param bool $add_semicolon whether to add semicolon and end-of-line at the end - * @param bool $view whether we're handling a view + * @param string $db the database name + * @param string $table the table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $show_dates whether to include creation/update/check dates + * @param bool $add_semicolon whether to add semicolon and end-of-line at the end + * @param bool $view whether we're handling a view * @return string resulting schema * * @access public @@ -878,11 +878,11 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a /** * Returns $table's comments, relations etc. * - * @param string $db database name - * @param string $table table name - * @param string $crlf end of line sequence - * @param bool $do_relation whether to include relation comments - * @param bool $do_mime whether to include mime comments + * @param string $db database name + * @param string $table table name + * @param string $crlf end of line sequence + * @param bool $do_relation whether to include relation comments + * @param bool $do_mime whether to include mime comments * @return string resulting comments * * @access private @@ -947,20 +947,20 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $relation whether to include relation comments - * @param bool $comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $relation whether to include relation comments + * @param bool $comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public @@ -1025,11 +1025,11 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, /** * Outputs the content of a table in SQL format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 6294311..06de740 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -57,7 +57,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -69,7 +69,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,11 +93,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in Texy format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -152,20 +152,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 6116e2a..5747f08 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -91,7 +91,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,7 +105,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -117,7 +117,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -129,11 +129,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 758d98d..8f5cb19 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -90,7 +90,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -104,7 +104,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -116,7 +116,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -128,11 +128,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLSX format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 9247e22..26953af 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -233,7 +233,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -258,7 +258,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -278,7 +278,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -290,11 +290,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 017cae6..26b19a9 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -64,7 +64,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -77,7 +77,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -90,7 +90,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -103,11 +103,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in YAML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/file_listing.php b/libraries/file_listing.php index ff1cf9d..720ba82 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,8 +10,8 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files + * @param string directory to list + * @param string regular expression to match files * @returns array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') @@ -39,9 +39,9 @@ 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 + * @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 */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index d198855..aafd169 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -15,9 +15,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 $array values from + * @param array $target values to + * @param boolean $sanitize prevent importing key names in $_import_blacklist */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 1f00c13..61e6875 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -40,9 +40,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * Wrapper around IBM AIX iconv(), whose character set naming differs * from the GNU version of iconv(). * - * @param string input character set - * @param string output character set - * @param string the string to convert + * @param string input character set + * @param string output character set + * @param string the string to convert * * @return mixed converted string or false on failure * diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 79b4ade..73f9008 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -44,7 +44,7 @@ function PMA_checkTimeout() /** * Detects what compression filse uses * - * @param string $filepath filename to check + * @param string $filepath filename to check * @return string MIME type of compression, none for none * @access public */ @@ -73,9 +73,9 @@ function PMA_detectCompression($filepath) * Runs query inside import buffer. This is needed to allow displaying * of last SELECT, SHOW or HANDLER results and similar nice stuff. * - * @param string $sql query to run - * @param string $full query to display, this might be commented - * @param bool $controluser whether to use control user for queries + * @param string $sql query to run + * @param string $full query to display, this might be commented + * @param bool $controluser whether to use control user for queries * @access public */ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) @@ -207,9 +207,9 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) /** * Looks for the presence of USE to possibly change current db * - * @param string $buffer buffer to examine - * @param string $db current db - * @param bool $reload reload + * @param string $buffer buffer to examine + * @param string $db current db + * @param bool $reload reload * @return array (current or new db, whether to reload) * @access public */ @@ -227,7 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @param int $size size of buffer to read (this is maximal size function will return) + * @param int $size size of buffer to read (this is maximal size function will return) * @return string part of file/buffer * @access public */ @@ -331,7 +331,7 @@ function PMA_importGetNextChunk($size = 32768) * * @access public * - * @param int $num + * @param int $num * @return string The column's "Excel" name */ function PMA_getColumnAlphaName($num) @@ -378,7 +378,7 @@ function PMA_getColumnAlphaName($num) * * @access public * - * @param string $name (i.e. "A", or "BC", etc.) + * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ function PMA_getColumnNumberFromName($name) { @@ -437,7 +437,7 @@ define("SIZES", 1); * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Precision of the given decimal size notation */ function PMA_getM($last_cumulative_size) { @@ -449,7 +449,7 @@ function PMA_getM($last_cumulative_size) { * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Scale of the given decimal size notation */ function PMA_getD($last_cumulative_size) { @@ -461,7 +461,7 @@ function PMA_getD($last_cumulative_size) { * * @access public * - * @param string &$cell + * @param string &$cell * @return array Contains the precision, scale, and full size representation of the given decimal cell */ function PMA_getDecimalSize(&$cell) { @@ -482,10 +482,10 @@ function PMA_getDecimalSize(&$cell) { * * @access public * - * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param string &$cell The current cell + * @param string $last_cumulative_size Last cumulative column size + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { @@ -693,8 +693,8 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * * @access public * - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) - * @param string &$cell String representation of the cell for which a best-fit type is to be determined + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) + * @param string &$cell String representation of the cell for which a best-fit type is to be determined * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { @@ -733,7 +733,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * * @access public * - * @param &$table array(string $table_name, array $col_names, array $rows) + * @param &$table array(string $table_name, array $col_names, array $rows) * @return array array(array $types, array $sizes) */ function PMA_analyzeTable(&$table) { @@ -826,11 +826,11 @@ $import_notice = null; * * @access public * - * @param string $db_name Name of the database - * @param array &$tables Array of tables for the specified database - * @param array &$analyses Analyses of the tables - * @param array &$additional_sql Additional SQL statements to be executed - * @param array $options Associative array of options + * @param string $db_name Name of the database + * @param array &$tables Array of tables for the specified database + * @param array &$analyses Analyses of the tables + * @param array &$additional_sql Additional SQL statements to be executed + * @param array $options Associative array of options * @return void */ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) { diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 1537b43..c8481ba 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -56,8 +56,8 @@ function PMA_getIp() * Does not match: * xxx.xxx.xxx.xx[yyy-zzz] (range, partial octets not supported) * - * @param string string of IP range to match - * @param string string of IP to test against range + * @param string string of IP range to match + * @param string string of IP to test against range * * @return boolean always true * @@ -112,7 +112,7 @@ function PMA_ipMaskTest($testRange, $ipToTest) /** * Runs through IP Allow/Deny rules the use of it below for more information * - * @param string 'allow' | 'deny' type of rule to match + * @param string 'allow' | 'deny' type of rule to match * * @return bool Matched a rule ? * diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index f7e8fb3..53e5052 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -13,8 +13,8 @@ * This function is used to displays a javascript confirmation box for * "DROP/DELETE/ALTER" queries. * - * @param string $a_string the string to format - * @param boolean $add_backquotes whether to add backquotes to the string or not + * @param string $a_string the string to format + * @param boolean $add_backquotes whether to add backquotes to the string or not * * @return string the formatted string * @@ -42,7 +42,7 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true) * We also remove NUL byte as some browsers (namely MSIE) ignore it and * inserting it anywhere inside </script would allow to bypass this check. * - * @param string $string the string to be escaped + * @param string $string the string to be escaped * @return string the escaped string */ function PMA_escapeJsString($string) diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 552bd13..59891f5 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -65,9 +65,9 @@ function PMA_change_enc_order() { * Kanji string encoding convert * 2002/1/4 by Y.Kawada * - * @param string the string to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the string to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @global string the available encoding codes list * @@ -98,9 +98,9 @@ function PMA_kanji_str_conv($str, $enc, $kana) { * Kanji file encoding convert * 2002/1/4 by Y.Kawada * - * @param string the name of the file to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the name of the file to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @return string the name of the converted file */ @@ -131,7 +131,7 @@ function PMA_kanji_file_conv($file, $enc, $kana) { * Defines radio form fields to switch between encoding modes * 2002/1/4 by Y.Kawada * - * @param string spaces character to prepend the output with + * @param string spaces character to prepend the output with * * @return string xhtml code for the radio controls */ diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 53c309a..fc6b18f 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -153,7 +153,7 @@ function PMA_generateCharsetQueryPart($collation) { /** * returns collation of given db * - * @param string $db name of db + * @param string $db name of db * @return string collation of $db */ function PMA_getDbCollation($db) { @@ -190,7 +190,7 @@ function PMA_getServerCollation() { * returns description for given collation * * - * @param string $collation MySQL collation string + * @param string $collation MySQL collation string * @return string collation description */ function PMA_getCollationDescr($collation) { diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index 810d97f..4af590a 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -23,8 +23,8 @@ $GLOBALS['OpenDocumentNS'] = 'xmlns:office="urn:oasis:names:tc:opendocument:xmln /** * Minimalistic creator of OASIS OpenDocument * - * @param string desired MIME type - * @param string document content + * @param string desired MIME type + * @param string document content * * @return string OASIS OpenDocument data * diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 703215f..b0b82f0 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -11,8 +11,8 @@ * * Reads all plugin information from directory $plugins_dir. * - * @param string $plugins_dir directrory with plugins - * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work + * @param string $plugins_dir directrory with plugins + * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work * @return array list of plugins */ function PMA_getPlugins($plugins_dir, $plugin_param) @@ -40,7 +40,7 @@ function PMA_getPlugins($plugins_dir, $plugin_param) * * returns locale string for $name or $name if no locale is found * - * @param string $name for local string + * @param string $name for local string * @return string locale string for $name */ function PMA_getString($name) @@ -53,9 +53,9 @@ function PMA_getString($name) * * returns html input tag option 'checked' if plugin $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string hmtl input tag option 'checked' */ function PMA_pluginCheckboxCheck($section, $opt) @@ -73,9 +73,9 @@ function PMA_pluginCheckboxCheck($section, $opt) * * returns default value for option $opt * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string default value for option $opt */ function PMA_pluginGetDefault($section, $opt) @@ -107,10 +107,10 @@ function PMA_pluginGetDefault($section, $opt) * * returns html input tag option 'checked' if option $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option - * @param string $val value of option to check against + * @param string $opt name of option + * @param string $val value of option to check against * @return string html input tag option 'checked' */ function PMA_pluginIsActive($section, $opt, $val) @@ -131,11 +131,11 @@ function PMA_pluginIsActive($section, $opt, $val) * returns html select form element for plugin choice * and hidden fields denoting whether each plugin must be exported as a file * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $name name of select element - * @param array &$list array with plugin configuration defined in plugin file - * @param string $cfgname name of config value, if none same as $name + * @param string $name name of select element + * @param array &$list array with plugin configuration defined in plugin file + * @param string $cfgname name of config value, if none same as $name * @return string html select tag */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) @@ -173,11 +173,11 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) * * returns single option in a list element * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $plugin_name unique plugin name - * @param string $id option id - * @param array &$opt plugin option details + * @param string $plugin_name unique plugin name + * @param string $id option id + * @param array &$opt plugin option details * @return string table row with option */ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) @@ -285,8 +285,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) * * return html div with editable options for plugin * - * @param string $section name of config section in $GLOBALS['cfg'][$section] - * @param array &$list array with plugin configuration defined in plugin file + * @param string $section name of config section in $GLOBALS['cfg'][$section] + * @param array &$list array with plugin configuration defined in plugin file * @return string html fieldset with plugin options */ function PMA_pluginGetOptions($section, &$list) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 0b74c70..86d4ab1 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Executes a query as controluser if possible, otherwise as normal user * - * @param string the query to execute - * @param boolean whether to display SQL error messages or not + * @param string the query to execute + * @param boolean whether to display SQL error messages or not * * @return integer the result set, or false if no result set * @@ -42,7 +42,7 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) } // end of the "PMA_query_as_controluser()" function /** - * @param bool $verbose whether to print diagnostic info + * @param bool $verbose whether to print diagnostic info * @return array $cfgRelation */ function PMA_getRelationsParam($verbose = false) @@ -65,7 +65,7 @@ function PMA_getRelationsParam($verbose = false) /** * prints out diagnostic info for pma relation feature * - * @param array $cfgRelation + * @param array $cfgRelation */ function PMA_printRelationsParamDiagnostic($cfgRelation) { @@ -157,10 +157,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) /** * prints out one diagnostic message for a feature * - * @param string feature name in a message string - * @param string the $GLOBALS['cfgRelation'] parameter to check - * @param array utility messages - * @param boolean whether to skip a line after the message + * @param string feature name in a message string + * @param string the $GLOBALS['cfgRelation'] parameter to check + * @param array utility messages + * @param boolean whether to skip a line after the message */ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true) { @@ -175,10 +175,10 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes /** * prints out one diagnostic message for a configuration parameter * - * @param string config parameter name to display - * @param boolean whether this parameter is set - * @param array utility messages - * @param string anchor in Documentation.html + * @param string config parameter name to display + * @param boolean whether this parameter is set + * @param array utility messages + * @param string anchor in Documentation.html */ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor) { @@ -362,10 +362,10 @@ function PMA__getRelationsParam() * optionally a given column in a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $column the name of the column to check for - * @param string $source the source for foreign key information + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $column the name of the column to check for + * @param string $source the source for foreign key information * @return array db,table,column */ function PMA_getForeigners($db, $table, $column = '', $source = 'both') @@ -458,8 +458,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') * Gets the display field of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for * @return string field name */ function PMA_getDisplayField($db, $table) @@ -503,8 +503,8 @@ function PMA_getDisplayField($db, $table) * Gets the comments for all rows of a table or the db itself * * @access public - * @param string the name of the db to check for - * @param string the name of the table to check for + * @param string the name of the db to check for + * @param string the name of the table to check for * @return array [field_name] = comment */ function PMA_getComments($db, $table = '') @@ -532,7 +532,7 @@ function PMA_getComments($db, $table = '') * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComment($db) @@ -564,7 +564,7 @@ function PMA_getDbComment($db) * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComments() @@ -595,8 +595,8 @@ function PMA_getDbComments() * Set a database comment to a certain value. * * @access public - * @param string $db the name of the db - * @param string $comment the value of the column + * @param string $db the name of the db + * @param string $comment the value of the column * @return boolean true, if comment-query was made. */ function PMA_setDbComment($db, $comment = '') @@ -638,10 +638,10 @@ function PMA_setDbComment($db, $comment = '') /** * Set a SQL history entry * - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $username the username - * @param string $sqlquery the sql query + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $username the username + * @param string $sqlquery the sql query * @access public */ function PMA_setHistory($db, $table, $username, $sqlquery) @@ -696,7 +696,7 @@ function PMA_setHistory($db, $table, $username, $sqlquery) /** * Gets a SQL history entry * - * @param string $username the username + * @param string $username the username * @return array list of history items * @access public */ @@ -725,7 +725,7 @@ function PMA_getHistory($username) * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the * given user * - * @param string $username the username + * @param string $username the username * @access public */ function PMA_purgeHistory($username) @@ -758,9 +758,9 @@ function PMA_purgeHistory($username) /** * Prepares the dropdown for one mode * - * @param array $foreign the keys and values for foreigns - * @param string $data the current data of the dropdown - * @param string $mode the needed mode + * @param array $foreign the keys and values for foreigns + * @param string $data the current data of the dropdown + * @param string $mode the needed mode * * @return array the <option value=""><option>s * @@ -821,10 +821,10 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) /** * Outputs dropdown with values of foreign fields * - * @param array array of the displayed row - * @param string the foreign field - * @param string the foreign field to display - * @param string the current data of the dropdown (field in row) + * @param array array of the displayed row + * @param string the foreign field + * @param string the foreign field to display + * @param string the current data of the dropdown (field in row) * @return string the <option value=""><option>s * @access public */ @@ -893,11 +893,11 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector * - * @param array array of the foreign keys - * @param string the foreign field name - * @param bool whether to override the total - * @param string a possible filter - * @param string a possible LIMIT clause + * @param array array of the foreign keys + * @param string the foreign field name + * @param bool whether to override the total + * @param string a possible filter + * @param string a possible LIMIT clause * @return array data about the foreign keys * @access public */ @@ -976,7 +976,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte /** * Finds all related tables * - * @param string whether to go from master to foreign or vice versa + * @param string whether to go from master to foreign or vice versa * @return boolean always true * @global array $tab_left the list of tables that we still couldn't connect * @global array $tab_know the list of allready connected tables diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 95a6ec0..b308f1c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -18,8 +18,8 @@ * * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a> * - * @param string the message - * @param boolean whether to escape html in result + * @param string the message + * @param boolean whether to escape html in result * * @return string the sanitized message * diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 7d1de46..284fdbe 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -102,7 +102,7 @@ function PMA_langCheck() * checks given lang and sets it if valid * returns true on success, otherwise flase * - * @param string $lang language to set + * @param string $lang language to set * @return bool success */ function PMA_langSet(&$lang) @@ -121,8 +121,8 @@ function PMA_langSet(&$lang) * Analyzes some PHP environment variables to find the most probable language * that should be used * - * @param string string to analyze - * @param integer type of the PHP environment variable which value is $str + * @param string string to analyze + * @param integer type of the PHP environment variable which value is $str * * @return bool true on success, otherwise false * diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 68541d8..6d230ea 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -9,8 +9,8 @@ /** * display server selection in list or selectbox form, or option tags only * - * @param boolean $not_only_options whether to include form tags or not - * @param boolean $ommit_fieldset whether to ommit fieldset tag or not + * @param boolean $not_only_options whether to include form tags or not + * @param boolean $ommit_fieldset whether to ommit fieldset tag or not */ function PMA_select_server($not_only_options, $ommit_fieldset) { diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 2c7e69c..12cea2a 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -372,11 +372,11 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * - * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $index index of a table from $matching_table array - * @param $row_count number of rows + * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $index index of a table from $matching_table array + * @param $row_count number of rows * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) @@ -390,15 +390,15 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * * - * @param $table Array containing matching tables' names - * @param $update_array A three dimensional array containing field + * @param $table Array containing matching tables' names + * @param $update_array A three dimensional array containing field * value updates required for each matching table - * @param $src_db Name of source database - * @param $trg_db Name of target database - * @param $trg_link Connection established with target server - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_table_keys - * @param $display true/false value + * @param $src_db Name of source database + * @param $trg_db Name of target database + * @param $trg_link Connection established with target server + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_table_keys + * @param $display true/false value * @return nothing */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) @@ -447,30 +447,30 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * - * @param $matching_table array containing matching table names - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $table_fields array containing field names of a table - * @param $array_insert - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_tables_keys array containing field names that are keys in the matching table - * @param $source_columns array containing source column information - * @param $add_column_array array containing column names that are to be added in target table - * @param $criteria array containing criterias like type, null, collation, default etc - * @param $target_tables_keys array containing field names that are keys in the target table - * @param $uncommon_tables array containing table names that are present in source db but not in targt db - * @param $uncommon_tables_fields array containing field names of the uncommon tables - * @param $uncommon_cols column names that are present in target table and not in source table - * @param $alter_str_array array containing column names that are to be altered - * @param $source_indexes column names on which indexes are made in source table - * @param $target_indexes column names on which indexes are made in target table - * @param $add_indexes_array array containing column names on which index is to be added in target table - * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed - * @param $delete_array array containing rows that are to be deleted - * @param $update_array array containing rows that are to be updated in target - * @param $display true/false value + * @param $matching_table array containing matching table names + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $table_fields array containing field names of a table + * @param $array_insert + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_tables_keys array containing field names that are keys in the matching table + * @param $source_columns array containing source column information + * @param $add_column_array array containing column names that are to be added in target table + * @param $criteria array containing criterias like type, null, collation, default etc + * @param $target_tables_keys array containing field names that are keys in the target table + * @param $uncommon_tables array containing table names that are present in source db but not in targt db + * @param $uncommon_tables_fields array containing field names of the uncommon tables + * @param $uncommon_cols column names that are present in target table and not in source table + * @param $alter_str_array array containing column names that are to be altered + * @param $source_indexes column names on which indexes are made in source table + * @param $target_indexes column names on which indexes are made in target table + * @param $add_indexes_array array containing column names on which index is to be added in target table + * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed + * @param $delete_array array containing rows that are to be deleted + * @param $update_array array containing rows that are to be updated in target + * @param $display true/false value * @return nothing */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, @@ -587,14 +587,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables names of tables present in source but not in target - * @param $table_index index of table in $uncommon_tables array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables names of tables present in source but not in target + * @param $table_index index of table in $uncommon_tables array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) @@ -640,14 +640,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) - * @param $table_index index of table in matching_table_array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) + * @param $table_index index of table in matching_table_array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * * @return nothing * @@ -682,13 +682,13 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing matching table names - * @param $table_index index of table in matching_table_array - * @param $target_tables_keys primary key names of the target tables - * @param $delete_array array containing the key values of rows that are to be deleted - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing matching table names + * @param $table_index index of table in matching_table_array + * @param $target_tables_keys primary key names of the target tables + * @param $delete_array array containing the key values of rows that are to be deleted + * @param $display true/false value * @return nothing */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) @@ -739,21 +739,21 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. * Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $target_columns array containing columns information of the target tables - * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $target_columns array containing columns information of the target tables + * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target * column have some criteria different and third index containing the criteria which is different. - * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the + * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the * column name which is to be added in the target table - * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table - * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table + * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table + * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table * @return nothing */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, @@ -802,22 +802,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc /** * PMA_addColumnsInTargetTable() adds column that are present in source table but not in target table * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $add_column_array array containing the names of the column(field) that are to be added in the target - * @param $matching_tables_fields - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $uncommon_tables array containing the table names that are present in source db and not in target db - * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables - * @param $table_counter integer number of the matching table - * @param $uncommon_cols - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $add_column_array array containing the names of the column(field) that are to be added in the target + * @param $matching_tables_fields + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $uncommon_tables array containing the table names that are present in source db and not in target db + * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables + * @param $table_counter integer number of the matching table + * @param $uncommon_cols + * @param $display true/false value * @return nothing */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, @@ -901,14 +901,14 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * PMA_checkForeignKeys() checks if the referenced table have foreign keys. * uses PMA_createTargetTables() * - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $referenced_table table whose column is a foreign key in another table - * @param $uncommon_tables array containing names that are uncommon - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $referenced_table table whose column is a foreign key in another table + * @param $uncommon_tables array containing names that are uncommon + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) @@ -932,17 +932,17 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source table - * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table - * @param $matching_tables_fields array containing the name of the fields for the matching table - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source table + * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table + * @param $matching_tables_fields array containing the name of the fields for the matching table + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table + * @param $display true/false value * @return nothing */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, @@ -1067,12 +1067,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param $table_counter index of the matching table as in $matchiing_tables array - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param $table_counter index of the matching table as in $matchiing_tables array + * @param $display true/false value * @return nothing */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1123,17 +1123,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table - * @param $alter_indexes_array array containing the key name which needs to be altered - * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table - * @param $table_counter number of the matching table + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table + * @param $alter_indexes_array array containing the key name which needs to be altered + * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table + * @param $table_counter number of the matching table * @return nothing */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, @@ -1188,16 +1188,16 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the column names on which indexes are to be created in target table - * @param $alter_indexes_array array containing the column names for which indexes are to be altered - * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table - * @param $table_counter number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the column names on which indexes are to be created in target table + * @param $alter_indexes_array array containing the column names for which indexes are to be altered + * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table + * @param $table_counter number of the matching table + * @param $display true/false value * @return nothing */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, @@ -1276,7 +1276,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param $query the query to display + * @param $query the query to display * @return nothing */ function PMA_displayQuery($query) { @@ -1289,7 +1289,7 @@ function PMA_displayQuery($query) { /** * PMA_syncDisplayHeaderSource() shows the header for source database * - * @param string $src_db source db name + * @param string $src_db source db name * @return nothing */ function PMA_syncDisplayHeaderSource($src_db) { @@ -1311,8 +1311,8 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables * - * @param string $trg_db target db name - * @param array $matching_tables + * @param string $trg_db target db name + * @param array $matching_tables * @return boolean $odd_row current value of this toggle */ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { @@ -1338,7 +1338,7 @@ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) /** * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors * - * @param boolean $odd_row current status of the toggle + * @param boolean $odd_row current status of the toggle * @return boolean $odd_row final status of the toggle */ function PMA_syncDisplayBeginTableRow($odd_row) { @@ -1352,10 +1352,10 @@ function PMAw($odd_row) { the toggleing colorsg_db, $matching_tables) tablesxes_array, $alter_indexes_array,,elds,tass, $edit_str, $copy_str, $del_str, $js_conf) {��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��_syncDisplayBeginTableRow($odd_row) { /** * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource * @return array $field_values */ function PMA_get_column_values($database, $table, $column, $link = null) @@ -1381,9 +1381,9 @@ function PMA_get_column_values($database, $table, $column, $link = null) /** * array PMA_get_table_indexes($database, $table, $link = null) * - * @param string $database name of database - * @param string $table name of the table whose indexes are to be retreived - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of the table whose indexes are to be retreived + * @param mixed $link mysql link resource * @return array $indexes */ function PMA_get_table_indexes($database, $table, $link = null) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 06a2b51..e38cac2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -30,12 +30,12 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @usedby tbl_structure.php * @usedby tbl_tracking.php * @usedby querywindow.php - * @param boolean|string $query query to display in the textarea + * @param boolean|string $query query to display in the textarea * or true to display last executed - * @param boolean|string $display_tab sql|files|history|full|false + * @param boolean|string $display_tab sql|files|history|full|false * what part to display * false if not inside querywindow - * @param string $delimiter + * @param string $delimiter */ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') { @@ -157,9 +157,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') * prints querybox fieldset * * @usedby PMA_sqlQueryForm() - * @param string $query query to display in the textarea - * @param boolean $is_querywindow if inside querywindow or not - * @param string $delimiter default delimiter to use + * @param string $query query to display in the textarea + * @param boolean $is_querywindow if inside querywindow or not + * @param string $delimiter default delimiter to use */ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter = ';') { diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 10895f1..267d99b 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -120,8 +120,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Set an error message for the system * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access private * @scope SQL Parser internal @@ -141,8 +141,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Do display the bug report * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access public */ @@ -182,7 +182,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Parses the SQL queries * - * @param string The SQL query list + * @param string The SQL query list * * @return mixed Most of times, nothing... * @@ -795,8 +795,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Checks for token types being what we want... * - * @param string String of type that we have - * @param string String of type that we want + * @param string String of type that we have + * @param string String of type that we want * * @return boolean result of check * @@ -820,7 +820,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Analyzes SQL queries * - * @param array The SQL queries + * @param array The SQL queries * * @return array The analyzed SQL queries * @@ -2046,7 +2046,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @todo check why adding a "\n" after the </span> would cause extra blanks * to be displayed: SELECT p . person_name - * @param array The SQL queries html formatted + * @param array The SQL queries html formatted * * @return array The colorized SQL queries * @@ -2069,10 +2069,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Formats SQL queries to html * - * @param array The SQL queries - * @param string mode - * @param integer starting token - * @param integer number of tokens to format, -1 = all + * @param array The SQL queries + * @param string mode + * @param integer starting token + * @param integer number of tokens to format, -1 = all * * @return string The formatted SQL queries * @@ -2663,9 +2663,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Builds a CSS rule used for html formatted SQL queries * - * @param string The class name - * @param string The property name - * @param string The property value + * @param string The class name + * @param string The property name + * @param string The property value * * @return string The CSS rule * @@ -2716,7 +2716,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Gets SQL queries with no format * - * @param array The SQL queries list + * @param array The SQL queries list * * @return string The SQL queries with no format * diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index f7b836a..abbe6e9 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -73,7 +73,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service opening * - * @param string URL of Mimer SQL Validator WSDL file + * @param string URL of Mimer SQL Validator WSDL file * * @return object Object to use * @@ -93,16 +93,16 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service initializer to connect to server * - * @param object Service object - * @param string Username - * @param string Password - * @param string Name of calling program - * @param string Version of calling program - * @param string Target DBMS - * @param string Version of target DBMS - * @param string Connection Technology - * @param string version of Connection Technology - * @param integer boolean of 1/0 to specify if we are an interactive system + * @param object Service object + * @param string Username + * @param string Password + * @param string Name of calling program + * @param string Version of calling program + * @param string Target DBMS + * @param string Version of target DBMS + * @param string Connection Technology + * @param string version of Connection Technology + * @param integer boolean of 1/0 to specify if we are an interactive system * * @return object stdClass return object with data * @@ -139,10 +139,10 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param object Service object - * @param object Session object - * @param string SQL Query to validate - * @param string Data return type + * @param object Service object + * @param object Session object + * @param string SQL Query to validate + * @param string Data return type * * @return object stClass return with data * @@ -170,7 +170,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param string SQL Query to validate + * @param string SQL Query to validate * * @return object stdClass return with data * @@ -221,8 +221,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets credentials * - * @param string the username - * @param string the password + * @param string the username + * @param string the password * * @access public */ @@ -236,8 +236,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -251,8 +251,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -266,8 +266,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -281,8 +281,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -296,8 +296,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -311,8 +311,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -326,7 +326,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets whether interactive mode should be used or not * - * @param integer whether interactive mode should be used or not + * @param integer whether interactive mode should be used or not * * @access public */ @@ -339,7 +339,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the output type to use * - * @param string the output type to use + * @param string the output type to use * * @access public */ @@ -399,7 +399,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call to determine just if a query is valid or not. * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * @@ -415,7 +415,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call for complete validator response * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index a559ccf..dd3b8ad 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -49,7 +49,7 @@ if ($cfg['SQLValidator']['use'] == true) { * * <http://developer.mimer.com/validator/index.htm> * - * @param string SQL query to validate + * @param string SQL query to validate * * @return string Validator result string * diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 6e2d26d..0cfef41 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -57,9 +57,9 @@ if ($GLOBALS['PMA_allow_ctype']) { /** * Checks if a given character position in the string is escaped or not * - * @param string string to check for - * @param integer the character to check for - * @param integer starting position in the string + * @param string string to check for + * @param integer the character to check for + * @param integer starting position in the string * @return boolean whether the character is escaped or not */ function PMA_STR_charIsEscaped($string, $pos, $start = 0) @@ -88,9 +88,9 @@ function PMA_STR_charIsEscaped($string, $pos, $start = 0) /** * Checks if a number is in a range * - * @param integer number to check for - * @param integer lower bound - * @param integer upper bound + * @param integer number to check for + * @param integer lower bound + * @param integer upper bound * @return boolean whether the number is in the range or not */ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) @@ -101,8 +101,8 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) /** * Checks if a character is an SQL identifier * - * @param string character to check for - * @param boolean whether the dot character is valid or not + * @param string character to check for + * @param boolean whether the dot character is valid or not * @return boolean whether the character is an SQL identifier or not */ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index 7b8e14b..0feb876 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index b07c315..6fee5ca 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 590e59d..271b0f7 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -51,7 +51,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -63,7 +63,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -74,7 +74,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -85,7 +85,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 0bcb08f..46a6544 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -55,7 +55,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -70,7 +70,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -85,7 +85,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -104,7 +104,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 4a69e77..a5460ab 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -19,7 +19,7 @@ * // } * </code> * - * @param string $option_string comma separated options + * @param string $option_string comma separated options * @return array options */ function PMA_transformation_getOptions($option_string) @@ -118,9 +118,9 @@ function PMA_getAvailableMIMEtypes() * Gets the mimetypes for all columns of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $strict whether to include only results having a mimetype set + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $strict whether to include only results having a mimetype set * @return array [field_name][field_key] = field_value */ function PMA_getMIME($db, $table, $strict = false) @@ -149,13 +149,13 @@ function PMA_getMIME($db, $table, $strict = false) * Set a single mimetype to a certain value. * * @access public - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $key the name of the column - * @param string $mimetype the mimetype of the column - * @param string $transformation the transformation of the column - * @param string $transformation_options the transformation options of the column - * @param string $forcedelete force delete, will erase any existing comments for this column + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $key the name of the column + * @param string $mimetype the mimetype of the column + * @param string $transformation the transformation of the column + * @param string $transformation_options the transformation options of the column + * @param string $forcedelete force delete, will erase any existing comments for this column * @return boolean true, if comment-query was made. */ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index c8b343b..e3cc02a 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -10,11 +10,11 @@ * Generates text with hidden inputs. * * @see PMA_generate_common_url() - * @param string optional database name + * @param string optional database name * (can also be an array of parameters) - * @param string optional table name - * @param int indenting level - * @param string do not generate a hidden field for this parameter + * @param string optional table name + * @param int indenting level + * @param string do not generate a hidden field for this parameter * (can be an array of strings) * * @return string string with input fields @@ -160,16 +160,16 @@ function PMA_getHiddenFields($values, $pre = '') * // script.php?server=1&lang=en * </code> * - * @param mixed assoc. array with url params or optional string with database name + * @param mixed assoc. array with url params or optional string with database name * if first param is an array there is also an ? prefixed to the url * - * @param string - if first param is array: 'html' to use htmlspecialchars() + * @param string - if first param is array: 'html' to use htmlspecialchars() * on the resulting URL (for a normal URL displayed in HTML) * or something else to avoid using htmlspecialchars() (for * a URL sent via a header); if not set,'html' is assumed * - if first param is not array: optional table name * - * @param string - if first param is array: optional character to + * @param string - if first param is array: optional character to * use instead of '?' * - if first param is not array: optional character to use * instead of '&' for dividing URL parameters @@ -256,7 +256,7 @@ function PMA_generate_common_url() * extracted from arg_separator.input as set in php.ini * we do not use arg_separator.output to avoid problems with & and & * - * @param string whether to encode separator or not, currently 'none' or 'html' + * @param string whether to encode separator or not, currently 'none' or 'html' * @return string character used for separating url parts usally ; or & * @access public */ diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 23f28ce..9208e93 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -71,7 +71,7 @@ class zipfile * Converts an Unix timestamp to a four byte DOS date and time format (date * in high two bytes, time in low two bytes allowing magnitude comparison). * - * @param integer the current Unix timestamp + * @param integer the current Unix timestamp * * @return integer the current date in a four byte DOS format * @@ -97,9 +97,9 @@ class zipfile /** * Adds "file" to archive * - * @param string file contents - * @param string name of the file in the archive (may contains the path) - * @param integer the current timestamp + * @param string file contents + * @param string name of the file in the archive (may contains the path) + * @param integer the current timestamp * * @access public */ diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 0527911..b665b74 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -9,7 +9,7 @@ /** * Gets zip file contents * - * @param string $file + * @param string $file * @return array ($error_message, $file_data); $error_message * is empty if no error */ @@ -71,7 +71,7 @@ function PMA_getZipContents($file) /** * Gets zip error message * - * @param integer error code + * @param integer error code * @return string error message */ function PMA_getZipError($code) diff --git a/main.php b/main.php index e1eec63..fd4d448 100644 --- a/main.php +++ b/main.php @@ -368,14 +368,14 @@ if (file_exists('./libraries/language_stats.inc.php')) { /** * prints list item for main page * - * @param string $name displayed text - * @param string $id id, used for css styles - * @param string $url make item as link with $url as target - * @param string $mysql_help_page display a link to MySQL's manual - * @param string $target special target for $url - * @param string $a_id id for the anchor, used for jQuery to hook in functions - * @param string $class class for the li element - * @param string $a_class class for the anchor element + * @param string $name displayed text + * @param string $id id, used for css styles + * @param string $url make item as link with $url as target + * @param string $mysql_help_page display a link to MySQL's manual + * @param string $target special target for $url + * @param string $a_id id for the anchor, used for jQuery to hook in functions + * @param string $class class for the li element + * @param string $a_class class for the anchor element */ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null) { diff --git a/navigation.php b/navigation.php index e473dd8..966f5f2 100644 --- a/navigation.php +++ b/navigation.php @@ -327,9 +327,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * @global string $href_left * @global string $db_start * @global string $common_url_query - * @param array $ext_dblist extended db list - * @param integer $offset - * @param integer $count + * @param array $ext_dblist extended db list + * @param integer $offset + * @param integer $count */ function PMA_displayDbList($ext_dblist, $offset, $count) { global $element_counter, $img_minus, $img_plus, $href_left, @@ -494,10 +494,10 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { * @global string html code for '-' image * @global string html code for '+' image * @global string html code for self link - * @param array $tables array of tables/tablegroups - * @param boolean $visible whether the list is visible or not - * @param string $tab_group_full full tab group name - * @param string $table_db db of this table + * @param array $tables array of tables/tablegroups + * @param boolean $visible whether the list is visible or not + * @param string $tab_group_full full tab group name + * @param string $table_db db of this table */ function PMA_displayTableList($tables, $visible = false, $tab_group_full = '', $table_db = '') diff --git a/pmd_common.php b/pmd_common.php index cbe37ed..7ca134b 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -167,7 +167,7 @@ function get_pk_or_unique_keys() /** * returns all indizes * - * @param boolean whether to include ony unique ones + * @param boolean whether to include ony unique ones * @return array indizes */ function get_all_keys($unique_only = false) diff --git a/server_privileges.php b/server_privileges.php index 8dad17d..ba114fb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -157,7 +157,7 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename) { /** * Generates a condition on the user name * - * @param string the user's initial + * @param string the user's initial * @return string the generated condition */ function PMA_rangeOfUsers($initial = '') @@ -176,8 +176,8 @@ function PMA_rangeOfUsers($initial = '') /** * Extracts the privilege information of a priv table row * - * @param array $row the row - * @param boolean $enableHTML add <dfn> tag with tooltips + * @param array $row the row + * @param boolean $enableHTML add <dfn> tag with tooltips * * @global resource $user_link the database connection * @@ -404,9 +404,9 @@ function PMA_display_column_privs($columns, $row, $name_for_select, /** * Displays the privileges form table * - * @param string $db the database - * @param string $table the table - * @param boolean $submit wheather to display the submit button or not + * @param string $db the database + * @param string $table the table + * @param boolean $submit wheather to display the submit button or not * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection * @@ -739,7 +739,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) * Displays the fields used by the "new user" form as well as the * "change login information / copy user" form. * - * @param string $mode are we creating a new user or are we just + * @param string $mode are we creating a new user or are we just * changing one? (allowed values: 'new', 'change') * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection diff --git a/tbl_relation.php b/tbl_relation.php index e3f4338..e204c80 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -48,9 +48,9 @@ $options_array = array( /** * Generate dropdown choices * - * @param string Message to display - * @param string Name of the <select> field - * @param array Choices for dropdown + * @param string Message to display + * @param string Name of the <select> field + * @param array Choices for dropdown * @return string The existing value (for selected) * * @access public @@ -74,7 +74,7 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele /** * Split a string on backquote pairs * - * @param string original string + * @param string original string * @return array containing the elements (and their surrounding backquotes) * * @access public diff --git a/tbl_tracking.php b/tbl_tracking.php index 0003055..e308066 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -52,10 +52,10 @@ if (isset($_REQUEST['report_export'])) { /** * Filters tracking entries * - * @param array the entries to filter - * @param string "from" date - * @param string "to" date - * @param string users + * @param array the entries to filter + * @param string "from" date + * @param string "to" date + * @param string users * * @return array filtered entries * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11677-g25bda8e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) from 219ec73d69a0bee94ac3bf98757db25360862b39 (commit) - Log ----------------------------------------------------------------- commit 25bda8e991f2820971c343315cd3ab3d974b2684 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:18:02 2011 +0200 Fix spacing on opening code block ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- db_structure.php | 2 +- libraries/common.lib.php | 6 +++--- libraries/export/pdf.php | 10 +++++----- libraries/footer.inc.php | 2 +- libraries/import/ldi.php | 2 +- libraries/ip_allow_deny.lib.php | 2 +- libraries/logging.lib.php | 2 +- libraries/mult_submits.inc.php | 4 ++-- libraries/relation.lib.php | 2 +- libraries/sql_query_form.lib.php | 2 +- libraries/sqlparser.lib.php | 6 +++--- libraries/transformations.lib.php | 2 +- pmd_general.php | 6 +++--- schema_edit.php | 4 ++-- server_privileges.php | 2 +- server_synchronize.php | 2 +- tbl_indexes.php | 2 +- tbl_tracking.php | 10 +++++----- themes.php | 2 +- transformation_wrapper.php | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index acd96dc..531fbe0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -91,7 +91,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $pk_array[$row['Column_name']] = 1; } // Retains keys informations - if ($row['Key_name'] != $lastIndex){ + if ($row['Key_name'] != $lastIndex) { $indexes[] = $row['Key_name']; $lastIndex = $row['Key_name']; } diff --git a/db_structure.php b/db_structure.php index 6dc82bf..2bae5a7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -367,7 +367,7 @@ foreach ($tables as $keyname => $each_table) { // that needs to be repaired if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { if ($table_is_view) { - if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']){ + if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']) { $row_count_pre = '~'; $sum_row_count_pre = '~'; $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index fd0701b..34d20d9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) @@ -2692,7 +2692,7 @@ function PMA_replace_binary_contents($content) { function PMA_duplicateFirstNewline($string) { $first_occurence = strpos($string, "\r\n"); - if ($first_occurence === 0){ + if ($first_occurence === 0) { $string = "\n".$string; } return $string; @@ -3065,7 +3065,7 @@ function PMA_getFunctionsForField($field, $insert_mode) // Create the output $retval = ' <option></option>' . "\n"; // loop on the dropdown array and print all available options for that field. - foreach ($dropdown as $each_dropdown){ + foreach ($dropdown as $each_dropdown) { $retval .= ' '; $retval .= '<option'; if ($default_function === $each_dropdown) { diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index bb89fda..e135bc8 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -213,7 +213,7 @@ class PMA_PDF extends TCPDF function setAttributes($attr = array()) { - foreach ($attr as $key => $val){ + foreach ($attr as $key => $val) { $this->$key = $val ; } } @@ -246,20 +246,20 @@ class PMA_PDF extends TCPDF // loop through results header and set initial col widths/ titles/ alignment // if a col title is less than the starting col width, reduce that column size - for ($i = 0; $i < $this->numFields; $i++){ + for ($i = 0; $i < $this->numFields; $i++) { $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; // save the real title's width $titleWidth[$i] = $stringWidth; $totalTitleWidth += $stringWidth; // set any column titles less than the start width to the column title width - if ($stringWidth < $this->sColWidth){ + if ($stringWidth < $this->sColWidth) { $colFits[$i] = $stringWidth ; } $this->colTitles[$i] = $this->fields[$i]->name; $this->display_column[$i] = true; - switch ($this->fields[$i]->type){ + switch ($this->fields[$i]->type) { case 'int': $this->colAlign[$i] = 'R'; break; @@ -317,7 +317,7 @@ class PMA_PDF extends TCPDF } $totAlreadyFitted = 0; - foreach ($colFits as $key => $val){ + foreach ($colFits as $key => $val) { // set fitted columns to smallest size $this->tablewidths[$key] = $val; // to work out how much (if any) space has been freed up diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index bbeb04b..aa1af7a 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -70,7 +70,7 @@ if (!$GLOBALS['is_ajax_request']) { <?php if (empty($GLOBALS['error_message'])) { ?> -$(document).ready(function(){ +$(document).ready(function() { // updates current settings if (window.parent.setAll) { window.parent.setAll('<?php diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index fe5264c..b3b711e 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -80,7 +80,7 @@ if (strlen($ldi_enclosed) > 0) { if (strlen($ldi_escaped) > 0) { $sql .= ' ESCAPED BY \'' . PMA_sqlAddSlashes($ldi_escaped) . '\''; } -if (strlen($ldi_new_line) > 0){ +if (strlen($ldi_new_line) > 0) { if ($ldi_new_line == 'auto') { $ldi_new_line = PMA_whichCrlf() == "\n" ? '\n' : '\r\n'; } diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 30bce24..1537b43 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index 8764247..1dabc9a 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -11,7 +11,7 @@ /** * Logs user information to webserver logs. */ -function PMA_log_user($user, $status = 'ok'){ +function PMA_log_user($user, $status = 'ok') { if (function_exists('apache_note')) { apache_note('userID', $user); apache_note('userStatus', $status); diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0f7e218..1d3cbd5 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -246,7 +246,7 @@ if (!empty($submit_mult) && !empty($what)) { <?php echo PMA_generate_common_hidden_inputs($_url_params); ?> -<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix'){ ?> +<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') { ?> <fieldset class = "input"> <legend><?php echo ($what == 'replace_prefix_tbl' ? __('Replace table prefix') : __('Copy table with prefix')) ?>:</legend> <table> @@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - elseif ($what == 'add_prefix_tbl'){ ?> + elseif ($what == 'add_prefix_tbl') { ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index c2acd8e..0b74c70 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -628,7 +628,7 @@ function PMA_setDbComment($db, $comment = '') AND `column_name` = \'(db_comment)\''; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 5a0f364..06a2b51 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -420,7 +420,7 @@ function PMA_sqlQueryFormBookmark() * * @usedby PMA_sqlQueryForm() */ -function PMA_sqlQueryFormUpload(){ +function PMA_sqlQueryFormUpload() { $errors = array (); $matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 8469344..10895f1 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1523,7 +1523,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $subresult['queryflags']['need_confirm'] = 1; } - if ($first_reserved_word=='SELECT'){ + if ($first_reserved_word=='SELECT') { $position_of_first_select = $i; } @@ -2550,7 +2550,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: - if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))) { $after .= '</a>'; $close_docu_link = false; } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index e58ecf8..4a69e77 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -208,7 +208,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, . '\'' . PMA_sqlAddSlashes($transformation_options) . '\')'; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } else { return false; diff --git a/pmd_general.php b/pmd_general.php index 10a862c..74ff124 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -44,8 +44,8 @@ echo ' echo "\n"; if ($_REQUEST['query']) { echo ' - $(document).ready(function(){ - $(".trigger").click(function(){ + $(document).ready(function() { + $(".trigger").click(function() { $(".panel").toggle("fast"); $(this).toggleClass("active"); return false; @@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > - <?php if ($_REQUEST['query']){ + <?php if ($_REQUEST['query']) { echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; diff --git a/schema_edit.php b/schema_edit.php index 1545d8f..4ab41d4 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -53,7 +53,7 @@ if (! $cfgRelation['displaywork']) { require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['table_coords'])){ +if (! isset($cfgRelation['table_coords'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_coords') . "\n"; require_once './libraries/footer.inc.php'; @@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) { * @param string $do It tells what the Schema is supposed to do * create and select a page, generate schema etc */ - if (isset($_REQUEST['do'])){ + if (isset($_REQUEST['do'])) { $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); } diff --git a/server_privileges.php b/server_privileges.php index ecd1fa6..8dad17d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - if ($GLOBALS['is_ajax_request'] == true){ + if ($GLOBALS['is_ajax_request'] == true) { $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/server_synchronize.php b/server_synchronize.php index 3412336..431ae6b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -91,7 +91,7 @@ if ((isset($_REQUEST['submit_connect']))) { if (! $src_connection && $src_type != 'cur') { echo __('Could not connect to the source') . '<br />'; } - if (! $trg_connection && $trg_type != 'cur'){ + if (! $trg_connection && $trg_type != 'cur') { echo __('Could not connect to the target'); } echo '</div>'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 84555d8..1daca81 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -87,7 +87,7 @@ if (isset($_REQUEST['do_save_data'])) { } } // end while - if (empty($index_fields)){ + if (empty($index_fields)) { $error = PMA_Message::error(__('No index parts defined!')); } else { $sql_query .= ' (' . implode(', ', $index_fields) . ')'; diff --git a/tbl_tracking.php b/tbl_tracking.php index b249f4c..0003055 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) { */ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { - if (isset($_REQUEST['delete_ddlog'])){ + if (isset($_REQUEST['delete_ddlog'])) { // Delete ddlog row data $delete_id = $_REQUEST['delete_ddlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['ddlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) @@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R } } - if (isset($_REQUEST['delete_dmlog'])){ + if (isset($_REQUEST['delete_dmlog'])) { // Delete dmlog row data $delete_id = $_REQUEST['delete_dmlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['dmlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) @@ -658,7 +658,7 @@ if ($last_version > 0) { } else { $version_status = __('not active'); } - if ($version['version'] == $last_version){ + if ($version['version'] == $last_version) { if ($version['tracking_active'] == 1) { $tracking_active = true; } else { diff --git a/themes.php b/themes.php index 624c668..0e37ee4 100644 --- a/themes.php +++ b/themes.php @@ -22,7 +22,7 @@ require './libraries/header_meta_style.inc.php'; ?> <script type="text/javascript" language="javascript"> // <![CDATA[ -function takeThis(what){ +function takeThis(what) { if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { window.opener.document.forms['setTheme'].elements['set_theme'].value = what; window.opener.document.forms['setTheme'].submit(); diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 50d7ceb..f229bd3 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -88,7 +88,7 @@ if (! isset($resize)) { $ratioWidth = $srcWidth/$newWidth; $ratioHeight = $srcHeight/$newHeight; - if ($ratioWidth < $ratioHeight){ + if ($ratioWidth < $ratioHeight) { $destWidth = $srcWidth/$ratioHeight; $destHeight = $newHeight; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11676-g219ec73
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 219ec73d69a0bee94ac3bf98757db25360862b39 (commit) from 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit) - Log ----------------------------------------------------------------- commit 219ec73d69a0bee94ac3bf98757db25360862b39 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:10:37 2011 +0200 Spacing around if ----------------------------------------------------------------------- Summary of changes: chart_export.php | 8 +++--- db_create.php | 4 +- db_export.php | 6 ++-- db_operations.php | 2 +- db_search.php | 4 +- db_structure.php | 2 +- db_tracking.php | 4 +- enum_editor.php | 4 +- libraries/common.inc.php | 2 +- libraries/common.lib.php | 30 ++++++++++++++-------------- libraries/db_common.inc.php | 2 +- libraries/db_info.inc.php | 2 +- libraries/db_links.inc.php | 2 +- libraries/db_structure.lib.php | 8 +++--- libraries/display_export.lib.php | 36 +++++++++++++++++----------------- libraries/display_import.lib.php | 6 ++-- libraries/display_tbl.lib.php | 22 ++++++++++---------- libraries/header.inc.php | 2 +- libraries/mult_submits.inc.php | 2 +- libraries/plugin_interface.lib.php | 12 +++++----- libraries/server_links.inc.php | 2 +- libraries/server_synchronize.lib.php | 20 +++++++++--------- libraries/sql_query_form.lib.php | 2 +- libraries/sysinfo.lib.php | 2 +- libraries/tbl_links.inc.php | 4 +- main.php | 2 +- navigation.php | 2 +- pmd_general.php | 14 ++++++------ pmd_save_pos.php | 2 +- schema_edit.php | 2 +- server_databases.php | 2 +- server_export.php | 6 ++-- server_privileges.php | 18 ++++++++-------- server_status.php | 20 +++++++++--------- server_synchronize.php | 4 +- server_variables.php | 8 +++--- tbl_alter.php | 2 +- tbl_chart.php | 4 +- tbl_create.php | 8 +++--- tbl_indexes.php | 4 +- tbl_operations.php | 4 +- tbl_replace.php | 4 +- tbl_structure.php | 26 ++++++++++++------------ tbl_tracking.php | 10 ++++---- user_password.php | 4 +- 45 files changed, 168 insertions(+), 168 deletions(-) diff --git a/chart_export.php b/chart_export.php index e3a02f0..c05332a 100644 --- a/chart_export.php +++ b/chart_export.php @@ -11,12 +11,12 @@ define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; -if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { +if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $allowed = Array( 'image/png'=>'png', 'image/svg+xml'=>'svg'); - if(! isset($allowed[$_REQUEST['type']])) exit('Invalid export type'); + if (! isset($allowed[$_REQUEST['type']])) exit('Invalid export type'); - if(! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) + if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) $_REQUEST['filename'] .= '.' . $allowed[$_REQUEST['type']]; header("Cache-Control: public"); @@ -25,7 +25,7 @@ if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { header("Content-Type: ".$_REQUEST['type']); header("Content-Transfer-Encoding: binary"); - if($allowed[$_REQUEST['type']] != 'svg') + if ($allowed[$_REQUEST['type']] != 'svg') echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1)); else echo $_REQUEST['image']; diff --git a/db_create.php b/db_create.php index 502ac7f..2d7877a 100644 --- a/db_create.php +++ b/db_create.php @@ -48,7 +48,7 @@ if (! $result) { /** * If in an Ajax request, just display the message with {@link PMA_ajaxResponse} */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } @@ -62,7 +62,7 @@ if (! $result) { /** * If in an Ajax request, build the output and send it */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * String containing the SQL Query formatted in pretty HTML diff --git a/db_export.php b/db_export.php index aab4c51..f8a4762 100644 --- a/db_export.php +++ b/db_export.php @@ -49,14 +49,14 @@ if (!empty($selected_tbl) && empty($table_select)) { } // Check if the selected tables are defined in $_GET (from clicking Back button on export.php) -if(isset($_GET['table_select'])) { +if (isset($_GET['table_select'])) { $_GET['table_select'] = urldecode($_GET['table_select']); $_GET['table_select'] = explode(",", $_GET['table_select']); } foreach ($tables as $each_table) { - if(isset($_GET['table_select'])) { - if(in_array($each_table['Name'], $_GET['table_select'])) { + if (isset($_GET['table_select'])) { + if (in_array($each_table['Name'], $_GET['table_select'])) { $is_selected = ' selected="selected"'; } else { $is_selected = ''; diff --git a/db_operations.php b/db_operations.php index e2d1e2b..2382389 100644 --- a/db_operations.php +++ b/db_operations.php @@ -300,7 +300,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { * Database has been successfully renamed/moved. If in an Ajax request, * generate the output with {@link PMA_ajaxResponse} and exit */ - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['newname'] = $newname; $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/db_search.php b/db_search.php index 69350cd..6191b14 100644 --- a/db_search.php +++ b/db_search.php @@ -92,7 +92,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) { */ $sub_part = ''; -if( $GLOBALS['is_ajax_request'] != true) { +if ( $GLOBALS['is_ajax_request'] != true) { require './libraries/db_info.inc.php'; echo '<div id="searchresults">'; } @@ -254,7 +254,7 @@ if (isset($_REQUEST['submit_search'])) { /** * If we are in an Ajax request, we need to exit after displaying all the HTML */ -if($GLOBALS['is_ajax_request'] == true) { +if ($GLOBALS['is_ajax_request'] == true) { exit; } else { diff --git a/db_structure.php b/db_structure.php index d1ffdc3..6dc82bf 100644 --- a/db_structure.php +++ b/db_structure.php @@ -372,7 +372,7 @@ foreach ($tables as $keyname => $each_table) { $sum_row_count_pre = '~'; $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); } - } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { + } elseif ($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { // InnoDB table: we did not get an accurate row count $row_count_pre = '~'; $sum_row_count_pre = '~'; diff --git a/db_tracking.php b/db_tracking.php index 38a231d..df1106e 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -16,7 +16,7 @@ $GLOBALS['js_include'][] = 'db_structure.js'; /** * If we are not in an Ajax request, then do the common work and show the links etc. */ -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { require './libraries/db_common.inc.php'; } $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php'; @@ -34,7 +34,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) { * If in an Ajax request, generate the success message and use * {@link PMA_ajaxResponse()} to send the output */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { $message = PMA_Message::success(); PMA_ajaxResponse($message, true); } diff --git a/enum_editor.php b/enum_editor.php index 5fe962f..9287bb3 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -33,7 +33,7 @@ require_once './libraries/header_meta_style.inc.php'; // Display the values in text fields, excluding empty strings $field_counter = 0; foreach ($values as $value) { - if(trim($value) != "") { + if (trim($value) != "") { $field_counter++; echo sprintf('<input type="text" size="30" value="%s" name="field' . $field_counter . '" />', htmlspecialchars(str_replace(array("''", '\\\\', "\\'"), array("'", '\\', "'"), substr($value, 1, -1)))); } @@ -41,7 +41,7 @@ require_once './libraries/header_meta_style.inc.php'; $total_fields = $field_counter; // If extra empty fields are added, display them - if(isset($_GET['extra_fields'])) { + if (isset($_GET['extra_fields'])) { $total_fields += $_GET['extra_fields']; for($i = $field_counter+1; $i <= $total_fields; $i++) { echo '<input type="text" size="30" name="field' . $i . '"/>'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ed32fab..daf1173 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1008,7 +1008,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Set to true if this is a request made during an inline edit process. This * request is made to retrieve the non-truncated/transformed values. */ -if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) { +if (isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) { $GLOBALS['inline_edit'] = true; } else { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f710b80..fd0701b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -600,7 +600,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * - avoid displaying a Back link * - use PMA_ajaxResponse() to transmit the message and exit */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($error_msg_output, false); } if (! empty($back_url)) { @@ -779,7 +779,7 @@ function PMA_backquote($a_name, $do_it = true) if (! $do_it) { global $PMA_SQPdata_forbidden_word; - if(! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) { + if (! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) { return $a_name; } } @@ -869,7 +869,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * in a string. In some special cases on sql.php, buffering has to be disabled * and hence we check with $GLOBALS['buffer_message'] */ - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { ob_start(); } global $cfg; @@ -1202,7 +1202,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it // to PMA_ajaxResponse(), which will encode it for JSON. - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { $buffer_contents = ob_get_contents(); ob_end_clean(); return $buffer_contents; @@ -1341,13 +1341,13 @@ function PMA_localizeNumber($value) */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { - if($value==0) return '0'; + if ($value==0) return '0'; $originalValue = $value; //number_format is not multibyte safe, str_replace is safe if ($digits_left === 0) { $value = number_format($value, $digits_right); - if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); + if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); return PMA_localizeNumber($value); } @@ -1388,22 +1388,22 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow // Lowering the SI prefix by 1 gives us an additional 3 zeros // So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix $cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1); - if($digits_left > $cur_digits) { + if ($digits_left > $cur_digits) { $d-= floor(($digits_left - $cur_digits)/3); } - if($d<0 && $only_down) $d=0; + if ($d<0 && $only_down) $d=0; $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; // If we dont want any zeros after the comma just add the thousand seperator - if($noTrailingZero) + if ($noTrailingZero) $value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value)); else $value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe - if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; + if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; return $sign . $value . ' ' . $unit; } // end of the 'PMA_formatNumber' function @@ -1541,7 +1541,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') } // If there are any tab specific URL parameters, merge those with the general URL parameters - if(! empty($tab['url_params']) && is_array($tab['url_params'])) { + if (! empty($tab['url_params']) && is_array($tab['url_params'])) { $url_params = array_merge($url_params, $tab['url_params']); } @@ -2806,7 +2806,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { $response = array(); - if( $success == true ) { + if ( $success == true ) { $response['success'] = true; if ($message instanceof PMA_Message) { $response['message'] = $message->getDisplay(); @@ -2817,7 +2817,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } else { $response['success'] = false; - if($message instanceof PMA_Message) { + if ($message instanceof PMA_Message) { $response['error'] = $message->getDisplay(); } else { @@ -2826,7 +2826,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } // If extra_data has been provided, append it to the response array - if( ! empty($extra_data) && count($extra_data) > 0 ) { + if ( ! empty($extra_data) && count($extra_data) > 0 ) { $response = array_merge($response, $extra_data); } @@ -2841,7 +2841,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) echo json_encode($response); - if(!defined('TESTSUITE')) + if (!defined('TESTSUITE')) exit; } diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 4682122..290bcd1 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -69,7 +69,7 @@ if (isset($submitcollation) && !empty($db_collation)) { * db charset change action on db_operations.php. If this causes a bug on * other pages, we might have to move this to a different location. */ - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, $message->isSuccess()); }; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index eebad23..de56e83 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -247,7 +247,7 @@ unset($each_table, $tbl_group_sql, $db_info_result); * Displays top menu links * If in an Ajax request, we do not need to show this */ -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { require './libraries/db_links.inc.php'; } ?> diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 5a95622..2210899 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -61,7 +61,7 @@ $tab_search['text'] = __('Search'); $tab_search['icon'] = 'ic_b_search'; $tab_search['link'] = 'db_search.php'; -if(PMA_Tracker::isActive()) +if (PMA_Tracker::isActive()) { $tab_tracking['text'] = __('Tracking'); $tab_tracking['icon'] = 'ic_eye'; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 68e4b9d..82a3f58 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') // current sort order is ASC $order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />'; // but on mouse over, show the reverse order (DESC) - $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; // on mouse out, show current sort order (ASC) - $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; } else { $future_sort_order = 'ASC'; // current sort order is DESC $order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />'; // but on mouse over, show the reverse order (ASC) - $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; // on mouse out, show current sort order (DESC) - $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; } } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 28e0bf2..75ec919 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -56,16 +56,16 @@ if (isset($single_table)) { echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n"; // If the export method was not set, the default is quick -if(isset($_GET['export_method'])) { +if (isset($_GET['export_method'])) { $cfg['Export']['method'] = $_GET['export_method']; -} elseif(! isset($cfg['Export']['method'])) { +} elseif (! isset($cfg['Export']['method'])) { $cfg['Export']['method'] = 'quick'; } // The export method (quick, custom or custom-no-form) echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg['Export']['method']) . '" />'; -if(isset($_GET['sql_query'])) { +if (isset($_GET['sql_query'])) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n"; } elseif (! empty($sql_query)) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; @@ -76,9 +76,9 @@ if(isset($_GET['sql_query'])) { <h2> <img class="icon ic_b_export" src="themes/dot.gif" alt="export" /> <?php - if($export_type == 'server') { + if ($export_type == 'server') { echo __('Exporting databases from the current server'); - } elseif($export_type == 'database') { + } elseif ($export_type == 'database') { printf(__('Exporting tables from "%s" database'), htmlspecialchars($db)); } else { printf(__('Exporting rows from "%s" table'), htmlspecialchars($table)); @@ -91,14 +91,14 @@ if(isset($_GET['sql_query'])) { <ul> <li> <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"'; - if(isset($_GET['quick_or_custom'])) { + if (isset($_GET['quick_or_custom'])) { $export_method = $_GET['quick_or_custom']; - if($export_method == 'custom' || $export_method == 'custom_no_form') { + if ($export_method == 'custom' || $export_method == 'custom_no_form') { echo ' />'; } else { echo ' checked="checked" />'; } - } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { + } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { echo ' />'; } else { echo ' checked="checked" />'; @@ -107,14 +107,14 @@ if(isset($_GET['sql_query'])) { </li> <li> <?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"'; - if(isset($_GET['quick_or_custom'])) { + if (isset($_GET['quick_or_custom'])) { $export_method = $_GET['quick_or_custom']; - if($export_method == 'custom' || $export_method == 'custom_no_form') { + if ($export_method == 'custom' || $export_method == 'custom_no_form') { echo ' checked="checked" />'; } else { echo ' />'; } - } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { + } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { echo ' checked="checked" />'; } else { echo ' />'; @@ -126,9 +126,9 @@ if(isset($_GET['sql_query'])) { <div class="exportoptions" id="databases_and_tables"> <?php - if($export_type == 'server') { + if ($export_type == 'server') { echo '<h3>' . __('Database(s):') . '</h3>'; - } else if($export_type == 'database') { + } else if ($export_type == 'database') { echo '<h3>' . __('Table(s):') . '</h3>'; } if (! empty($multi_values)) { @@ -142,7 +142,7 @@ if(isset($_GET['sql_query'])) { <h3><?php echo __('Rows:'); ?></h3> <ul> <li> - <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 1) { + <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 1) { echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" />'; } else { echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; @@ -158,7 +158,7 @@ if(isset($_GET['sql_query'])) { </ul> </li> <li> - <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 0) { + <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 0) { echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />'; } else { echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" checked="checked" />'; @@ -241,7 +241,7 @@ if(isset($_GET['sql_query'])) { <input type="text" name="filename_template" id="filename_template" <?php echo ' value="'; - if(isset($_GET['filename_template'])) { + if (isset($_GET['filename_template'])) { echo $_GET['filename_template']; } else { if ($export_type == 'database') { @@ -276,7 +276,7 @@ if(isset($_GET['sql_query'])) { echo '<select id="select_charset_of_file" name="charset_of_file" size="1">'; foreach ($cfg['AvailableCharsets'] as $temp_charset) { echo '<option value="' . $temp_charset . '"'; - if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { + if (isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { echo ''; } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Export']['charset']) { @@ -288,7 +288,7 @@ if(isset($_GET['sql_query'])) { } // end if ?> <?php - if(isset($_GET['compression'])) { + if (isset($_GET['compression'])) { $selected_compression = $_GET['compression']; } elseif (isset($cfg['Export']['compression'])) { $selected_compression = $cfg['Export']['compression']; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 119ccd1..052a023 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -125,9 +125,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <h2> <img class="icon ic_b_import" src="themes/dot.gif" alt="import" /> <?php - if($import_type == 'server') { + if ($import_type == 'server') { echo __('Importing into the current server'); - } elseif($import_type == 'database') { + } elseif ($import_type == 'database') { printf(__('Importing into the database "%s"'), htmlspecialchars($db)); } else { printf(__('Importing into the table "%s"'), htmlspecialchars($table)); @@ -160,7 +160,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { }?> <div class="formelementrow" id="upload_form"> - <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?> + <?php if ($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?> <ul> <li> <input type="radio" name="file_location" id="radio_import_file" /> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 8bf4f3c..adaa407 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -913,11 +913,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_link_params = array(); if (isset($order_img) && $order_img!='') { if (strstr($order_img, 'asc')) { - $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; - $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; } elseif (strstr($order_img, 'desc')) { - $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; - $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; } } if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') { @@ -1113,22 +1113,22 @@ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') { function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated = false, $transform_function = '', $default_function = '') { // Define classes to be added to this data field based on the type of data $enum_class = ''; - if(strpos($meta->flags, 'enum') !== false) { + if (strpos($meta->flags, 'enum') !== false) { $enum_class = ' enum'; } $set_class = ''; - if(strpos($meta->flags, 'set') !== false) { + if (strpos($meta->flags, 'set') !== false) { $set_class = ' set'; } $bit_class = ''; - if(strpos($meta->type, 'bit') !== false) { + if (strpos($meta->type, 'bit') !== false) { $bit_class = ' bit'; } $mime_type_class = ''; - if(isset($meta->mimetype)) { + if (isset($meta->mimetype)) { $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); } @@ -1301,7 +1301,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // Class definitions required for inline editing jQuery scripts $edit_anchor_class = "edit_row_anchor"; - if( $clause_is_unique == 0) { + if ( $clause_is_unique == 0) { $edit_anchor_class .= ' nonunique'; } } // end if (1.2.1) @@ -2726,7 +2726,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing */ - if(! empty($where_clause)) { + if (! empty($where_clause)) { $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } $ret .= '</span></td>'; @@ -2756,7 +2756,7 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing */ - if(! empty($where_clause)) { + if (! empty($where_clause)) { $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } $ret .= '</span></td>'; diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 5700047..a6ed8ed 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -198,7 +198,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { * Sets a variable to remember headers have been sent */ $GLOBALS['is_header_sent'] = true; -} //end if(!$GLOBALS['is_ajax_request']) +} //end if (!$GLOBALS['is_ajax_request']) else { if (empty($GLOBALS['is_header_sent'])) { require_once './libraries/header_http.inc.php'; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 46a89fc..0f7e218 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - elseif($what == 'add_prefix_tbl'){ ?> + elseif ($what == 'add_prefix_tbl'){ ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index ed2f4f9..703215f 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -80,7 +80,7 @@ function PMA_pluginCheckboxCheck($section, $opt) */ function PMA_pluginGetDefault($section, $opt) { - if(isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority + if (isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority return htmlspecialchars($_GET[$opt]); } elseif (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) { return htmlspecialchars($_REQUEST[$opt]); @@ -148,7 +148,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) foreach ($list as $plugin_name => $val) { $ret .= '<option'; // If the form is being repopulated using $_GET data, that is priority - if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { + if (isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { $ret .= ' selected="selected"'; } $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n"; @@ -158,7 +158,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) // Whether each plugin has to be saved as a file foreach ($list as $plugin_name => $val) { $ret .= '<input type="hidden" id="force_file_' . $plugin_name . '" value="'; - if(isset($val['force_file'])) { + if (isset($val['force_file'])) { $ret .= 'true'; } else { $ret .= 'false'; @@ -230,7 +230,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) foreach ($opt['values'] as $key => $val) { $ret .= '<li><input type="radio" name="' . $plugin_name . '_' . $opt['name'] . '" value="' . $key . '" id="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '"'; - if($key == $default) { + if ($key == $default) { $ret .= 'checked="checked"'; } $ret .= ' />' . '<label for="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '">' @@ -250,7 +250,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) } elseif ($opt['type'] == 'begin_subgroup') { /* each subgroup can have a header, which may also be a form element */ $ret .= PMA_pluginGetOneOption($section, $plugin_name, $id, $opt['subgroup_header']) . '<li class="subgroup"><ul'; - if(isset($opt['subgroup_header']['name'])) { + if (isset($opt['subgroup_header']['name'])) { $ret .= ' id="ul_' . $opt['subgroup_header']['name'] . '">'; } else { $ret .= '>'; @@ -273,7 +273,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) } // Close the list element after $opt['doc'] link is displayed - if($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') { + if ($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') { $ret .= '</li>'; } $ret .= "\n"; diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 4b7198e..19ee5d7 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -114,5 +114,5 @@ if (!$GLOBALS['is_ajax_request']) { PMA_showMessage($message); unset($message); } -}// end if($GLOBALS['is_ajax_request'] == true) +}// end if ($GLOBALS['is_ajax_request'] == true) ?> diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c32ac4d..2c7e69c 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -477,7 +477,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) { - if(isset($array_insert[$matching_table_index])) { + if (isset($array_insert[$matching_table_index])) { if (sizeof($array_insert[$matching_table_index])) { for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) { if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) { @@ -828,7 +828,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; - if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { + if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { $query .= ' Not Null '; } elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') { $query .= ' Null '; @@ -1004,23 +1004,23 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s $sql_query .= " Null " ; } if ($criteria[$i] == 'Collation') { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } $sql_query .= " COLLATE " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] ; } if (($criteria[$i] == 'Default') && ($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] == 'None')) { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } - } elseif($criteria[$i] == 'Default') { - if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + } elseif ($criteria[$i] == 'Default') { + if (! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') { $sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'"; - } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { + } elseif ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; } } elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { @@ -1028,7 +1028,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } if ($criteria[$i] == 'Comment') { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } $sql_query .= " COMMENT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'" ; @@ -1162,7 +1162,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi $z++; } if ($found === false) { - if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { + if (! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; } } @@ -1364,7 +1364,7 @@ function PMA_get_column_values($database, $table, $column, $link = null) for ($i=0; $i< sizeof($column); $i++) { $query.= PMA_backquote($column[$i]); - if($i < (sizeof($column)-1)) + if ($i < (sizeof($column)-1)) { $query.= ', '; } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 1a3fd92..5a0f364 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -252,7 +252,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .' dir="' . $GLOBALS['text_dir'] . '"' .$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n"; // Add buttons to generate query easily for select all,single select,insert,update and delete - if(count($fields_list)) { + if (count($fields_list)) { echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />'; echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />'; echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />'; diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index e996db6..9bcc2dd 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -14,7 +14,7 @@ function getSysInfo() { $sysinfo = array(); - if(in_array(PHP_OS, $supported)) { + if (in_array(PHP_OS, $supported)) { return eval("return new ".PHP_OS."();"); } diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index ac5bfb3..3de9ed2 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -92,7 +92,7 @@ if (! $tbl_is_view && !$db_is_information_schema) { $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = __('Operations'); } -if(PMA_Tracker::isActive()) { +if (PMA_Tracker::isActive()) { $tabs['tracking']['icon'] = 'ic_eye'; $tabs['tracking']['text'] = __('Tracking'); $tabs['tracking']['link'] = 'tbl_tracking.php'; @@ -122,7 +122,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) { echo PMA_generate_html_tabs($tabs, $url_params); unset($tabs); -if(PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) +if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) { $msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s.%s is activated.'), htmlspecialchars($GLOBALS["db"]), htmlspecialchars($GLOBALS["table"])).'</a>'); $msg->display(); diff --git a/main.php b/main.php index f340e80..e1eec63 100644 --- a/main.php +++ b/main.php @@ -295,7 +295,7 @@ if (file_exists('./config')) { */ if ($server > 0) { $cfgRelation = PMA_getRelationsParam(); - if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false); $message->addParam('</a>', false); diff --git a/navigation.php b/navigation.php index 27859fe..e473dd8 100644 --- a/navigation.php +++ b/navigation.php @@ -576,7 +576,7 @@ function PMA_displayTableList($tables, $visible = false, while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { - if(is_array($value)) { + if (is_array($value)) { $table = $value; } } diff --git a/pmd_general.php b/pmd_general.php index 1307571..10a862c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -42,7 +42,7 @@ echo ' var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; echo "\n"; - if($_REQUEST['query']) { + if ($_REQUEST['query']) { echo ' $(document).ready(function(){ $(".trigger").click(function(){ @@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > - <?php if($_REQUEST['query']){ + <?php if ($_REQUEST['query']){ echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; @@ -205,7 +205,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <thead> <tr> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="select_all">'; echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" '; @@ -238,7 +238,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"'; echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">'; @@ -274,7 +274,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?>)"> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="select_all">'; echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; @@ -315,7 +315,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </div> </td> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; echo 'onmouseout="this.className=\'small_tab_pref\';"'; @@ -801,7 +801,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </table> <?php -if($_REQUEST['query']) { +if ($_REQUEST['query']) { echo '<div class="panel">'; echo '<div style="clear:both;"></div>'; echo '<div id="ab"></div>'; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 6fefe63..b95b20f 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -45,7 +45,7 @@ function PMD_err_sav() { } } -if(! empty($die_save_pos)) { +if (! empty($die_save_pos)) { header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); ?> diff --git a/schema_edit.php b/schema_edit.php index 9b71500..1545d8f 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) { * @param string $do It tells what the Schema is supposed to do * create and select a page, generate schema etc */ - if(isset($_REQUEST['do'])){ + if (isset($_REQUEST['do'])){ $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); } diff --git a/server_databases.php b/server_databases.php index fb9d1d6..544db90 100644 --- a/server_databases.php +++ b/server_databases.php @@ -180,7 +180,7 @@ if ($databases_count > 0) { { if ($type=="master") $name = __('Master replication'); - elseif($type == "slave") + elseif ($type == "slave") $name = __('Slave replication'); if (${"server_{$type}_status"}) echo ' <th>'. $name .'</th>' . "\n"; diff --git a/server_export.php b/server_export.php index b5a4ca6..d6dd2cf 100644 --- a/server_export.php +++ b/server_export.php @@ -31,14 +31,14 @@ $multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple=" $multi_values .= "\n"; // Check if the selected databases are defined in $_GET (from clicking Back button on export.php) -if(isset($_GET['db_select'])) { +if (isset($_GET['db_select'])) { $_GET['db_select'] = urldecode($_GET['db_select']); $_GET['db_select'] = explode(",", $_GET['db_select']); } foreach ($GLOBALS['pma']->databases as $current_db) { - if(isset($_GET['db_select'])) { - if(in_array($current_db, $_GET['db_select'])) { + if (isset($_GET['db_select'])) { + if (in_array($current_db, $_GET['db_select'])) { $is_selected = ' selected="selected"'; } else { $is_selected = ''; diff --git a/server_privileges.php b/server_privileges.php index e2f19a9..ecd1fa6 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1046,7 +1046,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { /** * If we are not in an Ajax request, we can't reload navigation now */ - if($GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { // this is needed in case tracking is on: $GLOBALS['db'] = $username; $GLOBALS['reload'] = true; @@ -1346,7 +1346,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; $GLOBALS['reload'] = true; - if($GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { PMA_reloadNavigation(); } } @@ -1446,11 +1446,11 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s */ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { - if(isset($sql_query)) { + if (isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); } - if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { + if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { /** * generate html on the fly for the new user that was just created. */ @@ -1460,7 +1460,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE .'<td>' . htmlspecialchars($hostname) . '</td>' . "\n"; $new_user_string .= '<td>'; - if(!empty($password) || isset($pma_pw)) { + if (!empty($password) || isset($pma_pw)) { $new_user_string .= __('Yes'); } else { @@ -1471,7 +1471,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here $new_user_string .= '<td>'; - if((isset($Grant_priv) && $Grant_priv == 'Y')) { + if ((isset($Grant_priv) && $Grant_priv == 'Y')) { $new_user_string .= __('Yes'); } else { @@ -1498,7 +1498,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE $extra_data['new_user_initial_string'] = $new_user_initial_string; } - if(isset($update_privs)) { + if (isset($update_privs)) { $extra_data['db_specific_privs'] = false; if (isset($dbname_is_wildcard)) { $extra_data['db_specific_privs'] = !$dbname_is_wildcard; @@ -1806,7 +1806,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // A user was selected -> display the user's properties // In an Ajax request, prevent cached values from showing - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { header('Cache-Control: no-cache'); } @@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - if($GLOBALS['is_ajax_request'] == true){ + if ($GLOBALS['is_ajax_request'] == true){ $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/server_status.php b/server_status.php index cf02da7..c88ccdd 100644 --- a/server_status.php +++ b/server_status.php @@ -222,15 +222,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // Ignore undefined index warning, just increase counter by one @$return['sum'][$type] += $row['#']; - if($type=='insert' || $type=='update') { + if ($type=='insert' || $type=='update') { // Group inserts if selected - if($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { + if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; // Group this value, thus do not add to the result list @@ -557,7 +557,7 @@ require './libraries/server_common.inc.php'; require './libraries/server_links.inc.php'; $server = 1; -if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); +if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); $server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' || $cfg['Servers'][$server]['host'] == '127.0.0.1' @@ -722,7 +722,7 @@ function printQueryStatistics() { echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); echo '<br>'; - if($total_queries / $server_status['Uptime'] >= 1) { + if ($total_queries / $server_status['Uptime'] >= 1) { echo 'ø '.__('per second').': '; echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); } @@ -768,7 +768,7 @@ function printQueryStatistics() { $name = str_replace(array('Com_', '_'), array('', ' '), $name); // Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already - if($value < $query_sum * 0.02 && count($chart_json)>6) + if ($value < $query_sum * 0.02 && count($chart_json)>6) $other_sum += $value; else $chart_json[$name] = $value; ?> @@ -1364,7 +1364,7 @@ function printMonitor() { <div id="addChartDialog" title="Add chart" style="display:none;"> <div id="tabGridVariables"> <p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p> - <?php if($server_db_isLocal) { ?> + <?php if ($server_db_isLocal) { ?> <input type="radio" name="chartType" value="cpu" id="chartCPU"> <label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/> @@ -1444,8 +1444,8 @@ function printMonitor() { variableNames = [ <?php $i=0; foreach ($server_status as $name=>$value) { - if(is_numeric($value)) { - if($i++ > 0) echo ", "; + if (is_numeric($value)) { + if ($i++ > 0) echo ", "; echo "'".$name."'"; } } @@ -1462,7 +1462,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - if($rate<60) + if ($rate<60) echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>'; else echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60).'</option>'; diff --git a/server_synchronize.php b/server_synchronize.php index 2cb6898..3412336 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -88,10 +88,10 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '<div class="error">'; - if(! $src_connection && $src_type != 'cur') { + if (! $src_connection && $src_type != 'cur') { echo __('Could not connect to the source') . '<br />'; } - if(! $trg_connection && $trg_type != 'cur'){ + if (! $trg_connection && $trg_type != 'cur'){ echo __('Could not connect to the target'); } echo '</div>'; diff --git a/server_variables.php b/server_variables.php index fbe7094..dcbe192 100644 --- a/server_variables.php +++ b/server_variables.php @@ -34,7 +34,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // Send with correct charset header('Content-Type: text/html; charset=UTF-8'); - if(isset($_REQUEST['type'])) { + if (isset($_REQUEST['type'])) { switch($_REQUEST['type']) { case 'getval': $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM'); @@ -42,9 +42,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'setval': $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'".$value."'"; + if (!is_numeric($value)) $value="'".$value."'"; - if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value)) + if (! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value)) // Some values are rounded down etc. $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM'); @@ -153,7 +153,7 @@ function formatVariable($name,$value) { global $VARIABLE_DOC_LINKS; if (is_numeric($value)) { - if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') + if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>'; else return PMA_formatNumber($value, 0); } diff --git a/tbl_alter.php b/tbl_alter.php index 316c48e..807a39e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -130,7 +130,7 @@ if (isset($_REQUEST['do_save_data'])) { } } - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); } diff --git a/tbl_chart.php b/tbl_chart.php index 96befa7..b3589e3 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -94,13 +94,13 @@ url_query = '<?php echo $url_query;?>'; <input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>"> <?php $keys = array_keys($data[0]); $yaxis=-1; - if(count($keys)>1) { + if (count($keys)>1) { echo '<br>'; echo __('X-Axis:'); ?> <select name="chartXAxis"> <?php foreach ($keys as $idx=>$key) { - if($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) { + if ($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) { echo '<option value="'.$idx.'" selected>'.$key.'</option>'; $yaxis=$idx; } else { diff --git a/tbl_create.php b/tbl_create.php index 5259374..fb9c72f 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -216,7 +216,7 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been created.')); $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table)); - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * construct the html for the newly created table's row to be appended @@ -296,7 +296,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n"; - if($is_show_stats) { + if ($is_show_stats) { $new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#showusage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ; $new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ; } @@ -342,7 +342,7 @@ if (isset($_REQUEST['do_save_data'])) { */ // This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently. -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { echo('<div id="create_table_div">'); } @@ -350,7 +350,7 @@ require './libraries/tbl_properties.inc.php'; // Displays the footer require './libraries/footer.inc.php'; -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { echo('</div>'); } ?> diff --git a/tbl_indexes.php b/tbl_indexes.php index 39205f2..84555d8 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -98,7 +98,7 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been altered successfully')); $message->addParam($table); - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['index_table'] = PMA_Index::getView($table, $db); $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); @@ -108,7 +108,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; exit; } else { - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['error'] = $error; PMA_ajaxResponse($error,false); } diff --git a/tbl_operations.php b/tbl_operations.php index 6cc913d..11021ba 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -70,14 +70,14 @@ $table_alters = array(); /** * If the table has to be moved to some other database */ -if(isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) { +if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) { $_message = ''; require_once './tbl_move_copy.php'; } /** * If the table has to be maintained */ -if(isset($_REQUEST['table_maintenance'])) { +if (isset($_REQUEST['table_maintenance'])) { require_once './sql.php'; unset($result); } diff --git a/tbl_replace.php b/tbl_replace.php index ab20d29..48d01fc 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -312,7 +312,7 @@ if ($is_insert && count($value_sets) > 0) { // Note: logic passes here for inline edit $message = PMA_Message::success(__('No change')); $active_page = $goto_include; - if(! $GLOBALS['is_ajax_request'] == true) { + if (! $GLOBALS['is_ajax_request'] == true) { require_once './libraries/header.inc.php'; } require './' . PMA_securePath($goto_include); @@ -404,7 +404,7 @@ if (! empty($error_messages)) { } unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message); -if($GLOBALS['is_ajax_request'] == true) { +if ($GLOBALS['is_ajax_request'] == true) { /**Get the total row count of the table*/ $extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'],$_REQUEST['table']); $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); diff --git a/tbl_structure.php b/tbl_structure.php index 3cad9d8..afac23f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -188,7 +188,7 @@ $i = 0; <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); echo '<input type="hidden" name="table_type" value='; - if($db_is_information_schema) { + if ($db_is_information_schema) { echo '"information_schema" />'; } else if ($tbl_is_view) { echo '"view" />'; @@ -257,7 +257,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); - if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { + if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } @@ -504,8 +504,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="action_primary"' : ''); ?>> <?php - if(isset($primary_enabled)) { - if($primary_enabled) { ?> + if (isset($primary_enabled)) { + if ($primary_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Primary']; ?> </a> @@ -517,8 +517,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_unique"> <?php - if(isset($unique_enabled)) { - if($unique_enabled) { ?> + if (isset($unique_enabled)) { + if ($unique_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Unique']; ?> </a> @@ -530,8 +530,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_index"> <?php - if(isset($index_enabled)) { - if($index_enabled) { ?> + if (isset($index_enabled)) { + if ($index_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Index']; ?> </a> @@ -543,8 +543,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_spatial"> <?php - if(isset($spatial_enabled)) { - if($spatial_enabled) { ?> + if (isset($spatial_enabled)) { + if ($spatial_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD SPATIAL(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Spatial']; ?> </a> @@ -556,8 +556,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_fulltext"> <?php - if(isset($fulltext_enabled)) { - if($fulltext_enabled) { ?> + if (isset($fulltext_enabled)) { + if ($fulltext_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['IdxFulltext']; ?> </a> @@ -655,7 +655,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; - if(PMA_Tracker::isActive()) + if (PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; diff --git a/tbl_tracking.php b/tbl_tracking.php index edfc237..b249f4c 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -27,7 +27,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } if ($_REQUEST['logtype'] == 'schema') { $selection_schema = true; - } elseif($_REQUEST['logtype'] == 'data') { + } elseif ($_REQUEST['logtype'] == 'data') { $selection_data = true; } else { $selection_both = true; @@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) { */ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { - if(isset($_REQUEST['delete_ddlog'])){ + if (isset($_REQUEST['delete_ddlog'])){ // Delete ddlog row data $delete_id = $_REQUEST['delete_ddlog']; // Only in case of valable id - if($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id){ unset($data['ddlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) @@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R } } - if(isset($_REQUEST['delete_dmlog'])){ + if (isset($_REQUEST['delete_dmlog'])){ // Delete dmlog row data $delete_id = $_REQUEST['delete_dmlog']; // Only in case of valable id - if($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id){ unset($data['dmlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) diff --git a/user_password.php b/user_password.php index a4eeffe..3ca3442 100644 --- a/user_password.php +++ b/user_password.php @@ -56,7 +56,7 @@ if (isset($_REQUEST['nopass'])) { $password = $_REQUEST['pma_pw']; } - if($GLOBALS['is_ajax_request'] == true && $_error == true) { + if ($GLOBALS['is_ajax_request'] == true && $_error == true) { /** * If in an Ajax request, we don't need to show the rest of the page */ @@ -95,7 +95,7 @@ if (isset($_REQUEST['nopass'])) { $message = PMA_Message::success(__('The profile has been updated.')); - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success'); PMA_ajaxResponse($message, true, $extra_data); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11675-g3629893
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit) from 84c6bd7284968789548b6ac53441774307ab13eb (commit) - Log ----------------------------------------------------------------- commit 36298932e2a80bbd207b3b86475033f8b728a0b4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:07:57 2011 +0200 Spacing around if ----------------------------------------------------------------------- Summary of changes: sql.php | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sql.php b/sql.php index a954286..657311c 100644 --- a/sql.php +++ b/sql.php @@ -17,7 +17,7 @@ require_once './libraries/bookmark.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; -if(isset($_SESSION['profiling'])) { +if (isset($_SESSION['profiling'])) { $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; /* Files required for chart exporting */ $GLOBALS['js_include'][] = 'highcharts/exporting.js'; @@ -108,7 +108,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value * * Logic taken from libraries/display_tbl_lib.php */ -if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) { +if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) { $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;'; $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE); @@ -120,7 +120,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) $dropdown = '<option value=""> </option>'; foreach ($values as $value) { $dropdown .= '<option value="' . htmlspecialchars($value) . '"'; - if($value == $_REQUEST['curr_value']) { + if ($value == $_REQUEST['curr_value']) { $dropdown .= ' selected="selected"'; } $dropdown .= '>' . $value . '</option>'; @@ -135,7 +135,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) /** * Find possible values for set fields during inline edit. */ -if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { +if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;'; $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE); @@ -148,7 +148,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { $select = ''; foreach ($values as $value) { $select .= '<option value="' . htmlspecialchars($value) . '"'; - if(in_array($value, $selected_values, true)) { + if (in_array($value, $selected_values, true)) { $select .= ' selected="selected"'; } $select .= '>' . $value . '</option>'; @@ -164,7 +164,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { /** * Check ajax request to set the column order */ -if(isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { +if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { $pmatable = new PMA_Table($table, $db); // set column order @@ -459,7 +459,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // If a stored procedure was called, there may be more results that are // queued up and waiting to be flushed from the buffer. So let's do that. while (true) { - if(! PMA_DBI_more_results()) { + if (! PMA_DBI_more_results()) { break; } PMA_DBI_next_result(); @@ -478,7 +478,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $active_page = $goto; $message = PMA_Message::rawError($error); - if( $GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } @@ -693,7 +693,7 @@ if (0 == $num_rows || $is_affected) { $message->addMessage(')'); } - if( $GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * If we are in inline editing, we need to process the relational and @@ -703,7 +703,7 @@ if (0 == $num_rows || $is_affected) { * Logic taken from libraries/display_tbl.lib.php */ - if(isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') { + if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') { //handle relations work here for updated row. require_once './libraries/relation.lib.php'; @@ -767,7 +767,7 @@ if (0 == $num_rows || $is_affected) { } } - if(isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) { + if (isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) { require_once './libraries/transformations.lib.php'; //if some posted fields need to be transformed, generate them here. $mime_map = PMA_getMIME($db, $table); @@ -859,7 +859,7 @@ if (0 == $num_rows || $is_affected) { else { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit - if( $GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { + if ($GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { $row = PMA_DBI_fetch_row($result); $extra_data = array(); $extra_data['value'] = $row[0]; @@ -880,7 +880,7 @@ else { unset($message); - if( ! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { + if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { if (strlen($table)) { require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; @@ -912,7 +912,7 @@ else { $fields_cnt = count($fields_meta); } - if( ! $GLOBALS['is_ajax_request']) { + if (! $GLOBALS['is_ajax_request']) { //begin the sqlqueryresults div here. container div echo '<div id="sqlqueryresults"'; if ($GLOBALS['cfg']['AjaxEnable']) { @@ -1054,7 +1054,7 @@ window.onload = function() <?php } // end print case - if( $GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { echo '</div>'; // end sqlqueryresults div } } // end rows returned @@ -1062,7 +1062,7 @@ window.onload = function() /** * Displays the footer */ -if(! isset($_REQUEST['table_maintenance'])) { +if (! isset($_REQUEST['table_maintenance'])) { require './libraries/footer.inc.php'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11674-g84c6bd7
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 84c6bd7284968789548b6ac53441774307ab13eb (commit) via 12a31298bde7487b6306c87a737f32d8f715f4d2 (commit) via 297bd675cc24299a0ea782829a54f3bdde60b92b (commit) via 7b17fca511b15e59cc6bce44c349909a358b813c (commit) via ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80 (commit) from e501b557de386e6bc1e789126285452a1725bf20 (commit) - Log ----------------------------------------------------------------- commit 84c6bd7284968789548b6ac53441774307ab13eb Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:06:37 2011 +0200 Fix indentation commit 12a31298bde7487b6306c87a737f32d8f715f4d2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:05:25 2011 +0200 Spacing around if commit 297bd675cc24299a0ea782829a54f3bdde60b92b Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:02:04 2011 +0200 Wrap long line commit 7b17fca511b15e59cc6bce44c349909a358b813c Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:01:40 2011 +0200 Add die() calls are on places which should not happen commit ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 08:59:07 2011 +0200 Add file comment ----------------------------------------------------------------------- Summary of changes: export.php | 332 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 168 insertions(+), 164 deletions(-) diff --git a/export.php b/export.php index f5a985a..36c1d58 100644 --- a/export.php +++ b/export.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @todo too much die here, or? + * Main export hanling code * @package phpMyAdmin */ @@ -15,7 +15,11 @@ require_once './libraries/plugin_interface.lib.php'; PMA_checkParameters(array('what', 'export_type')); // Scan plugins -$export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $export_type, 'single_table' => isset($single_table))); +$export_list = PMA_getPlugins( + './libraries/export/', + array( + 'export_type' => $export_type, + 'single_table' => isset($single_table))); // Backward compatbility $type = $what; @@ -43,7 +47,7 @@ $save_on_server = false; $buffer_needed = false; // Is it a quick or custom export? -if($_REQUEST['quick_or_custom'] == 'quick') { +if ($_REQUEST['quick_or_custom'] == 'quick') { $quick_export = true; } else { $quick_export = false; @@ -58,7 +62,7 @@ if ($_REQUEST['output_format'] == 'astext') { $buffer_needed = true; } if (($quick_export && !empty($_REQUEST['quick_export_onserver'])) || (!$quick_export && !empty($_REQUEST['onserver']))) { - if($quick_export) { + if ($quick_export) { $onserver = $_REQUEST['quick_export_onserver']; } else { $onserver = $_REQUEST['onserver']; @@ -279,7 +283,7 @@ if ($asfile) { $extension_start_pos = strlen($filename) - strlen($export_list[$type]['extension']) - 1; $user_extension = substr($filename, $extension_start_pos, strlen($filename)); $required_extension = "." . $export_list[$type]['extension']; - if(strtolower($user_extension) != $required_extension) { + if (strtolower($user_extension) != $required_extension) { $filename .= $required_extension; } $mime_type = $export_list[$type]['mime_type']; @@ -394,9 +398,9 @@ if (!$save_on_server) { } // Convert the multiple select elements from an array to a string - if($export_type == 'server' && isset($_REQUEST['db_select'])) { + if ($export_type == 'server' && isset($_REQUEST['db_select'])) { $_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']); - } elseif($export_type == 'database' && isset($_REQUEST['table_select'])) { + } elseif ($export_type == 'database' && isset($_REQUEST['table_select'])) { $_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']); } @@ -419,123 +423,182 @@ if (!$save_on_server) { // need exceptions here :-) do { -// Add possibly some comments to export -if (!PMA_exportHeader()) { - break; -} - -// Will we need relation & co. setup? -$do_relation = isset($GLOBALS[$what . '_relation']); -$do_comments = isset($GLOBALS[$what . '_include_comments']); -$do_mime = isset($GLOBALS[$what . '_mime']); -if ($do_relation || $do_comments || $do_mime) { - $cfgRelation = PMA_getRelationsParam(); -} -if ($do_mime) { - require_once './libraries/transformations.lib.php'; -} - -// Include dates in export? -$do_dates = isset($GLOBALS[$what . '_dates']); + // Add possibly some comments to export + if (!PMA_exportHeader()) { + break; + } -/** - * Builds the dump - */ -// Gets the number of tables if a dump of a database has been required -if ($export_type == 'server') { - if (isset($db_select)) { - $tmp_select = implode($db_select, '|'); - $tmp_select = '|' . $tmp_select . '|'; + // Will we need relation & co. setup? + $do_relation = isset($GLOBALS[$what . '_relation']); + $do_comments = isset($GLOBALS[$what . '_include_comments']); + $do_mime = isset($GLOBALS[$what . '_mime']); + if ($do_relation || $do_comments || $do_mime) { + $cfgRelation = PMA_getRelationsParam(); } - // Walk over databases - foreach ($GLOBALS['pma']->databases as $current_db) { - if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) - || ! isset($tmp_select)) { - if (!PMA_exportDBHeader($current_db)) { - break 2; - } - if (!PMA_exportDBCreate($current_db)) { - break 2; - } - if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { - PMA_exportRoutines($current_db); - } + if ($do_mime) { + require_once './libraries/transformations.lib.php'; + } + + // Include dates in export? + $do_dates = isset($GLOBALS[$what . '_dates']); - $tables = PMA_DBI_get_tables($current_db); - $views = array(); - foreach ($tables as $table) { - // if this is a view, collect it for later; views must be exported - // after the tables - $is_view = PMA_Table::isView($current_db, $table); - if ($is_view) { - $views[] = $table; + /** + * Builds the dump + */ + // Gets the number of tables if a dump of a database has been required + if ($export_type == 'server') { + if (isset($db_select)) { + $tmp_select = implode($db_select, '|'); + $tmp_select = '|' . $tmp_select . '|'; + } + // Walk over databases + foreach ($GLOBALS['pma']->databases as $current_db) { + if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) + || ! isset($tmp_select)) { + if (!PMA_exportDBHeader($current_db)) { + break 2; } - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - // for a view, export a stand-in definition of the table - // to resolve view dependencies - if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { - break 3; - } + if (!PMA_exportDBCreate($current_db)) { + break 2; } - // if this is a view or a merge table, don't export data - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) { - $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); - if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { - break 3; + if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { + PMA_exportRoutines($current_db); + } + + $tables = PMA_DBI_get_tables($current_db); + $views = array(); + foreach ($tables as $table) { + // if this is a view, collect it for later; views must be exported + // after the tables + $is_view = PMA_Table::isView($current_db, $table); + if ($is_view) { + $views[] = $table; + } + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + // for a view, export a stand-in definition of the table + // to resolve view dependencies + if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { + break 3; + } + } + // if this is a view or a merge table, don't export data + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) { + $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); + if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { + break 3; + } + } + // now export the triggers (needs to be done after the data because + // triggers can modify already imported tables) + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { + break 2; + } } } - // now export the triggers (needs to be done after the data because - // triggers can modify already imported tables) - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { - break 2; + foreach ($views as $view) { + // no data export for a view + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { + break 3; + } } } + if (!PMA_exportDBFooter($current_db)) { + break 2; + } } - foreach ($views as $view) { - // no data export for a view - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { - break 3; - } + } + } elseif ($export_type == 'database') { + if (!PMA_exportDBHeader($db)) { + break; + } + + if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { + PMA_exportRoutines($db); + } + + $i = 0; + $views = array(); + // $tables contains the choices from the user (via $table_select) + foreach ($tables as $table) { + // if this is a view, collect it for later; views must be exported after + // the tables + $is_view = PMA_Table::isView($db, $table); + if ($is_view) { + $views[] = $table; + } + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + // for a view, export a stand-in definition of the table + // to resolve view dependencies + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { + break 2; } } - if (!PMA_exportDBFooter($current_db)) { - break 2; + // if this is a view or a merge table, don't export data + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) { + $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); + if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { + break 2; + } + } + // now export the triggers (needs to be done after the data because + // triggers can modify already imported tables) + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { + break 2; + } + } + } + foreach ($views as $view) { + // no data export for a view + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { + break 2; + } } } - } -} elseif ($export_type == 'database') { - if (!PMA_exportDBHeader($db)) { - break; - } - if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { - PMA_exportRoutines($db); - } + if (!PMA_exportDBFooter($db)) { + break; + } + } else { + if (!PMA_exportDBHeader($db)) { + break; + } + // We export just one table + // $allrows comes from the form when "Dump all rows" has been selected + if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) { + $add_query = ' LIMIT ' + . (($limit_from > 0) ? $limit_from . ', ' : '') + . $limit_to; + } else { + $add_query = ''; + } - $i = 0; - $views = array(); - // $tables contains the choices from the user (via $table_select) - foreach ($tables as $table) { - // if this is a view, collect it for later; views must be exported after - // the tables $is_view = PMA_Table::isView($db, $table); - if ($is_view) { - $views[] = $table; - } if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - // for a view, export a stand-in definition of the table - // to resolve view dependencies - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { - break 2; + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) { + break; } } - // if this is a view or a merge table, don't export data - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) { - $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); + // If this is an export of a single view, we have to export data; + // for example, a PDF report + // if it is a merge table, no data is exported + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) { + if (!empty($sql_query)) { + // only preg_replace if needed + if (!empty($add_query)) { + // remove trailing semicolon before adding a LIMIT + $sql_query = preg_replace('%;\s*$%', '', $sql_query); + } + $local_query = $sql_query . $add_query; + PMA_DBI_select_db($db); + } else { + $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query; + } if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { - break 2; + break; } } // now export the triggers (needs to be done after the data because @@ -545,72 +608,13 @@ if ($export_type == 'server') { break 2; } } - } - foreach ($views as $view) { - // no data export for a view - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { - break 2; - } - } - } - - if (!PMA_exportDBFooter($db)) { - break; - } -} else { - if (!PMA_exportDBHeader($db)) { - break; - } - // We export just one table - // $allrows comes from the form when "Dump all rows" has been selected - if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) { - $add_query = ' LIMIT ' - . (($limit_from > 0) ? $limit_from . ', ' : '') - . $limit_to; - } else { - $add_query = ''; - } - - $is_view = PMA_Table::isView($db, $table); - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) { + if (!PMA_exportDBFooter($db)) { break; } } - // If this is an export of a single view, we have to export data; - // for example, a PDF report - // if it is a merge table, no data is exported - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) { - if (!empty($sql_query)) { - // only preg_replace if needed - if (!empty($add_query)) { - // remove trailing semicolon before adding a LIMIT - $sql_query = preg_replace('%;\s*$%', '', $sql_query); - } - $local_query = $sql_query . $add_query; - PMA_DBI_select_db($db); - } else { - $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query; - } - if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { - break; - } - } - // now export the triggers (needs to be done after the data because - // triggers can modify already imported tables) - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { - break 2; - } - } - if (!PMA_exportDBFooter($db)) { + if (!PMA_exportFooter()) { break; } -} -if (!PMA_exportFooter()) { - break; -} } while (false); // End of fake loop hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11669-ge501b55
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via e501b557de386e6bc1e789126285452a1725bf20 (commit) from 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit) - Log ----------------------------------------------------------------- commit e501b557de386e6bc1e789126285452a1725bf20 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 08:56:51 2011 +0200 Wrap long lines ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 145 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 116 insertions(+), 29 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a184682..e2f19a9 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -186,37 +186,124 @@ function PMA_rangeOfUsers($initial = '') function PMA_extractPrivInfo($row = '', $enableHTML = false) { $grants = array( - array('Select_priv', 'SELECT', __('Allows reading data.')), - array('Insert_priv', 'INSERT', __('Allows inserting and replacing data.')), - array('Update_priv', 'UPDATE', __('Allows changing data.')), - array('Delete_priv', 'DELETE', __('Allows deleting data.')), - array('Create_priv', 'CREATE', __('Allows creating new databases and tables.')), - array('Drop_priv', 'DROP', __('Allows dropping databases and tables.')), - array('Reload_priv', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.')), - array('Shutdown_priv', 'SHUTDOWN', __('Allows shutting down the server.')), - array('Process_priv', 'PROCESS', __('Allows viewing processes of all users')), - array('File_priv', 'FILE', __('Allows importing data from and exporting data into files.')), - array('References_priv', 'REFERENCES', __('Has no effect in this MySQL version.')), - array('Index_priv', 'INDEX', __('Allows creating and dropping indexes.')), - array('Alter_priv', 'ALTER', __('Allows altering the structure of existing tables.')), - array('Show_db_priv', 'SHOW DATABASES', __('Gives access to the complete list of databases.')), - array('Super_priv', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')), - array('Create_tmp_table_priv', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')), - array('Lock_tables_priv', 'LOCK TABLES', __('Allows locking tables for the current thread.')), - array('Repl_slave_priv', 'REPLICATION SLAVE', __('Needed for the replication slaves.')), - array('Repl_client_priv', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.')), - array('Create_view_priv', 'CREATE VIEW', __('Allows creating new views.')), - array('Event_priv', 'EVENT', __('Allows to set up events for the event scheduler')), - array('Trigger_priv', 'TRIGGER', __('Allows creating and dropping triggers')), + array( + 'Select_priv', + 'SELECT', + __('Allows reading data.')), + array( + 'Insert_priv', + 'INSERT', + __('Allows inserting and replacing data.')), + array( + 'Update_priv', + 'UPDATE', + __('Allows changing data.')), + array( + 'Delete_priv', + 'DELETE', + __('Allows deleting data.')), + array( + 'Create_priv', + 'CREATE', + __('Allows creating new databases and tables.')), + array( + 'Drop_priv', + 'DROP', + __('Allows dropping databases and tables.')), + array( + 'Reload_priv', + 'RELOAD', + __('Allows reloading server settings and flushing the server\'s caches.')), + array( + 'Shutdown_priv', + 'SHUTDOWN', + __('Allows shutting down the server.')), + array( + 'Process_priv', + 'PROCESS', + __('Allows viewing processes of all users')), + array( + 'File_priv', + 'FILE', + __('Allows importing data from and exporting data into files.')), + array( + 'References_priv', + 'REFERENCES', + __('Has no effect in this MySQL version.')), + array( + 'Index_priv', + 'INDEX', + __('Allows creating and dropping indexes.')), + array( + 'Alter_priv', + 'ALTER', + __('Allows altering the structure of existing tables.')), + array( + 'Show_db_priv', + 'SHOW DATABASES', + __('Gives access to the complete list of databases.')), + array( + 'Super_priv', + 'SUPER', + __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')), + array( + 'Create_tmp_table_priv', + 'CREATE TEMPORARY TABLES', + __('Allows creating temporary tables.')), + array( + 'Lock_tables_priv', + 'LOCK TABLES', + __('Allows locking tables for the current thread.')), + array( + 'Repl_slave_priv', + 'REPLICATION SLAVE', + __('Needed for the replication slaves.')), + array( + 'Repl_client_priv', + 'REPLICATION CLIENT', + __('Allows the user to ask where the slaves / masters are.')), + array( + 'Create_view_priv', + 'CREATE VIEW', + __('Allows creating new views.')), + array( + 'Event_priv', + 'EVENT', + __('Allows to set up events for the event scheduler')), + array( + 'Trigger_priv', + 'TRIGGER', + __('Allows creating and dropping triggers')), // for table privs: - array('Create View_priv', 'CREATE VIEW', __('Allows creating new views.')), - array('Show_view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')), + array( + 'Create View_priv', + 'CREATE VIEW', + __('Allows creating new views.')), + array( + 'Show_view_priv', + 'SHOW VIEW', + __('Allows performing SHOW CREATE VIEW queries.')), // for table privs: - array('Show view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')), - array('Create_routine_priv', 'CREATE ROUTINE', __('Allows creating stored routines.')), - array('Alter_routine_priv', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')), - array('Create_user_priv', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.')), - array('Execute_priv', 'EXECUTE', __('Allows executing stored routines.')), + array( + 'Show view_priv', + 'SHOW VIEW', + __('Allows performing SHOW CREATE VIEW queries.')), + array( + 'Create_routine_priv', + 'CREATE ROUTINE', + __('Allows creating stored routines.')), + array( + 'Alter_routine_priv', + 'ALTER ROUTINE', + __('Allows altering and dropping stored routines.')), + array( + 'Create_user_priv', + 'CREATE USER', + __('Allows creating, dropping and renaming user accounts.')), + array( + 'Execute_priv', + 'EXECUTE', + __('Allows executing stored routines.')), ); if (!empty($row) && isset($row['Table_priv'])) { hooks/post-receive -- phpMyAdmin

1 0