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

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

Browse Source
This commit is contained in:
Piotr Przybylski 2011-06-27 23:55:32 +02:00
commit 3bde595666
176 changed files with 34640 additions and 36854 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,12 +25,13 @@ phpMyAdmin - ChangeLog
+ [display] More options for browsing GIS data
+ [interface] Support for spatial indexes
+ [display] GIS data visualization
+ AJAX for table structure multiple-columns change
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
- bug #3323101 [parser] Invalid escape sequence in SQL parser
3.4.3.0 (not yet released)
3.4.3.0 (2011-06-27)
- bug #3311170 [sync] Missing helper icons in Synchronize
- patch #3304473 [setup] Redefine a lable that was wrong
- bug #3304544 [parser] master is not a reserved word

2
db_events.php
View File

@ -1,7 +1,9 @@
<?php
/**
* Events management.
*
* @package phpMyAdmin
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';

4
db_export.php
View File

@ -3,10 +3,6 @@
/**
* dumps a database
*
* @uses libraries/db_common.inc.php
* @uses libraries/db_info.inc.php
* @uses libraries/display_export.lib.php
* @uses $tables from libraries/db_info.inc.php
* @package phpMyAdmin
*/

4
db_operations.php
View File

@ -233,7 +233,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
// to avoid selecting alternatively the current and new db
// we would need to modify the CREATE definitions to qualify
// the db name
$event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
$event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
if ($event_names) {
foreach($event_names as $event_name) {
PMA_DBI_select_db($db);
@ -589,7 +589,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
$test_query = '
SELECT *
FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . '
WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
$test_rs = PMA_query_as_controluser($test_query, null, PMA_DBI_QUERY_STORE);
/*

2
db_printview.php
View File

@ -53,7 +53,7 @@ if ($cfg['SkipLockedTables'] == true) {
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0]) . '\';');
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0], true) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
$tables[] = $sts_tmp;
} else { // table in use

8
db_routines.php
View File

@ -1,6 +1,8 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Routines management.
*
* @package phpMyAdmin
*/
@ -251,8 +253,8 @@ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['routine_name']))
$routine_name = htmlspecialchars(PMA_backquote($_GET['routine_name']));
$routine_type = PMA_DBI_fetch_value("SELECT ROUTINE_TYPE "
. "FROM INFORMATION_SCHEMA.ROUTINES "
. "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' "
. "AND SPECIFIC_NAME='" . PMA_sqlAddslashes($_GET['routine_name']) . "';");
. "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' "
. "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($_GET['routine_name']) . "';");
if (! empty($routine_type) && $create_proc = PMA_DBI_get_definition($db, $routine_type, $_GET['routine_name'])) {
$create_proc = '<textarea cols="40" rows="15" style="width: 100%;">' . htmlspecialchars($create_proc) . '</textarea>';
if ($GLOBALS['is_ajax_request']) {
@ -345,7 +347,7 @@ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['routine_name']))
$extra_data = array();
if ($message->isSuccess()) {
$columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddslashes($_REQUEST['routine_name']) . "'";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['routine_name']) . "'";
$routine = PMA_DBI_fetch_single_row("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;");
$extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['routine_name']));
$extra_data['new_row'] = PMA_RTN_getRowForRoutinesList($routine, 0, true);

31
db_search.php
View File

@ -5,30 +5,6 @@
*
* @todo make use of UNION when searching multiple tables
* @todo display executed query, optional?
* @uses $cfg['UseDbSearch']
* @uses $GLOBALS['db']
* @uses PMA_DBI_get_tables()
* @uses PMA_sqlAddslashes()
* @uses PMA_getSearchSqls()
* @uses PMA_DBI_fetch_value()
* @uses PMA_linkOrButton()
* @uses PMA_generate_common_url()
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_showMySQLDocu()
* @uses $_REQUEST['search_str']
* @uses $_REQUEST['submit_search']
* @uses $_REQUEST['search_option']
* @uses $_REQUEST['table_select']
* @uses $_REQUEST['unselectall']
* @uses $_REQUEST['selectall']
* @uses $_REQUEST['field_str']
* @uses is_string()
* @uses htmlspecialchars()
* @uses array_key_exists()
* @uses is_array()
* @uses array_intersect()
* @uses sprintf()
* @uses in_array()
* @package phpMyAdmin
*/
@ -85,11 +61,11 @@ if (empty($_REQUEST['search_str']) || ! is_string($_REQUEST['search_str'])) {
$searched = htmlspecialchars($_REQUEST['search_str']);
// For "as regular expression" (search option 4), we should not treat
// this as an expression that contains a LIKE (second parameter of
// PMA_sqlAddslashes()).
// PMA_sqlAddSlashes()).
//
// Usage example: If user is seaching for a literal $ in a regexp search,
// he should enter \$ as the value.
$search_str = PMA_sqlAddslashes($_REQUEST['search_str'], ($search_option == 4 ? false : true));
$search_str = PMA_sqlAddSlashes($_REQUEST['search_str'], ($search_option == 4 ? false : true));
}
$tables_selected = array();
@ -108,7 +84,7 @@ if (isset($_REQUEST['selectall'])) {
if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
unset($field_str);
} else {
$field_str = PMA_sqlAddslashes($_REQUEST['field_str'], true);
$field_str = PMA_sqlAddSlashes($_REQUEST['field_str'], true);
}
/**
@ -130,7 +106,6 @@ if (isset($_REQUEST['submit_search'])) {
* Builds the SQL search query
*
* @todo can we make use of fulltextsearch IN BOOLEAN MODE for this?
* @uses PMA_DBI_query
* PMA_backquote
* PMA_DBI_free_result
* PMA_DBI_fetch_assoc

4
db_tracking.php
View File

@ -67,7 +67,7 @@ require_once './libraries/db_links.inc.php';
$all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' .
PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' ' .
' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' .
' GROUP BY '. PMA_backquote('table_name') .
' ORDER BY '. PMA_backquote('table_name') .' ASC';
@ -110,7 +110,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
$table_query = ' SELECT * FROM ' .
PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' .
PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\'';
' WHERE `db_name` = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddSlashes($table_name) . '\' AND `version` = \'' . $version_number . '\'';
$table_result = PMA_query_as_controluser($table_query);
$version_data = PMA_DBI_fetch_array($table_result);

3
import.php
View File

@ -3,7 +3,6 @@
/**
* Core script for import, this is just the glue around all other stuff
*
* @uses PMA_Bookmark_getList()
* @package phpMyAdmin
*/
@ -154,7 +153,7 @@ if (!empty($id_bookmark)) {
case 0: // bookmarked query that have to be run
$import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all));
if (isset($bookmark_variable) && !empty($bookmark_variable)) {
$import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddslashes($bookmark_variable) . '${2}', $import_text);
$import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddSlashes($bookmark_variable) . '${2}', $import_text);
}
// refresh left frame on changes in table or db structure

19
index.php
View File

@ -3,26 +3,7 @@
/**
* forms frameset
*
* @uses $GLOBALS['cfg']['QueryHistoryDB']
* @uses $GLOBALS['cfg']['Server']['user']
* @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe
* @uses $GLOBALS['cfg']['DefaultTabDatabase'] as src for the mainframe
* @uses $GLOBALS['cfg']['NaviWidth'] for navi frame width
* @uses $GLOBALS['collation_connection'] from $_REQUEST (grab_globals.lib.php)
* or common.inc.php
* @uses $GLOBALS['available_languages'] from common.inc.php (select_lang.lib.php)
* @uses $GLOBALS['db']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['text_dir']
* @uses $_ENV['HTTP_HOST']
* @uses PMA_getRelationsParam()
* @uses PMA_purgeHistory()
* @uses PMA_generate_common_url()
* @uses PMA_VERSION
* @uses session_write_close()
* @uses time()
* @uses PMA_getenv()
* @uses header() to send charset
* @package phpMyAdmin
*/

7
js/functions.js
View File

@ -2013,6 +2013,10 @@ $(document).ready(function() {
* Hides certain table structure actions, replacing them with the word "More". They are displayed
* in a dropdown menu when the user hovers over the word "More."
*/
displayMoreTableOpts();
});
function displayMoreTableOpts() {
// Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers)
// if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point)
if($("input[type='hidden'][name='table_type']").val() == "table") {
@ -2081,8 +2085,7 @@ $(document).ready(function() {
}
});
}
});
}
$(document).ready(initTooltips);
/* Displays tooltips */

7
js/sql.js
View File

@ -187,6 +187,13 @@ $(document).ready(function() {
cache: 'false'
});
/* Hides the bookmarkoptions checkboxes when the bookmark label is empty */
$('input#bkm_label').keyup(function() {
$('input#id_bkm_all_users, input#id_bkm_replace')
.parent()
.toggle($(this).attr('value').length > 0);
}).trigger('keyup');
/**
* current value of the direction in which the table is displayed
* @type String

106
js/tbl_structure.js
View File

@ -145,5 +145,109 @@ $(document).ready(function() {
}) // end $.get()
}) // end $.PMA_confirm()
}) //end Drop Primary Key/Index
/**
*Ajax event handler for muti column change
**/
$("#fieldsForm.ajax .mult_submit[value=change]").live('click', function(event){
event.preventDefault();
/*Check whether atleast one row is selected for change*/
if($("#tablestructure tbody tr").hasClass("marked")){
var div = $('<div id="change_column_dialog"></div>');
/**
* @var button_options Object that stores the options passed to jQueryUI
* dialog
*/
var button_options = {};
// in the following function we need to use $(this)
button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
var button_options_error = {};
button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
var $form = $("#fieldsForm");
var $msgbox = PMA_ajaxShowMessage();
$.get( $form.attr('action') , $form.serialize()+"&ajax_request=true&submit_mult=change" , function(data) {
//in the case of an error, show the error message returned.
if (data.success != undefined && data.success == false) {
div
.append(data.error)
.dialog({
title: PMA_messages['strChangeTbl'],
height: 230,
width: 900,
open: PMA_verifyTypeOfAllColumns,
buttons : button_options_error
})// end dialog options
} else {
div
.append(data)
.dialog({
title: PMA_messages['strChangeTbl'],
height: 600,
width: 900,
open: PMA_verifyTypeOfAllColumns,
buttons : button_options
})
//Remove the top menu container from the dialog
.find("#topmenucontainer").hide()
; // end dialog options
$("#append_fields_form input[name=do_save_data]").addClass("ajax");
}
PMA_ajaxRemoveMessage($msgbox);
}) // end $.get()
} else {
PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']);
}
});
/**
*Ajax action for submitting the column change form
**/
$("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) {
event.preventDefault();
/**
* @var the_form object referring to the export form
*/
var $form = $("#append_fields_form");
PMA_prepareForAjaxRequest($form);
//User wants to submit the form
$.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) {
if ($("#sqlqueryresults").length != 0) {
$("#sqlqueryresults").remove();
} else if ($(".error").length != 0) {
$(".error").remove();
}
if (data.success == true) {
PMA_ajaxShowMessage(data.message);
$("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
$("#sqlqueryresults").html(data.sql_query);
$("#result_query .notice").remove();
$("#result_query").prepend((data.message));
if ($("#change_column_dialog").length > 0) {
$("#change_column_dialog").dialog("close").remove();
}
/*Reload the field form*/
$.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) {
$("#fieldsForm").remove();
var $temp_div = $("<div id='temp_div'><div>").append(form_data);
if ($("#sqlqueryresults").length != 0) {
$temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults");
} else {
$temp_div.find("#fieldsForm").insertAfter(".error");
}
/*Call the function to display the more options in table*/
displayMoreTableOpts();
});
} else {
var $temp_div = $("<div id='temp_div'><div>").append(data);
var $error = $temp_div.find(".error code").addClass("error");
PMA_ajaxShowMessage($error);
}
}) // end $.post()
}) // end insert table button "do_save_data"
}) // end $(document).ready()

44
libraries/Config.class.php
View File

@ -305,10 +305,6 @@ class PMA_Config
/**
* loads default values from default source
*
* @uses file_exists()
* @uses $this->default_source
* @uses $this->error_config_default_file
* @uses $this->settings
* @return boolean success
*/
function loadDefaults()
@ -418,16 +414,6 @@ class PMA_Config
* Loads user preferences and merges them with current config
* must be called after control connection has been estabilished
*
* @uses $GLOBALS['cfg']
* @uses $GLOBALS['collation_connection']
* @uses $GLOBALS['lang']
* @uses $_SESSION['cache']['server_$server']['config_mtime']
* @uses $_SESSION['cache']['server_$server']['userprefs']
* @uses $_SESSION['cache']['server_$server']['userprefs_mtime']
* @uses $_SESSION['PMA_Theme_Manager']
* @uses PMA_apply_userprefs()
* @uses PMA_array_merge_recursive()
* @uses PMA_load_userprefs()
* @return boolean
*/
function loadUserPreferences()
@ -530,10 +516,6 @@ class PMA_Config
* If user preferences are not yet initialized, option is applied to global config and
* added to a update queue, which is processed by {@link loadUserPreferences()}
*
* @uses $GLOBALS['cfg']
* @uses PMA_array_read()
* @uses PMA_array_write()
* @uses PMA_persist_option()
* @param string $cookie_name can be null
* @param string $cfg_path
* @param mixed $new_cfg_value
@ -672,7 +654,6 @@ class PMA_Config
/**
* sets configuration variable
*
* @uses $this->settings
* @param string $setting configuration option
* @param string $value new value for configuration option
*/
@ -890,14 +871,6 @@ class PMA_Config
/**
* checks for font size configuration, and sets font size as requested by user
*
* @uses $_GET
* @uses $_POST
* @uses $_COOKIE
* @uses preg_match()
* @uses function_exists()
* @uses PMA_Config::set()
* @uses PMA_Config::get()
* @uses PMA_Config::setCookie()
*/
function checkFontsize()
{
@ -1105,8 +1078,6 @@ class PMA_Config
/**
* returns options for font size selection
*
* @uses preg_replace()
* @uses ksort()
* @static
* @param string $current_size current selected font size with unit
* @return array selectable font sizes
@ -1167,9 +1138,6 @@ class PMA_Config
/**
* returns html selectbox for font sizes
*
* @uses $GLOBALS['PMA_Config']
* @uses PMA_Config::get()
* @uses PMA_Config::_getFontsizeOptions()
* @static
* @param string $current_size currently slected font size with unit
* @return string html selectbox
@ -1204,8 +1172,6 @@ class PMA_Config
/**
* return complete font size selection form
*
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_Config::_getFontsizeSelection()
* @static
* @param string $current_size currently slected font size with unit
* @return string html selectbox
@ -1225,10 +1191,6 @@ class PMA_Config
/**
* removes cookie
*
* @uses PMA_Config::isHttps()
* @uses PMA_Config::getCookiePath()
* @uses setcookie()
* @uses time()
* @param string $cookie name of cookie to remove
* @return boolean result of setcookie()
*/
@ -1242,12 +1204,6 @@ class PMA_Config
* sets cookie if value is different from current cokkie value,
* or removes if value is equal to default
*
* @uses PMA_Config::isHttps()
* @uses PMA_Config::getCookiePath()
* @uses $_COOKIE
* @uses PMA_Config::removeCookie()
* @uses setcookie()
* @uses time()
* @param string $cookie name of cookie to remove
* @param mixed $value new cookie value
* @param string $default default value

55
libraries/Error.class.php
View File

@ -93,12 +93,6 @@ class PMA_Error extends PMA_Message
/**
* Constructor
*
* @uses debug_backtrace()
* @uses PMA_Error::setNumber()
* @uses PMA_Error::setMessage()
* @uses PMA_Error::setFile()
* @uses PMA_Error::setLine()
* @uses PMA_Error::setBacktrace()
* @param integer $errno
* @param string $errstr
* @param string $errfile
@ -122,7 +116,6 @@ class PMA_Error extends PMA_Message
/**
* sets PMA_Error::$_backtrace
*
* @uses PMA_Error::$_backtrace to set it
* @param array $backtrace
*/
public function setBacktrace($backtrace)
@ -133,7 +126,6 @@ class PMA_Error extends PMA_Message
/**
* sets PMA_Error::$_line
*
* @uses PMA_Error::$_line to set it
* @param integer $line
*/
public function setLine($line)
@ -144,8 +136,6 @@ class PMA_Error extends PMA_Message
/**
* sets PMA_Error::$_file
*
* @uses PMA_Error::$_file to set it
* @uses PMA_Error::relPath()
* @param string $file
*/
public function setFile($file)
@ -157,13 +147,6 @@ class PMA_Error extends PMA_Message
/**
* returns unique PMA_Error::$_hash, if not exists it will be created
*
* @uses PMA_Error::$_hash as return value and to set it if required
* @uses PMA_Error::getNumber()
* @uses PMA_Error::getMessage()
* @uses PMA_Error::getFile()
* @uses PMA_Error::getLine()
* @uses PMA_Error::getBacktrace()
* @uses md5()
* @param string $file
* @return string PMA_Error::$_hash
*/
@ -185,7 +168,6 @@ class PMA_Error extends PMA_Message
/**
* returns PMA_Error::$_backtrace
*
* @uses PMA_Error::$_backtrace as return value
* @return array PMA_Error::$_backtrace
*/
public function getBacktrace()
@ -196,7 +178,6 @@ class PMA_Error extends PMA_Message
/**
* returns PMA_Error::$_file
*
* @uses PMA_Error::$_file as return value
* @return string PMA_Error::$_file
*/
public function getFile()
@ -207,7 +188,6 @@ class PMA_Error extends PMA_Message
/**
* returns PMA_Error::$_line
*
* @uses PMA_Error::$_line as return value
* @return integer PMA_Error::$_line
*/
public function getLine()
@ -218,8 +198,6 @@ class PMA_Error extends PMA_Message
/**
* returns type of error
*
* @uses PMA_Error::$errortype
* @uses PMA_Error::getNumber()
* @return string type of error
*/
public function getType()
@ -230,8 +208,6 @@ class PMA_Error extends PMA_Message
/**
* returns level of error
*
* @uses PMA_Error::$$errorlevel
* @uses PMA_Error::getNumber()
* @return string level of error
*/
public function getLevel()
@ -242,9 +218,6 @@ class PMA_Error extends PMA_Message
/**
* returns title prepared for HTML Title-Tag
*
* @uses PMA_Error::getTitle()
* @uses htmlspecialchars()
* @uses substr()
* @return string HTML escaped and truncated title
*/
public function getHtmlTitle()
@ -255,8 +228,6 @@ class PMA_Error extends PMA_Message
/**
* returns title for error
*
* @uses PMA_Error::getType()
* @uses PMA_Error::getMessage()
* @return string
*/
public function getTitle()
@ -267,10 +238,6 @@ class PMA_Error extends PMA_Message
/**
* Display HTML backtrace
*
* @uses PMA_Error::getBacktrace()
* @uses PMA_Error::relPath()
* @uses PMA_Error::displayArg()
* @uses count()
*/
public function displayBacktrace()
{
@ -300,9 +267,6 @@ class PMA_Error extends PMA_Message
* Display a single function argument
* if $function is one of include/require the $arg is converted te relative path
*
* @uses PMA_Error::relPath()
* @uses in_array()
* @uses gettype()
* @param string $arg
* @param string $function
*/
@ -327,11 +291,6 @@ class PMA_Error extends PMA_Message
/**
* Displays the error in HTML
*
* @uses PMA_Error::getLevel()
* @uses PMA_Error::getType()
* @uses PMA_Error::getMessage()
* @uses PMA_Error::displayBacktrace()
* @uses PMA_Error::isDisplayed()
*/
public function display()
{
@ -356,10 +315,6 @@ class PMA_Error extends PMA_Message
/**
* whether this error is a user error
*
* @uses E_USER_WARNING
* @uses E_USER_ERROR
* @uses E_USER_NOTICE
* @uses PMA_Error::getNumber()
* @return boolean
*/
public function isUserError()
@ -374,16 +329,6 @@ class PMA_Error extends PMA_Message
* and make users feel save to submit error reports
*
* @static
* @uses PHP_OS()
* @uses __FILE__()
* @uses realpath()
* @uses substr()
* @uses explode()
* @uses dirname()
* @uses implode()
* @uses count()
* @uses array_pop()
* @uses str_replace()
* @param string $dest path to be shorten
* @return string shortened path
*/

62
libraries/Error_Handler.class.php
View File

@ -28,7 +28,6 @@ class PMA_Error_Handler
/**
* Constructor - set PHP error handler
*
* @uses set_error_handler()
*/
public function __construct()
{
@ -40,10 +39,6 @@ class PMA_Error_Handler
*
* stores errors in session
*
* @uses $_SESSION['errors']
* @uses array_merge()
* @uses PMA_Error_Handler::$_errors
* @uses PMA_Error::isDisplayed()
*/
public function __destruct()
{
@ -69,8 +64,6 @@ class PMA_Error_Handler
/**
* returns array with all errors
*
* @uses PMA_Error_Handler::$_errors as return value
* @uses PMA_Error_Handler::_checkSavedErrors()
* @return array PMA_Error_Handler::$_errors
*/
protected function getErrors()
@ -90,24 +83,6 @@ class PMA_Error_Handler
* Do not use the context parameter as we want to avoid storing the
* complete $GLOBALS inside $_SESSION['errors']
*
* @uses E_USER_NOTICE
* @uses E_USER_WARNING
* @uses E_STRICT
* @uses E_NOTICE
* @uses E_WARNING
* @uses E_CORE_WARNING
* @uses E_COMPILE_WARNING
* @uses E_USER_ERROR
* @uses E_ERROR
* @uses E_PARSE
* @uses E_CORE_ERROR
* @uses E_COMPILE_ERROR
* @uses E_RECOVERABLE_ERROR
* @uses PMA_Error
* @uses PMA_Error_Handler::$_errors
* @uses PMA_Error_Handler::_dispFatalError()
* @uses PMA_Error::getHash()
* @uses PMA_Error::getNumber()
* @param integer $errno
* @param string $errstr
* @param string $errfile
@ -151,8 +126,6 @@ class PMA_Error_Handler
* log error to configured log facility
*
* @todo finish!
* @uses PMA_Error::getMessage()
* @uses error_log()
* @param PMA_Error $error
*/
protected function _logError($error)
@ -163,7 +136,6 @@ class PMA_Error_Handler
/**
* trigger a custom error
*
* @uses trigger_error()
* @param string $errorInfo
* @param integer $errorNumber
* @param string $file
@ -178,10 +150,6 @@ class PMA_Error_Handler
/**
* display fatal error and exit
*
* @uses headers_sent()
* @uses PMA_Error::display()
* @uses PMA_Error_Handler::_dispPageStart()
* @uses PMA_Error_Handler::_dispPageEnd()
* @param PMA_Error $error
*/
protected function _dispFatalError($error)
@ -197,10 +165,6 @@ class PMA_Error_Handler
/**
* display the whole error page with all errors
*
* @uses headers_sent()
* @uses PMA_Error_Handler::dispAllErrors()
* @uses PMA_Error_Handler::_dispPageStart()
* @uses PMA_Error_Handler::_dispPageEnd()
*/
public function dispErrorPage()
{
@ -214,10 +178,6 @@ class PMA_Error_Handler
/**
* display user errors not displayed
*
* @uses PMA_Error_Handler::getErrors()
* @uses PMA_Error::isDisplayed()
* @uses PMA_Error::isUserError()
* @uses PMA_Error::display()
*/
public function dispUserErrors()
{
@ -231,7 +191,6 @@ class PMA_Error_Handler
/**
* display HTML header
*
* @uses PMA_Error::getTitle()
* @param PMA_error $error
*/
protected function _dispPageStart($error = null)
@ -257,8 +216,6 @@ class PMA_Error_Handler
/**
* display all errors regardless already displayed or user errors
*
* @uses PMA_Error_Handler::getErrors()
* @uses PMA_Error::display()
*/
public function dispAllErrors()
{
@ -270,11 +227,6 @@ class PMA_Error_Handler
/**
* display errors not displayed
*
* @uses $cfg['Error_Handler']['display']
* @uses PMA_Error_Handler::getErrors()
* @uses PMA_Error_Handler::dispUserErrors()
* @uses PMA_Error::isDisplayed()
* @uses PMA_Error::display()
*/
public function dispErrors()
{
@ -296,9 +248,6 @@ class PMA_Error_Handler
/**
* look in session for saved errors
*
* @uses $_SESSION['errors']
* @uses PMA_Error_Handler::$_errors
* @uses array_merge()
*/
protected function _checkSavedErrors()
{
@ -321,8 +270,6 @@ class PMA_Error_Handler
/**
* return count of errors
*
* @uses PMA_Error_Handler::getErrors()
* @uses count()
* @return integer number of errors occoured
*/
public function countErrors()
@ -333,9 +280,6 @@ class PMA_Error_Handler
/**
* return count of user errors
*
* @uses PMA_Error_Handler::countErrors()
* @uses PMA_Error_Handler::getErrors()
* @uses PMA_Error::isUserError()
* @return integer number of user errors occoured
*/
public function countUserErrors()
@ -355,7 +299,6 @@ class PMA_Error_Handler
/**
* whether use errors occured or not
*
* @uses PMA_Error_Handler::countUserErrors()
* @return boolean
*/
public function hasUserErrors()
@ -366,7 +309,6 @@ class PMA_Error_Handler
/**
* whether errors occured or not
*
* @uses PMA_Error_Handler::countErrors()
* @return boolean
*/
public function hasErrors()
@ -377,9 +319,6 @@ class PMA_Error_Handler
/**
* number of errors to be displayed
*
* @uses $cfg['Error_Handler']['display']
* @uses PMA_Error_Handler::countErrors()
* @uses PMA_Error_Handler::countUserErrors()
* @return integer number of errors to be displayed
*/
public function countDisplayErrors()
@ -394,7 +333,6 @@ class PMA_Error_Handler
/**
* whether there are errors to display or not
*
* @uses PMA_Error_Handler::countDisplayErrors()
* @return boolean
*/
public function hasDisplayErrors()

70
libraries/File.class.php
View File

@ -79,7 +79,6 @@ class PMA_File
* constructor
*
* @access public
* @uses PMA_File::setName()
* @param string $name file name
*/
function __construct($name = false)
@ -94,7 +93,6 @@ class PMA_File
*
* @see PMA_File::cleanUp()
* @access public
* @uses PMA_File::cleanUp()
*/
function __destruct()
{
@ -105,8 +103,6 @@ class PMA_File
* deletes file if it is temporary, usally from a moved upload file
*
* @access public
* @uses PMA_File::delet()
* @uses PMA_File::isTemp()
* @return boolean success
*/
function cleanUp()
@ -122,8 +118,6 @@ class PMA_File
* deletes the file
*
* @access public
* @uses PMA_File::getName()
* @uses unlink()
* @return boolean success
*/
function delete()
@ -136,7 +130,6 @@ class PMA_File
* file objects with temp flags are deleted with object destruction
*
* @access public
* @uses PMA_File::$_is_temp to set and read it
* @param boolean sets the temp flag
* @return boolean PMA_File::$_is_temp
*/
@ -153,7 +146,6 @@ class PMA_File
* accessor
*
* @access public
* @uses PMA_File::$_name
* @param string $name file name
*/
function setName($name)
@ -163,17 +155,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File::getName()
* @uses PMA_File::isUploaded()
* @uses PMA_File::checkUploadedFile()
* @uses PMA_File::isReadable()
* @uses PMA_File::$_content
* @uses function_exists()
* @uses file_get_contents()
* @uses filesize()
* @uses fread()
* @uses fopen()
* @uses bin2hex()
* @return string binary file content
*/
function getContent($as_binary = true, $offset = 0, $length = null)
@ -209,8 +190,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File::getName()
* @uses is_uploaded_file()
*/
function isUploaded()
{
@ -221,7 +200,6 @@ class PMA_File
* accessor
*
* @access public
* @uses PMA_File::$name as return value
* @return string PMA_File::$_name
*/
function getName()
@ -232,9 +210,6 @@ class PMA_File
/**
* @todo replace error message with localized string
* @access public
* @uses PMA_File::isUploaded()
* @uses PMA_File::setName()
* @uses PMA_File::$_error_message
* @param string name of file uploaded
* @return boolean success
*/
@ -253,12 +228,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File::fetchUploadedFromTblChangeRequestMultiple()
* @uses PMA_File::setUploadedFile()
* @uses PMA_File::setRecentBLOBReference()
* @uses curl_setopt_array()
* @uses PMA_File::$_error_message
* @uses $_FILES
* @param string $key the md5 hash of the column name
* @param string $rownumber
* @return boolean success
@ -375,9 +344,6 @@ class PMA_File
* sets the name if the file to the one selected in the tbl_change form
*
* @access public
* @uses $_REQUEST
* @uses PMA_File::setLocalSelectedFile()
* @uses is_string()
* @param string $key the md5 hash of the column name
* @param string $rownumber
* @return boolean success
@ -437,7 +403,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File->$_error_message as return value
* @return string error message
*/
function getError()
@ -447,7 +412,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File->$_error_message to check it
* @return boolean whether an error occured or not
*/
function isError()
@ -460,8 +424,6 @@ class PMA_File
* and uses the submitted/selected file
*
* @access public
* @uses PMA_File::setUploadedFromTblChangeRequest()
* @uses PMA_File::setSelectedFromTblChangeRequest()
* @param string $key the md5 hash of the column name
* @param string $rownumber
* @return boolean success
@ -485,10 +447,6 @@ class PMA_File
/**
*
* @access public
* @uses PMA_File::setName()
* @uses PMA_securePath()
* @uses PMA_userDir()
* @uses $GLOBALS['cfg']['UploadDir']
* @param string $name
* @return boolean success
*/
@ -508,10 +466,6 @@ class PMA_File
/**
* @access public
* @uses PMA_File::getName()
* @uses is_readable()
* @uses ob_start()
* @uses ob_end_clean()
* @return boolean whether the file is readable or not
*/
function isReadable()
@ -532,20 +486,6 @@ class PMA_File
* @todo replace error message with localized string
* @todo move check of $cfg['TempDir'] into PMA_Config?
* @access public
* @uses $cfg['TempDir']
* @uses PMA_File::isReadable()
* @uses PMA_File::getName()
* @uses PMA_File::setName()
* @uses PMA_File::isTemp()
* @uses PMA_File::$_error_message
* @uses is_dir()
* @uses mkdir()
* @uses chmod()
* @uses is_writable()
* @uses basename()
* @uses move_uploaded_file()
* @uses ob_start()
* @uses ob_end_clean()
* @return boolean whether uploaded fiel is fine or not
*/
function checkUploadedFile()
@ -588,14 +528,6 @@ class PMA_File
*
* @todo move file read part into readChunk() or getChunk()
* @todo add support for compression plugins
* @uses PMA_File::$_compression to set it
* @uses PMA_File::getName()
* @uses fopen()
* @uses fread()
* @uses strlen()
* @uses fclose()
* @uses chr()
* @uses substr()
* @access protected
* @return string MIME type of compression, none for none
*/
@ -729,8 +661,6 @@ class PMA_File
}
/**
* @uses PMA_File::$_compression as return value
* @uses PMA_File::detectCompression()
* @return string MIME type of compression, none for none
* @access public
*/

19
libraries/Index.class.php
View File

@ -86,7 +86,6 @@ class PMA_Index
/**
* Constructor
*
* @uses $this->set()
* @param array $params
*/
public function __construct($params = array())
@ -112,8 +111,6 @@ class PMA_Index
/**
* returns an array with all indexes from the given table
*
* @uses PMA_Index::_loadIndexes()
* @uses PMA_Index::$_registry
* @param string $table
* @param string $schema
* @return array
@ -132,8 +129,6 @@ class PMA_Index
/**
* return primary if set, false otherwise
*
* @uses PMA_Index::_loadIndexes()
* @uses PMA_Index::$_registry
* @param string $table
* @param string $schema
* @return mixed primary index or false if no one exists
@ -152,11 +147,6 @@ class PMA_Index
/**
* Load index data for table
*
* @uses PMA_Index::$_registry
* @uses PMA_DBI_fetch_result()
* @uses PMA_backquote()
* @uses PMA_Index
* @uses PMA_Index->addColumn()
* @param string $table
* @param string $schema
* @return boolean
@ -186,8 +176,6 @@ class PMA_Index
/**
* Add column to index
*
* @uses $this->_columns
* @uses PMA_Index_Column
* @param array $params column params
*/
public function addColumn($params)
@ -227,7 +215,6 @@ class PMA_Index
/**
* Returns true if $column indexed in this index
*
* @uses $this->_columns
* @param string $column
* @return boolean
*/
@ -546,12 +533,6 @@ class PMA_Index
/**
* Function to check over array of indexes and look for common problems
*
* @uses is_string()
* @uses is_array()
* @uses count()
* @uses array_pop()
* @uses reset()
* @uses current()
* @access public
* @param string name of table
* @return string Output HTML

11
libraries/List.class.php
View File

@ -27,9 +27,6 @@ abstract class PMA_List extends ArrayObject
/**
* returns item only if there is only one in the list
*
* @uses count()
* @uses reset()
* @uses PMA_List::getEmpty() to return it
* @return single item
*/
public function getSingleItem()
@ -44,7 +41,6 @@ abstract class PMA_List extends ArrayObject
/**
* defines what is an empty item (0, '', false or null)
*
* @uses PMA_List::$item_empty as return value
* @return mixed an empty item
*/
public function getEmpty()
@ -56,9 +52,6 @@ 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
*
* @uses PMA_List::$items to check for existence of specific item
* @uses func_get_args()
* @uses in_array() to check if given arguments exists in PMA_List::$items
* @param string $db_name,.. one or more mysql result resources
* @return boolean true if all items exists, otheriwse false
*/
@ -77,9 +70,6 @@ abstract class PMA_List extends ArrayObject
/**
* returns HTML <option>-tags to be used inside <select></select>
*
* @uses PMA_List::$items to build up the option items
* @uses PMA_List::getDefault() to mark this as selected if requested
* @uses htmlspecialchars() to escape items
* @param mixed $selected the selected db or true for selecting current db
* @param boolean $include_information_schema
* @return string HTML option tags
@ -110,7 +100,6 @@ abstract class PMA_List extends ArrayObject
/**
* returns default item
*
* @uses PMA_List::getEmpty() as fallback
* @return string default item
*/
public function getDefault()

53
libraries/List_Database.class.php
View File

@ -56,10 +56,6 @@ require_once './libraries/List.class.php';
/**
* Constructor
*
* @uses PMA_List_Database::$_db_link
* @uses PMA_List_Database::$_db_link_user
* @uses PMA_List_Database::$_db_link_control
* @uses PMA_List_Database::build()
* @param mixed $db_link_user user database link resource|object
* @param mixed $db_link_control control database link resource|object
*/
@ -77,9 +73,6 @@ require_once './libraries/List.class.php';
* checks if the configuration wants to hide some databases
*
* @todo temporaly use this docblock to test how to doc $GLOBALS
* @uses PMA_List_Database::$items
* @uses preg_match()
* @uses $cfg['Server']['hide_db']
*/
protected function _checkHideDatabase()
{
@ -98,16 +91,6 @@ require_once './libraries/List.class.php';
* retrieves database list from server
*
* @todo we could also search mysql tables if all fail?
* @uses PMA_List_Database::$_show_databases_disabled for not retrying if SHOW DATABASES is disabled
* @uses PMA_List_Database::$_db_link
* @uses PMA_List_Database::$_db_link_control in case of SHOW DATABASES is disabled for userlink
* @uses PMA_DBI_fetch_result()
* @uses PMA_DBI_getError()
* @uses natsort()
* @uses sort()
* @uses $cfg['NaturalOrder']
* @uses $GLOBALS['error_showdatabases']
* @uses $GLOBALS['errno']
* @param string $like_db_name usally a db_name containing wildcards
*/
protected function _retrieve($like_db_name = null)
@ -160,11 +143,6 @@ require_once './libraries/List.class.php';
/**
* builds up the list
*
* @uses PMA_List_Database::$items to initialize it
* @uses PMA_List_Database::_checkOnlyDatabase()
* @uses PMA_List_Database::_retrieve()
* @uses PMA_List_Database::_checkHideDatabase()
* @uses exchangeArray()
*/
public function build()
{
@ -179,17 +157,6 @@ require_once './libraries/List.class.php';
/**
* checks the only_db configuration
*
* @uses PMA_List_Database::$_show_databases_disabled
* @uses PMA_List_Database::$items
* @uses PMA_List_Database::_retrieve()
* @uses PMA_unescape_mysql_wildcards()
* @uses preg_match()
* @uses array_diff()
* @uses array_merge()
* @uses is_array()
* @uses strlen()
* @uses is_string()
* @uses $cfg['Server']['only_db']
* @return boolean false if there is no only_db, otherwise true
*/
protected function _checkOnlyDatabase()
@ -240,9 +207,6 @@ require_once './libraries/List.class.php';
/**
* returns default item
*
* @uses PMA_List::getEmpty()
* @uses $GLOBALS['db']
* @uses strlen()
* @return string default item
*/
public function getDefault()
@ -257,18 +221,6 @@ require_once './libraries/List.class.php';
/**
* returns array with dbs grouped with extended infos
*
* @uses $GLOBALS['PMA_List_Database']
* @uses $GLOBALS['cfgRelation']['commwork']
* @uses $cfg['ShowTooltip']
* @uses $cfg['LeftFrameDBTree']
* @uses $cfg['LeftFrameDBSeparator']
* @uses $cfg['ShowTooltipAliasDB']
* @uses PMA_getTableCount()
* @uses PMA_getDbComment()
* @uses is_array()
* @uses implode()
* @uses strstr()
* @uses explode()
* @param integer $offset
* @param integer $count
* @return array db list
@ -347,7 +299,6 @@ require_once './libraries/List.class.php';
/**
* returns a part of the items
*
* @uses array_slice()
* @param integer $offset
* @param integer $count
* @return array some items
@ -472,7 +423,7 @@ require_once './libraries/List.class.php';
SELECT DISTINCT `Db` FROM `mysql`.`db`
WHERE `Select_priv` = 'Y'
AND `User`
IN ('" . PMA_sqlAddslashes($GLOBALS['cfg']['Server']['user']) . "', '')";
IN ('" . PMA_sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . "', '')";
$tmp_mydbs = PMA_DBI_fetch_result($local_query, null, null,
$GLOBALS['controllink']);
if ($tmp_mydbs) {
@ -520,7 +471,7 @@ require_once './libraries/List.class.php';
} // end if
// 2. get allowed dbs from the "mysql.tables_priv" table
$local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddslashes($GLOBALS['cfg']['Server']['user']) . '\'';
$local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . '\'';
$rs = PMA_DBI_try_query($local_query, $GLOBALS['controllink']);
if ($rs && @PMA_DBI_num_rows($rs)) {
while ($row = PMA_DBI_fetch_assoc($rs)) {

87
libraries/Message.class.php
View File

@ -137,13 +137,6 @@ class PMA_Message
/**
* Constructor
*
* @uses PMA_Message::setNumber()
* @uses PMA_Message::setString()
* @uses PMA_Message::setParams()
* @uses PMA_Message::NOTICE
* @uses PMA_Message::SANITIZE_NONE
* @uses PMA_Message::SANITIZE_STRING
* @uses PMA_Message::SANITIZE_PARAMS
* @param string $string
* @param integer $number
* @param array $params
@ -160,7 +153,6 @@ class PMA_Message
/**
* magic method: return string representation for this object
*
* @uses PMA_Message::getMessage()
* @return string
*/
public function __toString()
@ -174,8 +166,6 @@ class PMA_Message
* shorthand for getting a simple success message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::SUCCESS
* @param string $string a localized string e.g. __('Your SQL query has been executed successfully')
* @return PMA_Message
*/
@ -194,8 +184,6 @@ class PMA_Message
* shorthand for getting a simple error message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::ERROR
* @param string $string a localized string e.g. __('Error')
* @return PMA_Message
*/
@ -214,8 +202,6 @@ class PMA_Message
* shorthand for getting a simple notice message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::NOTICE
* @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
*/
@ -230,8 +216,6 @@ class PMA_Message
* shorthand for getting a customized message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::setMessage()
* @param string $message
* @param integer $type
* @return PMA_Message
@ -249,9 +233,6 @@ class PMA_Message
* shorthand for getting a customized message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::success()
* @uses PMA_Message::addParam()
* @param integer $rows Number of rows
* @return PMA_Message
*/
@ -268,9 +249,6 @@ class PMA_Message
* shorthand for getting a customized message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::success()
* @uses PMA_Message::addParam()
* @param integer $rows Number of rows
* @return PMA_Message
*/
@ -287,9 +265,6 @@ class PMA_Message
* shorthand for getting a customized message
*
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::success()
* @uses PMA_Message::addParam()
* @param integer $rows Number of rows
* @return PMA_Message
*/
@ -306,8 +281,6 @@ class PMA_Message
* shorthand for getting a customized error message
*
* @static
* @uses PMA_Message::raw()
* @uses PMA_Message::ERROR
* @param string $message
* @return PMA_Message
*/
@ -322,8 +295,6 @@ class PMA_Message
* shorthand for getting a customized notice message
*
* @static
* @uses PMA_Message::raw()
* @uses PMA_Message::NOTICE
* @param string $message
* @return PMA_Message
*/
@ -338,8 +309,6 @@ class PMA_Message
* shorthand for getting a customized success message
*
* @static
* @uses PMA_Message::raw()
* @uses PMA_Message::SUCCESS
* @param string $message
* @return PMA_Message
*/
@ -352,9 +321,6 @@ class PMA_Message
* returns whether this message is a success message or not
* and optionaly makes this message a success message
*
* @uses PMA_Message::SUCCESS
* @uses PMA_Message::setNumber()
* @uses PMA_Message::getNumber()
* @param boolean $set
* @return boolean whether this is a success message or not
*/
@ -371,9 +337,6 @@ class PMA_Message
* returns whether this message is a notice message or not
* and optionally makes this message a notice message
*
* @uses PMA_Message::NOTICE
* @uses PMA_Message::setNumber()
* @uses PMA_Message::getNumber()
* @param boolean $set
* @return boolean whether this is a notice message or not
*/
@ -390,9 +353,6 @@ class PMA_Message
* returns whether this message is an error message or not
* and optionally makes this message an error message
*
* @uses PMA_Message::ERROR
* @uses PMA_Message::setNumber()
* @uses PMA_Message::getNumber()
* @param boolean $set
* @return boolean whether this is an error message or not
*/
@ -408,8 +368,6 @@ class PMA_Message
/**
* set raw message (overrides string)
*
* @uses PMA_Message::$_message to set it
* @uses PMA_Message::sanitize()
* @param string $message
* @param boolean $sanitize whether to sanitize $message or not
*/
@ -424,8 +382,6 @@ class PMA_Message
/**
* set string (does not take effect if raw message is set)
*
* @uses PMA_Message::$_string to set it
* @uses PMA_Message::sanitize()
* @param string $_string
* @param boolean $sanitize whether to sanitize $string or not
*/
@ -440,7 +396,6 @@ class PMA_Message
/**
* set message type number
*
* @uses PMA_Message::$_number to set it
* @param integer $number
*/
public function setNumber($number)
@ -458,9 +413,6 @@ class PMA_Message
* $message->addParam('<img src="img" />', false);
* </code>
*
* @uses htmlspecialchars()
* @uses PMA_Message::$_params to fill
* @uses PMA_Message::notice()
* @param mixed $param
* @param boolean $raw
*/
@ -478,8 +430,6 @@ class PMA_Message
/**
* add another string to be concatenated on displaying
*
* @uses PMA_Message::$_added_messages to fill
* @uses PMA_Message::notice()
* @param string $string to be added
* @param string $separator to use between this and previous string/message
*/
@ -492,7 +442,6 @@ class PMA_Message
/**
* add a bunch of messages at once
*
* @uses PMA_Message::addMessage()
* @param array $messages to be added
* @param string $separator to use between this and previous string/message
*/
@ -506,8 +455,6 @@ class PMA_Message
/**
* add another raw message to be concatenated on displaying
*
* @uses PMA_Message::$_added_messages to fill
* @uses PMA_Message::rawNotice()
* @param mixed $message to be added
* @param string $separator to use between this and previous string/message
*/
@ -527,8 +474,6 @@ class PMA_Message
/**
* set all params at once, usually used in conjunction with string
*
* @uses PMA_Message::sanitize()
* @uses PMA_Message::$_params to set
* @param array $params
* @param boolean $sanitize
*/
@ -543,7 +488,6 @@ class PMA_Message
/**
* return all parameters
*
* @uses PMA_Message::$_params as return value
* @return array
*/
public function getParams()
@ -554,7 +498,6 @@ class PMA_Message
/**
* return all added messages
*
* @uses PMA_Message::$_added_messages as return value
* @return array
*/
public function getAddedMessages()
@ -566,9 +509,6 @@ class PMA_Message
* Sanitizes $message
*
* @static
* @uses is_array()
* @uses htmlspecialchars()
* @uses PMA_Message::sanitize() recursive
* @param mixed $message the message(s)
* @return mixed the sanitized message(s)
* @access public
@ -591,7 +531,6 @@ class PMA_Message
* for formatting
*
* @static
* @uses PMA_sanitize
* @param string $message the message
* @return string the decoded message
* @access public
@ -604,11 +543,6 @@ class PMA_Message
/**
* wrapper for sprintf()
*
* @uses sprintf()
* @uses func_get_args()
* @uses is_array()
* @uses array_unshift()
* @uses call_user_func_array()
* @return string formatted
*/
static public function format()
@ -625,11 +559,6 @@ class PMA_Message
/**
* returns unique PMA_Message::$_hash, if not exists it will be created
*
* @uses PMA_Message::$_hash as return value and to set it if required
* @uses PMA_Message::getNumber()
* @uses PMA_Message::$_string
* @uses PMA_Message::$_message
* @uses md5()
* @return string PMA_Message::$_hash
*/
public function getHash()
@ -648,13 +577,6 @@ class PMA_Message
/**
* returns compiled message
*
* @uses PMA_Message::$_message as return value
* @uses PMA_Message::getString()
* @uses PMA_Message::getParams()
* @uses PMA_Message::format()
* @uses PMA_Message::decodeBB()
* @uses PMA_Message::getAddedMessages()
* @uses strlen()
* @return string complete message
*/
public function getMessage()
@ -688,7 +610,6 @@ class PMA_Message
/**
* returns PMA_Message::$_string
*
* @uses PMA_Message::$_string as return value
* @return string PMA_Message::$_string
*/
public function getString()
@ -699,7 +620,6 @@ class PMA_Message
/**
* returns PMA_Message::$_number
*
* @uses PMA_Message::$_number as return value
* @return integer PMA_Message::$_number
*/
public function getNumber()
@ -710,8 +630,6 @@ class PMA_Message
/**
* returns level of message
*
* @uses PMA_Message::$level
* @uses PMA_Message::getNumber()
* @return string level of message
*/
public function getLevel()
@ -722,8 +640,6 @@ class PMA_Message
/**
* Displays the message in HTML
*
* @uses PMA_Message::getDisplay()
* @uses PMA_Message::isDisplayed()
*/
public function display()
{
@ -734,8 +650,6 @@ class PMA_Message
/**
* returns HTML code for displaying this message
*
* @uses PMA_Message::getLevel()
* @uses PMA_Message::getMessage()
*
* @return string whole message box
*/
@ -748,7 +662,6 @@ class PMA_Message
/**
* sets and returns whether the message was displayed or not
*
* @uses PMA_Message::$_is_displayed to set it and/or return it
* @param boolean $is_displayed
* @return boolean PMA_Message::$_is_displayed
*/

4
libraries/PMA.php
View File

@ -82,10 +82,6 @@ class PMA
/**
* Accessor to PMA::$databases
*
* @uses PMA::$databases
* @uses PMA::$userlink
* @uses PMA::$controllink
* @uses PMA_List_Database
* @return PMA_List_Databases
*/
public function getDatabaseList()

2
libraries/Partition.class.php
View File

@ -17,7 +17,6 @@ class PMA_Partition
* returns array of partition names for a specific db/table
*
* @access public
* @uses PMA_DBI_fetch_result()
* @return array of partition names
*/
static public function getPartitionNames($db, $table)
@ -36,7 +35,6 @@ class PMA_Partition
* @staticvar boolean $have_partitioning
* @staticvar boolean $already_checked
* @access public
* @uses PMA_DBI_fetch_result()
* @return boolean
*/
static public function havePartitioning()

9
libraries/RecentTable.class.php
View File

@ -70,10 +70,6 @@ class PMA_RecentTable
/**
* Returns recently used tables from phpMyAdmin database.
*
* @uses $pma_table
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_fetch_array()
* @uses json_decode()
*
* @return array
*/
@ -95,9 +91,6 @@ class PMA_RecentTable
/**
* Save recent tables into phpMyAdmin database.
*
* @uses PMA_DBI_try_query()
* @uses json_decode()
* @uses PMA_Message
*
* @return true|PMA_Message
*/
@ -106,7 +99,7 @@ class PMA_RecentTable
$username = $GLOBALS['cfg']['Server']['user'];
$sql_query =
" REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" .
" VALUES ('" . $username . "', '" . PMA_sqlAddslashes(json_encode($this->tables)) . "')";
" VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')";
$success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);

39
libraries/StorageEngine.class.php
View File

@ -51,7 +51,6 @@ class PMA_StorageEngine
* @static
* @staticvar array $storage_engines storage engines
* @access public
* @uses PMA_DBI_fetch_result()
* @return array of storage engines
*/
static public function getStorageEngines()
@ -84,9 +83,6 @@ class PMA_StorageEngine
* returns HTML code for storage engine select box
*
* @static
* @uses PMA_StorageEngine::getStorageEngines()
* @uses strtolower()
* @uses htmlspecialchars()
* @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
@ -128,9 +124,6 @@ class PMA_StorageEngine
*
* Loads the corresponding engine plugin, if available.
*
* @uses str_replace()
* @uses file_exists()
* @uses PMA_StorageEngine
* @param string $engine The engine ID
* @return object The engine plugin
*/
@ -152,7 +145,6 @@ class PMA_StorageEngine
* return true if given engine name is supported/valid, otherwise false
*
* @static
* @uses PMA_StorageEngine::getStorageEngines()
* @param string $engine name of engine
* @return boolean whether $engine is valid or not
*/
@ -168,13 +160,6 @@ class PMA_StorageEngine
/**
* returns as HTML table of the engine's server variables
*
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
* @uses PMA_StorageEngine::getVariablesStatus()
* @uses PMA_showHint()
* @uses PMA_formatByteDown()
* @uses PMA_formatNumber()
* @uses htmlspecialchars()
* @return string The table that was generated based on the retrieved information
*/
function getHtmlVariables()
@ -237,12 +222,6 @@ class PMA_StorageEngine
/**
* returns array with detailed info about engine specific server variables
*
* @uses PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
* @uses PMA_StorageEngine::getVariables()
* @uses PMA_StorageEngine::getVariablesLikePattern()
* @uses PMA_DBI_query()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @return array with detailed info about specific engine server variables
*/
function getVariablesStatus()
@ -287,15 +266,6 @@ class PMA_StorageEngine
/**
* Constructor
*
* @uses PMA_StorageEngine::getStorageEngines()
* @uses PMA_ENGINE_SUPPORT_DEFAULT
* @uses PMA_ENGINE_SUPPORT_YES
* @uses PMA_ENGINE_SUPPORT_DISABLED
* @uses PMA_ENGINE_SUPPORT_NO
* @uses $this->engine
* @uses $this->title
* @uses $this->comment
* @uses $this->support
* @param string $engine The engine ID
*/
function __construct($engine)
@ -331,7 +301,6 @@ class PMA_StorageEngine
* public String getTitle()
*
* Reveals the engine's title
* @uses $this->title
* @return string The title
*/
function getTitle()
@ -343,7 +312,6 @@ class PMA_StorageEngine
* public String getComment()
*
* Fetches the server's comment about this engine
* @uses $this->comment
* @return string The comment
*/
function getComment()
@ -354,13 +322,6 @@ class PMA_StorageEngine
/**
* public String getSupportInformationMessage()
*
* @uses PMA_ENGINE_SUPPORT_DEFAULT
* @uses PMA_ENGINE_SUPPORT_YES
* @uses PMA_ENGINE_SUPPORT_DISABLED
* @uses PMA_ENGINE_SUPPORT_NO
* @uses $this->support
* @uses $this->title
* @uses sprintf
* @return string The localized message.
*/
function getSupportInformationMessage()

150
libraries/Table.class.php
View File

@ -92,7 +92,6 @@ class PMA_Table
/**
* sets table name
*
* @uses $this->name to set it
* @param string $table_name new table name
*/
function setName($table_name)
@ -103,7 +102,6 @@ class PMA_Table
/**
* returns table name
*
* @uses $this->name as return value
* @param boolean whether to quote name with backticks ``
* @return string table name
*/
@ -118,7 +116,6 @@ class PMA_Table
/**
* sets database name for this table
*
* @uses $this->db_name to set it
* @param string $db_name
*/
function setDbName($db_name)
@ -129,7 +126,6 @@ class PMA_Table
/**
* returns database name for this table
*
* @uses $this->db_name as return value
* @param boolean whether to quote name with backticks ``
* @return string database name for this table
*/
@ -167,7 +163,6 @@ class PMA_Table
/**
* sets given $value for given $param
*
* @uses $this->settings to add or change value
* @param string param name
* @param mixed param value
*/
@ -179,7 +174,6 @@ class PMA_Table
/**
* returns value for given setting/param
*
* @uses $this->settings to return value
* @param string name for value to return
* @return mixed value for $param
*/
@ -385,7 +379,7 @@ class PMA_Table
} elseif ($type == 'BIT') {
$query .= ' DEFAULT b\'' . preg_replace('/[^01]/', '0', $default_value) . '\'';
} else {
$query .= ' DEFAULT \'' . PMA_sqlAddslashes($default_value) . '\'';
$query .= ' DEFAULT \'' . PMA_sqlAddSlashes($default_value) . '\'';
}
break;
case 'NULL' :
@ -428,7 +422,7 @@ class PMA_Table
} // end if (auto_increment)
}
if (!empty($comment)) {
$query .= " COMMENT '" . PMA_sqlAddslashes($comment) . "'";
$query .= " COMMENT '" . PMA_sqlAddSlashes($comment) . "'";
}
return $query;
} // end function
@ -558,14 +552,14 @@ class PMA_Table
$where_parts = array();
foreach ($where_fields as $_where => $_value) {
$where_parts[] = PMA_backquote($_where) . ' = \''
. PMA_sqlAddslashes($_value) . '\'';
. PMA_sqlAddSlashes($_value) . '\'';
}
$new_parts = array();
$new_value_parts = array();
foreach ($new_fields as $_where => $_value) {
$new_parts[] = PMA_backquote($_where);
$new_value_parts[] = PMA_sqlAddslashes($_value);
$new_value_parts[] = PMA_sqlAddSlashes($_value);
}
$table_copy_query = '
@ -583,7 +577,7 @@ class PMA_Table
$value_parts = array();
foreach ($table_copy_row as $_key => $_val) {
if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') {
$value_parts[] = PMA_sqlAddslashes($_val);
$value_parts[] = PMA_sqlAddSlashes($_val);
}
}
@ -818,10 +812,10 @@ class PMA_Table
// Move old entries from PMA-DBs to new table
if ($GLOBALS['cfgRelation']['commwork']) {
$remove_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info'])
. ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\', '
. ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\', '
. ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($remove_query);
unset($remove_query);
}
@ -831,28 +825,28 @@ class PMA_Table
if ($GLOBALS['cfgRelation']['displaywork']) {
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_info'])
. ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\', '
. ' table_name = \'' . PMA_sqlAddslashes($target_table) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET db_name = \'' . PMA_sqlAddSlashes($target_db) . '\', '
. ' table_name = \'' . PMA_sqlAddSlashes($target_table) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
if ($GLOBALS['cfgRelation']['relwork']) {
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation'])
. ' SET foreign_table = \'' . PMA_sqlAddslashes($target_table) . '\','
. ' foreign_db = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE foreign_db = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET foreign_table = \'' . PMA_sqlAddSlashes($target_table) . '\','
. ' foreign_db = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation'])
. ' SET master_table = \'' . PMA_sqlAddslashes($target_table) . '\','
. ' master_db = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE master_db = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET master_table = \'' . PMA_sqlAddSlashes($target_table) . '\','
. ' master_db = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE master_db = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND master_table = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -866,24 +860,24 @@ class PMA_Table
if ($GLOBALS['cfgRelation']['pdfwork']) {
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_coords'])
. ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\','
. ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\','
. ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
/*
$pdf_query = 'SELECT pdf_page_number '
. ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($target_table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($target_table) . '\'';
$pdf_rs = PMA_query_as_controluser($pdf_query);
while ($pdf_copy_row = PMA_DBI_fetch_assoc($pdf_rs)) {
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['pdf_pages'])
. ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND page_nr = \'' . PMA_sqlAddslashes($pdf_copy_row['pdf_page_number']) . '\'';
. ' SET db_name = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND page_nr = \'' . PMA_sqlAddSlashes($pdf_copy_row['pdf_page_number']) . '\'';
$tb_rs = PMA_query_as_controluser($table_query);
unset($table_query);
unset($tb_rs);
@ -893,10 +887,10 @@ class PMA_Table
if ($GLOBALS['cfgRelation']['designerwork']) {
$table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords'])
. ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\','
. ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\'';
. ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\','
. ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -913,8 +907,8 @@ class PMA_Table
column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . '
FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . '
WHERE
db_name = \'' . PMA_sqlAddslashes($source_db) . '\' AND
table_name = \'' . PMA_sqlAddslashes($source_table) . '\'';
db_name = \'' . PMA_sqlAddSlashes($source_db) . '\' AND
table_name = \'' . PMA_sqlAddSlashes($source_table) . '\'';
$comments_copy_rs = PMA_query_as_controluser($comments_copy_query);
// Write every comment as new copied entry. [MIME]
@ -922,13 +916,13 @@ class PMA_Table
$new_comment_query = 'REPLACE INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info'])
. ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') '
. ' VALUES('
. '\'' . PMA_sqlAddslashes($target_db) . '\','
. '\'' . PMA_sqlAddslashes($target_table) . '\','
. '\'' . PMA_sqlAddslashes($comments_copy_row['column_name']) . '\''
. ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . PMA_sqlAddslashes($comments_copy_row['comment']) . '\','
. '\'' . PMA_sqlAddslashes($comments_copy_row['mimetype']) . '\','
. '\'' . PMA_sqlAddslashes($comments_copy_row['transformation']) . '\','
. '\'' . PMA_sqlAddslashes($comments_copy_row['transformation_options']) . '\'' : '')
. '\'' . PMA_sqlAddSlashes($target_db) . '\','
. '\'' . PMA_sqlAddSlashes($target_table) . '\','
. '\'' . PMA_sqlAddSlashes($comments_copy_row['column_name']) . '\''
. ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . PMA_sqlAddSlashes($comments_copy_row['comment']) . '\','
. '\'' . PMA_sqlAddSlashes($comments_copy_row['mimetype']) . '\','
. '\'' . PMA_sqlAddSlashes($comments_copy_row['transformation']) . '\','
. '\'' . PMA_sqlAddSlashes($comments_copy_row['transformation_options']) . '\'' : '')
. ')';
PMA_query_as_controluser($new_comment_query);
} // end while
@ -1078,10 +1072,10 @@ class PMA_Table
$remove_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['column_info']) . '
SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($remove_query);
unset($remove_query);
}
@ -1090,10 +1084,10 @@ class PMA_Table
$table_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['table_info']) . '
SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -1102,19 +1096,19 @@ class PMA_Table
$table_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['relation']) . '
SET `foreign_db` = \'' . PMA_sqlAddslashes($new_db) . '\',
`foreign_table` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `foreign_db` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `foreign_table` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `foreign_db` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`foreign_table` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `foreign_db` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `foreign_table` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($table_query);
$table_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['relation']) . '
SET `master_db` = \'' . PMA_sqlAddslashes($new_db) . '\',
`master_table` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `master_db` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `master_table` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `master_db` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`master_table` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `master_db` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `master_table` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -1123,10 +1117,10 @@ class PMA_Table
$table_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['table_coords']) . '
SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -1135,10 +1129,10 @@ class PMA_Table
$table_query = '
UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . '
SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddslashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\'';
SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\',
`table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\'';
PMA_query_as_controluser($table_query);
unset($table_query);
}
@ -1227,9 +1221,6 @@ class PMA_Table
/**
* Return UI preferences for this table from phpMyAdmin database.
*
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_fetch_array()
* @uses json_decode()
*
* @return array
*/
@ -1256,9 +1247,6 @@ class PMA_Table
/**
* Save this table's UI preferences into phpMyAdmin database.
*
* @uses PMA_DBI_try_query()
* @uses json_decode()
* @uses PMA_Message
*
* @return true|PMA_Message
*/
@ -1271,7 +1259,7 @@ class PMA_Table
$sql_query =
" REPLACE INTO " . $pma_table .
" VALUES ('" . $username . "', '" . $this->db_name . "', '" .
$this->name . "', '" . PMA_sqlAddslashes(json_encode($this->uiprefs)) . "')";
$this->name . "', '" . PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "')";
$success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);
@ -1289,7 +1277,6 @@ class PMA_Table
* If pmadb and table_uiprefs is set, it will load the UI preferences from
* phpMyAdmin database.
*
* @uses getUiPrefsFromDb()
*/
protected function loadUiPrefs()
{
@ -1312,7 +1299,6 @@ class PMA_Table
* - PROP_SORTED_COLUMN
* - PROP_COLUMN_ORDER
*
* @uses loadUiPrefs()
*
* @param string $property
* @return mixed

44
libraries/Theme.class.php
View File

@ -69,13 +69,6 @@ class PMA_Theme {
/**
* @access public
* @uses PMA_Theme::getPath()
* @uses PMA_Theme::$mtime_info
* @uses PMA_Theme::setVersion()
* @uses PMA_Theme::setName()
* @uses filemtime()
* @uses filesize()
* @uses file_exists()
* @return boolean whether loading them info was successful or not
*/
function loadInfo()
@ -114,10 +107,6 @@ class PMA_Theme {
*
* @static
* @access public
* @uses PMA_Theme
* @uses PMA_Theme::setPath()
* @uses PMA_Theme::loadInfo()
* @uses PMA_Theme::checkImgPath()
* @param string $folder path to theme
* @return object PMA_Theme
*/
@ -140,12 +129,6 @@ class PMA_Theme {
* checks image path for existance - if not found use img from original theme
*
* @access public
* @uses PMA_Theme::getPath()
* @uses PMA_Theme::setImgPath()
* @uses PMA_Theme::getName()
* @uses $GLOBALS['cfg']['ThemePath']
* @uses is_dir()
* @uses sprintf()
*/
function checkImgPath()
{
@ -167,7 +150,6 @@ class PMA_Theme {
* returns path to theme
*
* @access public
* @uses PMA_Theme::$path as return value
* @return string $path path to theme
*/
function getPath()
@ -179,7 +161,6 @@ class PMA_Theme {
* returns layout file
*
* @access public
* @uses PMA_Theme::getPath()
* @return string layout file
*/
function getLayoutFile()
@ -191,7 +172,6 @@ class PMA_Theme {
* set path to theme
*
* @access public
* @uses PMA_Theme::$path to set it
* @param string $path path to theme
*/
function setPath($path)
@ -203,7 +183,6 @@ class PMA_Theme {
* sets version
*
* @access public
* @uses PMA_Theme::$version
* @param string new version
*/
function setVersion($version)
@ -215,7 +194,6 @@ class PMA_Theme {
* returns version
*
* @access public
* @uses PMA_Theme::$version
* @return string version
*/
function getVersion()
@ -228,8 +206,6 @@ class PMA_Theme {
* returns true if theme version is equal or higher to $version
*
* @access public
* @uses version_compare()
* @uses PMA_Theme::getVersion()
* @param string $version version to compare to
* @return boolean
*/
@ -242,8 +218,6 @@ class PMA_Theme {
* sets name
*
* @access public
* @uses PMA_Theme::$name to set it
* @uses trim()
* @param string $name new name
*/
function setName($name)
@ -255,7 +229,6 @@ class PMA_Theme {
* returns name
*
* @access public
* @uses PMA_Theme::$name as return value
* @return string name
*/
function getName()
@ -267,7 +240,6 @@ class PMA_Theme {
* sets id
*
* @access public
* @uses PMA_Theme::$id to set it
* @param string $id new id
*/
function setId($id)
@ -279,7 +251,6 @@ class PMA_Theme {
* returns id
*
* @access public
* @uses PMA_Theme::$id as return value
* @return string id
*/
function getId()
@ -289,7 +260,6 @@ class PMA_Theme {
/**
* @access public
* @uses PMA_Theme::$img_path to set it
* @param string path to images for this theme
*/
function setImgPath($path)
@ -299,7 +269,6 @@ class PMA_Theme {
/**
* @access public
* @uses PMA_Theme::$img_path as retunr value
* @return string image path for this theme
*/
function getImgPath()
@ -311,11 +280,6 @@ class PMA_Theme {
* load css (send to stdout, normally the browser)
*
* @access public
* @uses PMA_Theme::getPath()
* @uses PMA_Theme::$types
* @uses PMA_SQP_buildCssData()
* @uses file_exists()
* @uses in_array()
* @param string $type left, right or print
*/
function loadCss(&$type)
@ -351,14 +315,6 @@ class PMA_Theme {
* prints out the preview for this theme
*
* @access public
* @uses PMA_Theme::getName()
* @uses PMA_Theme::getVersion()
* @uses PMA_Theme::getId()
* @uses PMA_Theme::getPath()
* @uses PMA_generate_common_url()
* @uses addslashes()
* @uses file_exists()
* @uses htmlspecialchars()
*/
function printPreview()
{

7
libraries/Theme_Manager.class.php
View File

@ -187,11 +187,6 @@ class PMA_Theme_Manager
/**
* save theme in cookie
*
* @uses $GLOBALS['PMA_Config']->setCookie();
* @uses PMA_Theme_Manager::getThemeCookieName()
* @uses PMA_Theme_Manager::$theme
* @uses PMA_Theme_Manager::$theme_default
* @uses PMA_Theme::getId()
*/
function setThemeCookie()
{
@ -331,8 +326,6 @@ class PMA_Theme_Manager
/**
* prints out preview for every theme
*
* @uses $this->themes
* @uses PMA_Theme::printPreview()
*/
function printPreviews()
{

76
libraries/Tracker.class.php
View File

@ -219,8 +219,8 @@ class PMA_Tracker
$sql_query =
" SELECT tracking_active FROM " . self::$pma_table .
" WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddslashes($dbname) . "' " .
" AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddslashes($tablename) . "' " .
" WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($dbname) . "' " .
" AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($tablename) . "' " .
" ORDER BY version DESC";
$row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query));
@ -330,15 +330,15 @@ class PMA_Tracker
"tracking " .
") " .
"values (
'" . PMA_sqlAddslashes($dbname) . "',
'" . PMA_sqlAddslashes($tablename) . "',
'" . PMA_sqlAddslashes($version) . "',
'" . PMA_sqlAddslashes($date) . "',
'" . PMA_sqlAddslashes($date) . "',
'" . PMA_sqlAddslashes($snapshot) . "',
'" . PMA_sqlAddslashes($create_sql) . "',
'" . PMA_sqlAddslashes("\n") . "',
'" . PMA_sqlAddslashes($tracking_set) . "' )";
'" . PMA_sqlAddSlashes($dbname) . "',
'" . PMA_sqlAddSlashes($tablename) . "',
'" . PMA_sqlAddSlashes($version) . "',
'" . PMA_sqlAddSlashes($date) . "',
'" . PMA_sqlAddSlashes($date) . "',
'" . PMA_sqlAddSlashes($snapshot) . "',
'" . PMA_sqlAddSlashes($create_sql) . "',
'" . PMA_sqlAddSlashes("\n") . "',
'" . PMA_sqlAddSlashes($tracking_set) . "' )";
$result = PMA_query_as_controluser($sql_query);
@ -365,7 +365,7 @@ class PMA_Tracker
{
$sql_query =
"/*NOTRACK*/\n" .
"DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "'";
"DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "'";
$result = PMA_query_as_controluser($sql_query);
return $result;
@ -420,15 +420,15 @@ class PMA_Tracker
"tracking " .
") " .
"values (
'" . PMA_sqlAddslashes($dbname) . "',
'" . PMA_sqlAddslashes('') . "',
'" . PMA_sqlAddslashes($version) . "',
'" . PMA_sqlAddslashes($date) . "',
'" . PMA_sqlAddslashes($date) . "',
'" . PMA_sqlAddslashes('') . "',
'" . PMA_sqlAddslashes($create_sql) . "',
'" . PMA_sqlAddslashes("\n") . "',
'" . PMA_sqlAddslashes($tracking_set) . "' )";
'" . PMA_sqlAddSlashes($dbname) . "',
'" . PMA_sqlAddSlashes('') . "',
'" . PMA_sqlAddSlashes($version) . "',
'" . PMA_sqlAddSlashes($date) . "',
'" . PMA_sqlAddSlashes($date) . "',
'" . PMA_sqlAddSlashes('') . "',
'" . PMA_sqlAddSlashes($create_sql) . "',
'" . PMA_sqlAddSlashes("\n") . "',
'" . PMA_sqlAddSlashes($tracking_set) . "' )";
$result = PMA_query_as_controluser($sql_query);
@ -454,9 +454,9 @@ class PMA_Tracker
$sql_query =
" UPDATE " . self::$pma_table .
" SET `tracking_active` = '" . $new_state . "' " .
" WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " .
" AND `version` = '" . PMA_sqlAddslashes($version) . "' ";
" WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " .
" AND `version` = '" . PMA_sqlAddSlashes($version) . "' ";
$result = PMA_query_as_controluser($sql_query);
@ -490,7 +490,7 @@ class PMA_Tracker
$new_data_processed = '';
if (is_array($new_data)) {
foreach ($new_data as $data) {
$new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddslashes($data['statement']) . "\n";
$new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddSlashes($data['statement']) . "\n";
}
} else {
$new_data_processed = $new_data;
@ -499,9 +499,9 @@ class PMA_Tracker
$sql_query =
" UPDATE " . self::$pma_table .
" SET `" . $save_to . "` = '" . $new_data_processed . "' " .
" WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " .
" AND `version` = '" . PMA_sqlAddslashes($version) . "' ";
" WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " .
" AND `version` = '" . PMA_sqlAddSlashes($version) . "' ";
$result = PMA_query_as_controluser($sql_query);
@ -558,8 +558,8 @@ class PMA_Tracker
{
$sql_query =
" SELECT MAX(version) FROM " . self::$pma_table .
" WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' ";
" WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' ";
if ($statement != "") {
$sql_query .= " AND FIND_IN_SET('" . $statement . "',tracking) > 0" ;
@ -592,11 +592,11 @@ class PMA_Tracker
self::init();
}
$sql_query = " SELECT * FROM " . self::$pma_table .
" WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' ";
" WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' ";
if (! empty($tablename)) {
$sql_query .= " AND `table_name` = '" . PMA_sqlAddslashes($tablename) ."' ";
$sql_query .= " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) ."' ";
}
$sql_query .= " AND `version` = '" . PMA_sqlAddslashes($version) ."' ".
$sql_query .= " AND `version` = '" . PMA_sqlAddSlashes($version) ."' ".
" ORDER BY `version` DESC ";
$mixed = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query));
@ -958,12 +958,12 @@ class PMA_Tracker
$sql_query =
" /*NOTRACK*/\n" .
" UPDATE " . self::$pma_table .
" SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" . PMA_sqlAddslashes($query) . "') ," .
" SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" . PMA_sqlAddSlashes($query) . "') ," .
" `date_updated` = '" . $date . "' ";
// If table was renamed we have to change the tablename attribute in pma_tracking too
if ($result['identifier'] == 'RENAME TABLE') {
$sql_query .= ', `table_name` = \'' . PMA_sqlAddslashes($result['tablename_after_rename']) . '\' ';
$sql_query .= ', `table_name` = \'' . PMA_sqlAddSlashes($result['tablename_after_rename']) . '\' ';
}
// Save the tracking information only for
@ -973,9 +973,9 @@ class PMA_Tracker
// we want to track
$sql_query .=
" WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" .
" AND `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddslashes($result['tablename']) . "' " .
" AND `version` = '" . PMA_sqlAddslashes($version) . "' ";
" AND `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " .
" AND `table_name` = '" . PMA_sqlAddSlashes($result['tablename']) . "' " .
" AND `version` = '" . PMA_sqlAddSlashes($version) . "' ";
$result = PMA_query_as_controluser($sql_query);
}

75
libraries/auth/cookie.auth.lib.php
View File

@ -78,8 +78,6 @@ if (function_exists('mcrypt_encrypt')) {
/**
* Returns blowfish secret or generates one if needed.
* @uses $cfg['blowfish_secret']
* @uses $_SESSION['auto_blowfish_secret']
*
* @access public
*/
@ -101,32 +99,6 @@ function PMA_get_blowfish_secret() {
*
* this function MUST exit/quit the application
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['PHP_AUTH_USER']
* @uses $GLOBALS['pma_auth_server']
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['target']
* @uses $GLOBALS['db']
* @uses $GLOBALS['table']
* @uses $GLOBALS['pmaThemeImage']
* @uses $cfg['Servers']
* @uses $cfg['LoginCookieRecall']
* @uses $cfg['Lang']
* @uses $cfg['Server']
* @uses $cfg['ReplaceHelpImg']
* @uses $cfg['blowfish_secret']
* @uses $cfg['AllowArbitraryServer']
* @uses $_COOKIE
* @uses $_REQUEST['old_usr']
* @uses PMA_sendHeaderLocation()
* @uses PMA_select_language()
* @uses PMA_select_server()
* @uses file_exists()
* @uses sprintf()
* @uses count()
* @uses htmlspecialchars()
* @uses is_array()
* @global string the last connection error
*
* @access public
@ -337,25 +309,6 @@ if (top != self) {
* @todo AllowArbitraryServer on does not imply that the user wants an
* arbitrary server, or? so we should also check if this is filled and
* not only if allowed
* @uses $GLOBALS['PHP_AUTH_USER']
* @uses $GLOBALS['PHP_AUTH_PW']
* @uses $GLOBALS['no_activity']
* @uses $GLOBALS['server']
* @uses $GLOBALS['from_cookie']
* @uses $GLOBALS['pma_auth_server']
* @uses $cfg['AllowArbitraryServer']
* @uses $cfg['LoginCookieValidity']
* @uses $cfg['Servers']
* @uses $_REQUEST['old_usr'] from logout link
* @uses $_REQUEST['pma_username'] from login form
* @uses $_REQUEST['pma_password'] from login form
* @uses $_REQUEST['pma_servername'] from login form
* @uses $_COOKIE
* @uses $_SESSION['last_access_time']
* @uses $GLOBALS['PMA_Config']->removeCookie()
* @uses PMA_blowfish_decrypt()
* @uses PMA_auth_fails()
* @uses time()
*
* @return boolean whether we get authentication settings or not
*
@ -480,23 +433,6 @@ function PMA_auth_check()
/**
* Set the user and password after last checkings if required
*
* @uses $GLOBALS['PHP_AUTH_USER']
* @uses $GLOBALS['PHP_AUTH_PW']
* @uses $GLOBALS['server']
* @uses $GLOBALS['from_cookie']
* @uses $GLOBALS['pma_auth_server']
* @uses $cfg['Server']
* @uses $cfg['AllowArbitraryServer']
* @uses $cfg['LoginCookieStore']
* @uses $cfg['PmaAbsoluteUri']
* @uses $_SESSION['last_access_time']
* @uses PMA_COMING_FROM_COOKIE_LOGIN
* @uses $GLOBALS['PMA_Config']->setCookie()
* @uses PMA_blowfish_encrypt()
* @uses $GLOBALS['PMA_Config']->removeCookie()
* @uses PMA_sendHeaderLocation()
* @uses time()
* @uses define()
* @return boolean always true
*
* @access public
@ -615,17 +551,6 @@ function PMA_auth_set_user()
* this function MUST exit/quit the application,
* currently doen by call to PMA_auth()
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['allowDeny_forbidden']
* @uses $GLOBALS['no_activity']
* @uses $cfg['LoginCookieValidity']
* @uses $GLOBALS['PMA_Config']->removeCookie()
* @uses PMA_getenv()
* @uses PMA_DBI_getError()
* @uses PMA_sanitize()
* @uses PMA_auth()
* @uses sprintf()
* @uses basename()
* @access public
*/
function PMA_auth_fails()

21
libraries/blobstreaming.lib.php
View File

@ -44,16 +44,14 @@ function initPBMSDatabase()
* checks whether the necessary plugins for BLOBStreaming exist
*
* @access public
* @uses PMA_Config::get()
* @uses PMA_Config::settings()
* @uses PMA_Config::set()
* @uses PMA_BS_GetVariables()
* @uses PMA_cacheSet()
* @uses PMA_cacheGet()
* @return boolean
*/
function checkBLOBStreamingPlugins()
{
if (PMA_cacheGet('skip_blobstreaming', true) === true) {
return false;
}
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
@ -224,9 +222,6 @@ function checkBLOBStreamingPlugins()
* returns a list of BLOBStreaming variables used by MySQL
*
* @access public
* @uses PMA_Config::get()
* @uses PMA_DBI_query()
* @uses PMA_DBI_fetch_assoc()
* @return array - list of BLOBStreaming variables
*/
function PMA_BS_GetVariables()
@ -411,7 +406,7 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)
// This information should be cached rather than selecting it each time.
//$query = "SELECT count(*) FROM information_schema.TABLES T, pbms.pbms_enabled E where T.table_schema = ". PMA_backquote($db_name) . " and T.table_name = ". PMA_backquote($tbl_name) . " and T.engine = E.name";
$query = "SELECT count(*) FROM pbms.pbms_enabled E where E.name = '" . PMA_sqlAddslashes($tbl_type) . "'";
$query = "SELECT count(*) FROM pbms.pbms_enabled E where E.name = '" . PMA_sqlAddSlashes($tbl_type) . "'";
$result = PMA_DBI_query($query);
$data = PMA_DBI_fetch_row($result);
@ -463,7 +458,7 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType)
// This is a really ugly way to do this but currently there is nothing better.
// In a future version of PBMS the system tables will be redesigned to make this
// more efficient.
$query = "SELECT Repository_id, Repo_blob_offset FROM pbms_reference WHERE Blob_url='" . PMA_sqlAddslashes($blobReference) . "'";
$query = "SELECT Repository_id, Repo_blob_offset FROM pbms_reference WHERE Blob_url='" . PMA_sqlAddSlashes($blobReference) . "'";
//error_log(" PMA_BS_SetContentType: $query\n", 3, "/tmp/mylog");
$result = PMA_DBI_query($query);
//error_log(" $query\n", 3, "/tmp/mylog");
@ -475,9 +470,9 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType)
$result = PMA_DBI_query($query);
if (PMA_DBI_num_rows($result) == 0) {
$query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddslashes($contentType) . "')";
$query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddSlashes($contentType) . "')";
} else {
$query = "UPDATE pbms_metadata SET name = 'Content_type', Value = '" . PMA_sqlAddslashes($contentType) . "' $where";
$query = "UPDATE pbms_metadata SET name = 'Content_type', Value = '" . PMA_sqlAddSlashes($contentType) . "' $where";
}
//error_log("$query\n", 3, "/tmp/mylog");
PMA_DBI_query($query);

36
libraries/bookmark.lib.php
View File

@ -9,11 +9,6 @@
/**
* Defines the bookmark parameters for the current user
*
* @uses $GLOBALS['server']
* @uses PMA_getRelationsParam()
* @uses $GLOBALS['cfg']['Server']['user']
* @uses $GLOBALS['cfg']['Server']['pmadb']
* @uses $GLOBALS['cfg']['Server']['bookmarktable']
* @return array the bookmark parameters for the current user
* @access public
*/
@ -44,11 +39,6 @@ function PMA_Bookmark_getParams()
/**
* Gets the list of bookmarks defined for the current database
*
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result()
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_Bookmark_getParams()
* @global resource the controluser db connection handle
*
* @param string the current database name
@ -68,13 +58,13 @@ function PMA_Bookmark_getList($db)
}
$query = 'SELECT label, id FROM '. PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
. ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\''
. ' ORDER BY label';
$per_user = PMA_DBI_fetch_result($query, 'id', 'label', $controllink, PMA_DBI_QUERY_STORE);
$query = 'SELECT label, id FROM '. PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
. ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND user = \'\''
. ' ORDER BY label';
$global = PMA_DBI_fetch_result($query, 'id', 'label', $controllink, PMA_DBI_QUERY_STORE);
@ -94,10 +84,6 @@ function PMA_Bookmark_getList($db)
/**
* Gets the sql command from a bookmark
*
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_value()
* @uses PMA_Bookmark_getParams()
* @global resource the controluser db connection handle
*
* @param string the current database name
@ -121,10 +107,10 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal
}
$query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\'';
if (!$action_bookmark_all) {
$query .= ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'';
$query .= ' AND (user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\'';
if (!$exact_user_match) {
$query .= ' OR user = \'\'';
}
@ -139,10 +125,6 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal
/**
* Adds a bookmark
*
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_query()
* @uses PMA_Bookmark_getParams()
* @global resource the controluser db connection handle
*
* @param array the properties of the bookmark to add; here,
@ -164,7 +146,7 @@ function PMA_Bookmark_save($fields, $all_users = false)
}
$query = 'INSERT INTO ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' (id, dbase, user, query, label) VALUES (NULL, \'' . PMA_sqlAddslashes($fields['dbase']) . '\', \'' . ($all_users ? '' : PMA_sqlAddslashes($fields['user'])) . '\', \'' . PMA_sqlAddslashes(urldecode($fields['query'])) . '\', \'' . PMA_sqlAddslashes($fields['label']) . '\')';
. ' (id, dbase, user, query, label) VALUES (NULL, \'' . PMA_sqlAddSlashes($fields['dbase']) . '\', \'' . ($all_users ? '' : PMA_sqlAddSlashes($fields['user'])) . '\', \'' . PMA_sqlAddSlashes(urldecode($fields['query'])) . '\', \'' . PMA_sqlAddSlashes($fields['label']) . '\')';
return PMA_DBI_query($query, $controllink);
} // end of the 'PMA_Bookmark_save()' function
@ -172,10 +154,6 @@ function PMA_Bookmark_save($fields, $all_users = false)
/**
* Deletes a bookmark
*
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_try_query()
* @uses PMA_Bookmark_getParams()
* @global resource the controluser db connection handle
*
* @param string the current database name
@ -194,7 +172,7 @@ function PMA_Bookmark_delete($db, $id)
}
$query = 'DELETE FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
. ' WHERE (user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\''
. ' OR user = \'\')'
. ' AND id = ' . $id;
return PMA_DBI_try_query($query, $controllink);

21
libraries/check_user_privileges.lib.php
View File

@ -30,27 +30,6 @@ $GLOBALS['is_superuser'] = PMA_isSuperuser();
* displayed. For example, if an anonymous account exists, the named account
* might be able to use its privileges, but SHOW GRANTS will not display them.
*
* @uses $_SESSION['is_create_db_priv'] for caching
* @uses $_SESSION['is_process_priv'] for caching
* @uses $_SESSION['is_reload_priv'] for caching
* @uses $_SESSION['db_to_create'] for caching
* @uses $_SESSION['dbs_where_create_table_allowed'] for caching
* @uses $GLOBALS['is_create_db_priv'] to set it
* @uses $GLOBALS['is_process_priv'] to set it
* @uses $GLOBALS['is_reload_priv'] to set it
* @uses $GLOBALS['db_to_create'] to set it
* @uses $GLOBALS['dbs_where_create_table_allowed'] to set it
* @uses $GLOBALS['server']
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_free_result()
* @uses PMA_DBI_getError()
* @uses PMA_unQuote()
* @uses PMA_backquote()
* @uses preg_match()
* @uses preg_replace()
* @uses substr()
* @uses strpos()
*/
function PMA_analyseShowGrant()
{

133
libraries/common.lib.php
View File

@ -62,8 +62,6 @@ function PMA_pow($base, $exp, $use_function = false)
/**
* string PMA_getIcon(string $icon)
*
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['PropertiesIconic']
* @param string $icon name of icon file
* @param string $alternate alternate text
* @param boolean $container include in container
@ -120,7 +118,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
/**
* Displays the maximum size for an upload
*
* @uses PMA_formatByteDown()
* @param integer $max_upload_size the size
* @return string the message
*
@ -164,7 +161,7 @@ function PMA_displayMaximumUploadSize($max_upload_size)
*
* @access public
*/
function PMA_sqlAddslashes($a_string = '', $is_like = false, $crlf = false, $php_code = false)
function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php_code = false)
{
if ($is_like) {
$a_string = str_replace('\\', '\\\\\\\\', $a_string);
@ -185,7 +182,7 @@ function PMA_sqlAddslashes($a_string = '', $is_like = false, $crlf = false, $php
}
return $a_string;
} // end of the 'PMA_sqlAddslashes()' function
} // end of the 'PMA_sqlAddSlashes()' function
/**
@ -260,9 +257,6 @@ function PMA_unQuote($quoted_string, $quote = null)
* format sql strings
*
* @todo move into PMA_Sql
* @uses PMA_SQP_isError()
* @uses PMA_SQP_formatHtml()
* @uses PMA_SQP_formatNone()
* @param mixed $parsed_sql pre-parsed SQL structure
* @param string $unparsed_sql
* @return string the formatted sql
@ -320,11 +314,6 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
/**
* Displays a link to the official MySQL documentation
*
* @uses $cfg['MySQLManualType']
* @uses $cfg['MySQLManualBase']
* @uses $cfg['ReplaceHelpImg']
* @uses $GLOBALS['pmaThemeImage']
* @uses PMA_MYSQL_INT_VERSION
* @param string $chapter chapter of "HTML, one page per chapter" documentation
* @param string $link contains name of page/anchor that is being linked
* @param bool $big_icon whether to use big icon (like in left frame)
@ -450,7 +439,6 @@ function PMA_showPHPDocu($target) {
/**
* returns HTML for a footnote marker and add the messsage to the footnotes
*
* @uses $GLOBALS['footnotes']
* @param string $message the error message
* @param bool $bbcode
* @param string $type
@ -498,22 +486,6 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
/**
* Displays a MySQL error message in the right frame.
*
* @uses footer.inc.php
* @uses header.inc.php
* @uses $GLOBALS['sql_query']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['PropertiesIconic']
* @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
* @uses PMA_backquote()
* @uses PMA_DBI_getError()
* @uses PMA_formatSql()
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_generate_common_url()
* @uses PMA_showMySQLDocu()
* @uses PMA_sqlAddslashes()
* @uses PMA_SQP_isError()
* @uses PMA_SQP_parse()
* @uses PMA_SQP_getErrorString()
* @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
@ -664,16 +636,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
/**
* returns array with tables of given db with extended information and grouped
*
* @uses $cfg['LeftFrameTableSeparator']
* @uses $cfg['LeftFrameTableLevel']
* @uses $cfg['ShowTooltipAliasTB']
* @uses $cfg['NaturalOrder']
* @uses PMA_backquote()
* @uses count()
* @uses array_merge
* @uses uksort()
* @uses strstr()
* @uses explode()
* @param string $db name of db
* @param string $tables name of tables
* @param integer $limit_offset list offset
@ -805,10 +767,6 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
*
* </code>
*
* @uses PMA_backquote()
* @uses is_array()
* @uses strlen()
* @uses str_replace()
* @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
@ -844,7 +802,6 @@ function PMA_backquote($a_name, $do_it = true)
/**
* Defines the <CR><LF> value depending on the user OS.
*
* @uses PMA_USR_OS
* @return string the <CR><LF> value to use
*
* @access public
@ -870,9 +827,6 @@ function PMA_whichCrlf()
* Reloads navigation if needed.
*
* @param $jsonly prints out pure JavaScript
* @uses $GLOBALS['reload']
* @uses $GLOBALS['db']
* @uses PMA_generate_common_url()
* @global array configuration
*
* @access public
@ -917,7 +871,6 @@ if (!$jsonly)
* @param string $type the type (level) of the message
* @param boolean $is_view is this a message after a VIEW operation?
* @global array the configuration array
* @uses $cfg
* @access public
*/
function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false)
@ -1271,11 +1224,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
/**
* Verifies if current MySQL server supports profiling
*
* @uses $_SESSION['profiling_supported'] for caching
* @uses $GLOBALS['server']
* @uses PMA_DBI_fetch_value()
* @uses PMA_MYSQL_INT_VERSION
* @uses defined()
* @access public
* @return boolean whether profiling is supported
*
@ -1483,7 +1431,6 @@ 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)
* @uses PMA_pow()
* @return integer The numerical part of the expression (for example 8)
*/
function PMA_extractValueFromFormattedSize($formatted_size)
@ -1572,19 +1519,6 @@ 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
*
* @uses $GLOBALS['PMA_PHP_SELF']
* @uses $GLOBALS['active_page']
* @uses $GLOBALS['url_query']
* @uses $cfg['MainPageIconic']
* @uses $GLOBALS['pmaThemeImage']
* @uses PMA_generate_common_url()
* @uses E_USER_NOTICE
* @uses htmlentities()
* @uses urlencode()
* @uses sprintf()
* @uses trigger_error()
* @uses array_merge()
* @uses basename()
* @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
@ -1684,8 +1618,6 @@ function PMA_generate_html_tab($tab, $url_params = array())
/**
* returns html-code for a tab navigation
*
* @uses PMA_generate_html_tab()
* @uses htmlentities()
* @param array $tabs one element per tab
* @param string $url_params
* @return string html-code for tab-navigation
@ -1849,8 +1781,6 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
/**
* Returns a given timespan value in a readable format.
*
* @uses sprintf()
* @uses floor()
* @param int $seconds the timespan
*
* @return string the formatted value
@ -1880,7 +1810,6 @@ 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()
* @uses strlen
* @param string $string The string
* @param string $Separator The Separator (defaults to "<br />\n")
*
@ -1930,9 +1859,6 @@ function PMA_flipstring($string, $Separator = "<br />\n")
*
* @todo localize error message
* @todo use PMA_fatalError() if $die === true?
* @uses PMA_getenv()
* @uses header_meta_style.inc.php
* @uses $GLOBALS['PMA_PHP_SELF']
* @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
@ -1983,14 +1909,6 @@ function PMA_checkParameters($params, $die = true, $request = true)
/**
* Function to generate unique condition for specified row.
*
* @uses $GLOBALS['analyzed_sql'][0]
* @uses PMA_DBI_field_flags()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_printable_bit_value()
* @uses stristr()
* @uses bin2hex()
* @uses preg_replace()
* @param resource $handle current query result
* @param integer $fields_cnt number of fields
* @param array $fields_meta meta information about fields
@ -2083,7 +2001,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
$condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND";
} else {
$condition .= '= \''
. PMA_sqlAddslashes($row[$i], false, true) . '\' AND';
. PMA_sqlAddSlashes($row[$i], false, true) . '\' AND';
}
}
if ($meta->primary_key > 0) {
@ -2114,9 +2032,6 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
/**
* Generate a button or image tag
*
* @uses PMA_USR_BROWSER_AGENT
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['PropertiesIconic']
* @param string $button_name name of button element
* @param string $button_class class of button element
* @param string $image_name name of image element
@ -2257,7 +2172,6 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
* Generate navigation for a list
*
* @todo use $pos from $_url_params
* @uses range()
* @param integer number of elements in the list
* @param integer current position in the list
* @param array url parameters
@ -2345,9 +2259,6 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
* $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/'
*
* </code>
* @uses $cfg['Server']['user']
* @uses substr()
* @uses str_replace()
* @param string $dir with wildcard for user
* @return string per user directory
*/
@ -2364,13 +2275,6 @@ function PMA_userDir($dir)
/**
* returns html code for db link to default db page
*
* @uses $cfg['DefaultTabDatabase']
* @uses $GLOBALS['db']
* @uses PMA_generate_common_url()
* @uses PMA_unescape_mysql_wildcards()
* @uses strlen()
* @uses sprintf()
* @uses htmlspecialchars()
* @param string $database
* @return string html link to default db page
*/
@ -2394,9 +2298,6 @@ function PMA_getDbLink($database = null)
* Displays a lightbulb hint explaining a known external bug
* that affects a functionality
*
* @uses PMA_MYSQL_INT_VERSION
* @uses PMA_showHint()
* @uses sprintf()
* @param string $functionality localized message explaining the func.
* @param string $component 'mysql' (eventually, 'php')
* @param string $minimum_version of this component
@ -2425,7 +2326,6 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick)
/**
* Generates and echoes a set of radio HTML fields
*
* @uses htmlspecialchars()
* @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
@ -2458,7 +2358,6 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = ''
/**
* Generates and returns an HTML dropdown
*
* @uses htmlspecialchars()
* @param string $select_name
* @param array $choices the choices values
* @param string $active_choice the choice to select by default
@ -2486,7 +2385,6 @@ 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.
*
* @uses $GLOBALS['cfg']['InitialSlidersState']
* @param string $id the id of the <div> on which to apply the effect
* @param string $message the message to show as a link
*/
@ -2584,11 +2482,6 @@ 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
*
* @uses ceil()
* @uses decbin()
* @uses ord()
* @uses substr()
* @uses sprintf()
* @param numeric $value coming from a BIT field
* @param integer $length
* @return string the printable value
@ -2605,7 +2498,6 @@ function PMA_printable_bit_value($value, $length) {
/**
* Verifies whether the value contains a non-printable character
*
* @uses preg_match()
* @param string $value
* @return boolean
*/
@ -2617,7 +2509,6 @@ function PMA_contains_nonprintable_ascii($value) {
* Converts a BIT type default value
* for example, b'010' becomes 010
*
* @uses strtr()
* @param string $bit_default_value
* @return string the converted value
*/
@ -2628,9 +2519,6 @@ function PMA_convert_bit_default_value($bit_default_value) {
/**
* Extracts the various parts from a field type spec
*
* @uses strpos()
* @uses chop()
* @uses substr()
* @param string $fieldspec
* @return array associative array containing type, spec_in_brackets
* and possibly enum_set_values (another array)
@ -2707,7 +2595,6 @@ function PMA_extractFieldSpec($fieldspec) {
/**
* Verifies if this table's engine supports foreign keys
*
* @uses strtoupper()
* @param string $engine
* @return boolean
*/
@ -2723,7 +2610,6 @@ function PMA_foreignkey_supported($engine) {
/**
* Replaces some characters by a displayable equivalent
*
* @uses str_replace()
* @param string $content
* @return string the content with characters replaced
*/
@ -2946,7 +2832,6 @@ function PMA_selectUploadFile($import_list, $uploaddir) {
* Build titles and icons for action links
*
* @return array the action titles
* @uses PMA_getIcon()
*/
function PMA_buildActionTitles() {
$titles = array();
@ -2981,8 +2866,6 @@ function PMA_buildActionTitles() {
*
* @return mixed An HTML snippet or an array of datatypes.
*
* @uses htmlspecialchars()
* @uses in_array()
*/
function PMA_getSupportedDatatypes($html = false, $selected = '')
{
@ -3165,10 +3048,6 @@ function PMA_getFunctionsForField($field, $insert_mode)
* // 'CREATE ROUTINE' privilege or, if not, checks if the
* // user has this privilege on database 'mydb'.
*
* @uses PMA_DBI_fetch_value()
* @uses explode()
* @uses str_replace()
* @uses sprintf()
*
* @param string $priv The privilege to check
* @param mixed $db null, to only check global privileges
@ -3208,7 +3087,7 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
'SCHEMA_PRIVILEGES',
$username,
$priv,
PMA_sqlAddslashes($db)))) {
PMA_sqlAddSlashes($db)))) {
return true;
}
} else {
@ -3224,8 +3103,8 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
'TABLE_PRIVILEGES',
$username,
$priv,
PMA_sqlAddslashes($db),
PMA_sqlAddslashes($tbl)))) {
PMA_sqlAddSlashes($db),
PMA_sqlAddSlashes($tbl)))) {
return true;
}
}

8
libraries/config/ConfigFile.class.php
View File

@ -72,7 +72,6 @@ class ConfigFile
/**
* Private constructor, use {@link getInstance()}
*
* @uses PMA_array_write()
*/
private function __construct()
{
@ -193,9 +192,6 @@ class ConfigFile
/**
* Sets config value
*
* @uses PMA_array_read()
* @uses PMA_array_remove()
* @uses PMA_array_write()
* @param string $path
* @param mixed $value
* @param string $canonical_path
@ -285,7 +281,6 @@ class ConfigFile
/**
* Returns config value or $default if it's not set
*
* @uses PMA_array_read()
* @param string $path
* @param mixed $default
* @return mixed
@ -300,7 +295,6 @@ class ConfigFile
* exist in config.default.php ($cfg) and config.values.php
* ($_cfg_db['_overrides'])
*
* @uses PMA_array_read()
* @param string $canonical_path
* @param mixed $default
* @return mixed
@ -314,7 +308,6 @@ class ConfigFile
* Returns config value, if it's not set uses the default one; returns
* $default if the path isn't set and doesn't contain a default value
*
* @uses PMA_array_read()
* @param string $path
* @param mixed $default
* @return mixed
@ -342,7 +335,6 @@ class ConfigFile
/**
* Returns config database entry for $path ($cfg_db in config_info.php)
*
* @uses PMA_array_read()
* @param string $path
* @param mixed $default
* @return mixed

5
libraries/config/Form.class.php
View File

@ -74,8 +74,6 @@ class Form
/**
* Returns allowed values for select fields
*
* @uses ConfigFile::getDbEntry()
* @uses ConfigFile::getInstance()
* @param string $option_path
* @return array
*/
@ -167,9 +165,6 @@ class Form
/**
* Reads fields' types to $this->fieldsTypes
*
* @uses ConfigFile::getDbEntry()
* @uses ConfigFile::getDefault()
* @uses ConfigFile::getInstance()
*/
protected function readTypes()
{

40
libraries/config/FormDisplay.class.php
View File

@ -132,9 +132,6 @@ class FormDisplay
/**
* Runs validation for all registered forms
*
* @uses ConfigFile::getInstance()
* @uses ConfigFile::getValue()
* @uses PMA_config_validate()
*/
private function _validate()
{
@ -178,19 +175,6 @@ class FormDisplay
/**
* Outputs HTML for forms
*
* @uses ConfigFile::getInstance()
* @uses ConfigFile::get()
* @uses display_fieldset_bottom()
* @uses display_fieldset_top()
* @uses display_form_bottom()
* @uses display_form_top()
* @uses display_js()
* @uses display_tabs_bottom()
* @uses display_tabs_top()
* @uses js_validate()
* @uses PMA_config_get_validators()
* @uses PMA_jsFormat()
* @uses PMA_lang()
* @param bool $tabbed_form
* @param bool $show_restore_default whether show "restore default" button besides the input field
*/
@ -281,17 +265,6 @@ class FormDisplay
/**
* Prepares data for input field display and outputs HTML code
*
* @uses ConfigFile::get()
* @uses ConfigFile::getDefault()
* @uses ConfigFile::getInstance()
* @uses display_group_footer()
* @uses display_group_header()
* @uses display_input()
* @uses Form::getOptionType()
* @uses Form::getOptionValueList()
* @uses PMA_escapeJsString()
* @uses PMA_lang_desc()
* @uses PMA_lang_name()
* @param Form $form
* @param string $field field name as it appears in $form
* @param string $system_path field path, eg. Servers/1/verbose
@ -405,8 +378,6 @@ class FormDisplay
/**
* Displays errors
*
* @uses display_errors()
* @uses PMA_lang_name()
*/
public function displayErrors()
{
@ -429,9 +400,6 @@ class FormDisplay
/**
* Reverts erroneous fields to their default values
*
* @uses ConfigFile::getDefault()
* @uses ConfigFile::getInstance()
* @uses ConfigFile::set()
*
*/
public function fixErrors()
@ -481,13 +449,6 @@ class FormDisplay
/**
* Validates and saves form data to session
*
* @uses ConfigFile::get()
* @uses ConfigFile::getInstance()
* @uses ConfigFile::getServerCount()
* @uses ConfigFile::set()
* @uses Form::getOptionType()
* @uses Form::getOptionValueList()
* @uses PMA_lang_name()
* @param array|string $forms array of form names
* @param bool $allow_partial_save allows for partial form saving on failed validation
* @return boolean true on success (no errors and all saved)
@ -707,7 +668,6 @@ class FormDisplay
/**
* Fills out {@link userprefs_keys} and {@link userprefs_disallow}
*
* @uses PMA_read_userprefs_fieldnames()
*/
private function _loadUserprefsInfo()
{

10
libraries/config/FormDisplay.tpl.php
View File

@ -9,8 +9,6 @@
/**
* Displays top part of the form
*
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_getHiddenFields()
* @param string $action default: $_SERVER['REQUEST_URI']
* @param string $method 'post' or 'get'
* @param array $hidden_fields array of form hidden fields (key: field name)
@ -115,10 +113,6 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a
* o comment_warning - (bool) whether this comments warns about something
* o wiki - (string) wiki link
*
* @uses $GLOBALS['_FormDisplayGroup']
* @uses $GLOBALS['cfg']['ThemePath']
* @uses $_SESSION['PMA_Theme']
* @uses display_group_footer()
* @param string $path
* @param string $name
* @param string $description
@ -281,8 +275,6 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
/**
* Display group header
*
* @uses $GLOBALS['_FormDisplayGroup']
* @uses display_group_footer()
* @param string $header_text
*/
function display_group_header($header_text)
@ -308,7 +300,6 @@ function display_group_header($header_text)
/**
* Display group footer
*
* @uses $GLOBALS['_FormDisplayGroup']
*/
function display_group_footer()
{
@ -370,7 +361,6 @@ function display_form_bottom()
/**
* Appends JS validation code to $js_array
*
* @uses PMA_escapeJsString()
* @param string $field_id
* @param string|array $validator
* @param array $js_array

11
libraries/config/validate.lib.php
View File

@ -18,8 +18,6 @@
/**
* Returns validator list
*
* @uses ConfigFile::getDbEntry()
* @uses ConfigFile::getInstance()
* @return array
*/
function PMA_config_get_validators()
@ -65,9 +63,6 @@ function PMA_config_get_validators()
* cleanup in HTML documen
* o false - when no validators match name(s) given by $validator_id
*
* @uses ConfigFile::getCanonicalPath()
* @uses ConfigFile::getInstance()
* @uses PMA_config_get_validators()
* @param string|array $validator_id
* @param array $values
* @param bool $isPostSource tells whether $values are directly from POST request
@ -221,7 +216,6 @@ function test_db_connection($extension, $connect_type, $host, $port, $socket, $u
/**
* Validate server config
*
* @uses test_db_connection()
* @param string $path
* @param array $values
* @return array
@ -256,7 +250,6 @@ function validate_server($path, $values)
/**
* Validate pmadb config
*
* @uses test_db_connection()
* @param string $path
* @param array $values
* @return array
@ -295,7 +288,6 @@ function validate_pmadb($path, $values)
/**
* Validates regular expression
*
* @uses test_php_errormsg()
* @param string $path
* @param array $values
* @return array
@ -399,7 +391,6 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error
/**
* Validates port number
*
* @uses test_number()
* @param string $path
* @param array $values
* @return array
@ -412,7 +403,6 @@ function validate_port_number($path, $values)
/**
* Validates positive number
*
* @uses test_number()
* @param string $path
* @param array $values
* @return array
@ -425,7 +415,6 @@ function validate_positive_number($path, $values)
/**
* Validates non-negative number
*
* @uses test_number()
* @param string $path
* @param array $values
* @return array

59
libraries/core.lib.php
View File

@ -29,7 +29,6 @@
* echo PMA_ifSetOr($cfg['ForceSSL'], false, 'boolean'); // true
* </code>
*
* @uses PMA_isValid()
* @see PMA_isValid()
* @param mixed $var param to check
* @param mixed $default default value
@ -80,12 +79,6 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar')
*
* @todo create some testsuites
* @todo add some more var types like hex, bin, ...?
* @uses is_scalar()
* @uses is_numeric()
* @uses is_array()
* @uses in_array()
* @uses gettype()
* @uses strtolower()
* @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
@ -199,21 +192,6 @@ function PMA_securePath($path)
* loads language file if not loaded already
*
* @todo use detected argument separator (PMA_Config)
* @uses $GLOBALS['session_name']
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['available_languages']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['PMA_Config']->removeCookie()
* @uses select_lang.lib.php
* @uses $_COOKIE
* @uses substr()
* @uses header()
* @uses http_build_query()
* @uses is_string()
* @uses sprintf()
* @uses vsprintf()
* @uses strtr()
* @uses defined()
* @param string $error_message the error message or named error message
* @param string|array $message_args arguments applied to $error_message
* @return exit
@ -290,11 +268,6 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
/**
* returns count of tables in given db
*
* @uses PMA_DBI_try_query()
* @uses PMA_backquote()
* @uses PMA_DBI_QUERY_STORE()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_free_result()
* @param string $db database to count tables for
* @return integer count of tables in $db
*/
@ -327,9 +300,6 @@ function PMA_getTableCount($db)
* (renamed with PMA prefix to avoid double definition when embedded
* in Moodle)
*
* @uses each()
* @uses strlen()
* @uses substr()
* @param string $size
* @return integer $size
*/
@ -365,10 +335,6 @@ function PMA_get_real_size($size = 0)
*
* @see http://php.net/array_merge
* @see http://php.net/array_merge_recursive
* @uses func_num_args()
* @uses func_get_arg()
* @uses is_array()
* @uses call_user_func_array()
* @param array array to merge
* @param array array to merge
* @param array ...
@ -424,9 +390,6 @@ 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
*
* @uses PMA_arrayWalkRecursive()
* @uses is_array()
* @uses is_string()
* @param array $array array to walk
* @param string $function function to call for every array element
*/
@ -460,10 +423,6 @@ 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)
*
* @uses in_array()
* @uses urldecode()
* @uses substr()
* @uses strpos()
* @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)
@ -493,11 +452,6 @@ function PMA_checkPageValidity(&$page, $whitelist)
* searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv()
* in this order
*
* @uses $_SERVER
* @uses $_ENV
* @uses getenv()
* @uses function_exists()
* @uses apache_getenv()
* @param string $var_name variable name
* @return string value of $var or empty string
*/
@ -519,19 +473,6 @@ function PMA_getenv($var_name) {
/**
* Send HTTP header, taking IIS limits into account (600 seems ok)
*
* @uses PMA_IS_IIS
* @uses PMA_COMING_FROM_COOKIE_LOGIN
* @uses PMA_get_arg_separator()
* @uses SID
* @uses strlen()
* @uses strpos()
* @uses header()
* @uses session_write_close()
* @uses headers_sent()
* @uses function_exists()
* @uses debug_print_backtrace()
* @uses trigger_error()
* @uses defined()
* @param string $uri the header to send
* @return boolean always true
*/

86
libraries/database_interface.lib.php
View File

@ -148,15 +148,6 @@ 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
*
* @uses $GLOBALS['cfg']['IconvExtraParams']
* @uses PMA_DBI_fetch_value() to get server_language
* @uses preg_match() to filter server_language
* @uses in_array()
* @uses function_exists() to check for a convert function
* @uses iconv() to convert message
* @uses libiconv() to convert message
* @uses recode_string() to convert message
* @uses mb_convert_encoding() to convert message
* @param string $message
* @return string $message
*/
@ -287,9 +278,6 @@ function PMA_usort_comparison_callback($a, $b)
* </code>
*
* @todo move into PMA_Table
* @uses PMA_DBI_fetch_result()
* @uses PMA_escape_mysql_wildcards()
* @uses PMA_backquote()
* @param string $database database
* @param string|false $table table
* @param boolean|string $tbl_is_group $table is a table group
@ -338,7 +326,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
// added BINARY in the WHERE clause to force a case sensitive
// comparison (if we are looking for the db Aa we don't want
// to find the db aa)
$this_databases = array_map('PMA_sqlAddslashes', $databases);
$this_databases = array_map('PMA_sqlAddSlashes', $databases);
if (PMA_DRIZZLE) {
$engine_info = PMA_cacheGet('drizzle_engines', true);
@ -454,7 +442,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
if ($table || (true === $tbl_is_group)) {
$sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote($each_database)
.' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table)) . '%\'';
.' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table, true)) . '%\'';
} else {
$sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote($each_database);
@ -1173,29 +1161,6 @@ 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.
*
* @uses ./libraries/charset_conversion.lib.php
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_MYSQL_INT_VERSION to set it
* @uses PMA_MYSQL_STR_VERSION to set it
* @uses $_SESSION['PMA_MYSQL_INT_VERSION'] for caching
* @uses $_SESSION['PMA_MYSQL_STR_VERSION'] for caching
* @uses PMA_DBI_GETVAR_SESSION
* @uses PMA_DBI_fetch_value()
* @uses PMA_DBI_query()
* @uses PMA_DBI_get_variable()
* @uses $GLOBALS['collation_connection']
* @uses $GLOBALS['available_languages']
* @uses $GLOBALS['mysql_charset_map']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['cfg']['Lang']
* @uses defined()
* @uses explode()
* @uses sprintf()
* @uses intval()
* @uses define()
* @uses defined()
* @uses substr()
* @uses count()
* @param mixed $link mysql link resource|object
* @param boolean $is_controluser
*/
@ -1234,7 +1199,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
if (!PMA_DRIZZLE) {
if (! empty($GLOBALS['collation_connection'])) {
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE);
PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE);
} else {
PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);
}
@ -1265,13 +1230,6 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
* // $user_name = 'John Doe'
* </code>
*
* @uses is_string()
* @uses is_int()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @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
@ -1327,13 +1285,6 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null,
* // $user = array('id' => 123, 'name' => 'John Doe')
* </code>
*
* @uses is_string()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_fetch_array()
* @uses PMA_DBI_free_result()
* @param string|mysql_result $result query or mysql result
* @param string $type NUM|ASSOC|BOTH
* returned array should either numeric
@ -1413,14 +1364,6 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio
* // $users['admin']['John Doe'] = '123'
* </code>
*
* @uses is_string()
* @uses is_int()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_num_fields()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @param string|mysql_result $result query or mysql result
* @param string|integer $key field-name or offset
* used as key for array
@ -1551,8 +1494,6 @@ function PMA_DBI_getCompatibilities()
/**
* returns warnings for last query
*
* @uses $GLOBALS['userlink']
* @uses PMA_DBI_fetch_result()
* @param resource $link mysql link resource
* @return array warnings
*/
@ -1573,11 +1514,6 @@ function PMA_DBI_get_warnings($link = null)
* returns true (int > 0) if current user is superuser
* otherwise 0
*
* @uses $_SESSION['is_superuser'] for caching
* @uses $GLOBALS['userlink']
* @uses $GLOBALS['server']
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_QUERY_STORE
* @return integer $is_superuser
*/
function PMA_isSuperuser()
@ -1608,7 +1544,6 @@ function PMA_isSuperuser()
/**
* returns an array of PROCEDURE or FUNCTION names for a db
*
* @uses PMA_DBI_free_result()
* @param string $db db name
* @param string $which PROCEDURE | FUNCTION
* @param resource $link mysql link
@ -1634,7 +1569,6 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null)
/**
* returns the definition of a specific PROCEDURE, FUNCTION or EVENT
*
* @uses PMA_DBI_fetch_value()
* @param string $db db name
* @param string $which PROCEDURE | FUNCTION | EVENT
* @param string $name the procedure|function|event name
@ -1656,7 +1590,6 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null)
/**
* returns details about the TRIGGERs for a specific table or database
*
* @uses PMA_DBI_fetch_result()
* @param string $db db name
* @param string $table table name
* @param string $delimiter the delimiter to use (may be empty)
@ -1670,14 +1603,14 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//')
// Note: in http://dev.mysql.com/doc/refman/5.0/en/faqs-triggers.html
// their example uses WHERE TRIGGER_SCHEMA='dbname' so let's use this
// instead of WHERE EVENT_OBJECT_SCHEMA='dbname'
$query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "';";
$query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db,true) . "';";
if (! empty($table)) {
$query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';";
$query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table, true) . "';";
}
} else {
$query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddslashes($db,true));
$query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddSlashes($db,true));
if (! empty($table)) {
$query .= " LIKE '" . PMA_sqlAddslashes($table, true) . "';";
$query .= " LIKE '" . PMA_sqlAddSlashes($table, true) . "';";
}
}
@ -1711,7 +1644,6 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//')
/**
* Returns true if $db.$view_name is a view, false if not
*
* @uses PMA_DBI_fetch_result()
* @param string $db database name
* @param string $view_name view/table name
*
@ -1722,8 +1654,8 @@ function PMA_isView($db, $view_name)
$result = PMA_DBI_fetch_result(
"SELECT TABLE_NAME
FROM information_schema.VIEWS
WHERE TABLE_SCHEMA = '" . PMA_sqlAddslashes($db) . "'
AND TABLE_NAME = '" . PMA_sqlAddslashes($view_name) . "'");
WHERE TABLE_SCHEMA = '" . PMA_sqlAddSlashes($db) . "'
AND TABLE_NAME = '" . PMA_sqlAddSlashes($view_name) . "'");
if ($result) {
return true;

2
libraries/db_events.inc.php
View File

@ -8,7 +8,7 @@ if (! defined('PHPMYADMIN')) {
exit;
}
$events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
$events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
$conditional_class_add = '';
$conditional_class_drop = '';

27
libraries/db_info.inc.php
View File

@ -9,28 +9,6 @@
*
* speedup view on locked tables
*
* @uses $cfg['ShowStats']
* @uses $cfg['ShowTooltip']
* @uses $cfg['ShowTooltipAliasTB']
* @uses $cfg['SkipLockedTables']
* @uses $GLOBALS['db']
* @uses PMA_fillTooltip()
* @uses PMA_checkParameters()
* @uses PMA_escape_mysql_wildcards()
* @uses PMA_DBI_query()
* @uses PMA_backquote()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @uses PMA_DBI_get_tables_full()
* @uses PMA_isValid()
* @uses preg_match()
* @uses preg_quote()
* @uses uksort()
* @uses strnatcasecmp()
* @uses count()
* @uses PMA_sqlAddSlashes()
* @package phpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -57,9 +35,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
/**
* fills given tooltip arrays
*
* @uses $cfg['ShowTooltipAliasTB']
* @uses PMA_localisedDate()
* @uses strtotime()
* @param array $tooltip_truename tooltip data
* @param array $tooltip_aliasname tooltip data
* @param array $table tabledata
@ -155,7 +130,7 @@ if (true === $cfg['SkipLockedTables']) {
if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query(
'SHOW TABLE STATUS FROM ' . PMA_backquote($db)
. ' LIKE \'' . PMA_sqlAddSlashes($tmp[0]) . '\';');
. ' LIKE \'' . PMA_sqlAddSlashes($tmp[0], true) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
PMA_DBI_free_result($sts_result);
unset($sts_result);

67
libraries/db_routines.lib.php
View File

@ -16,13 +16,6 @@ if (! defined('PHPMYADMIN')) {
*
* @return array Parsed information about the input parameter
*
* @uses PMA_SQP_parse()
* @uses PMA_unquote()
* @uses in_array()
* @uses strtoupper()
* @uses strtolower()
* @uses sort()
* @uses implode()
*/
function PMA_RTN_parseOneParameter($value)
{
@ -83,7 +76,6 @@ function PMA_RTN_parseOneParameter($value)
*
* @return array Information about the parameteres of a routine.
*
* @uses PMA_RTN_parseOneParameter()
*/
function PMA_RTN_parseAllParameters($parsed_query, $routine_type)
{
@ -152,8 +144,6 @@ function PMA_RTN_parseAllParameters($parsed_query, $routine_type)
*
* @return string The definer of a routine.
*
* @uses substr()
* @uses PMA_unQuote()
*/
function PMA_RTN_parseRoutineDefiner($parsed_query)
{
@ -185,13 +175,6 @@ function PMA_RTN_parseRoutineDefiner($parsed_query)
*
* @return array Data necessary to create the routine editor.
*
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_single_row()
* @uses PMA_SQP_parse()
* @uses PMA_DBI_get_definition()
* @uses PMA_RTN_parseAllParameters()
* @uses PMA_RTN_parseRoutineDefiner()
* @uses PMA_RTN_parseOneParameter()
*/
function PMA_RTN_getRoutineDataFromName($db, $name, $all = true)
{
@ -203,8 +186,8 @@ function PMA_RTN_getRoutineDataFromName($db, $name, $all = true)
$fields = "SPECIFIC_NAME, ROUTINE_TYPE, DTD_IDENTIFIER, "
. "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, "
. "ROUTINE_COMMENT, SECURITY_TYPE";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' "
. "AND SPECIFIC_NAME='" . PMA_sqlAddslashes($name) . "'";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' "
. "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'";
$query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;";
$routine = PMA_DBI_fetch_single_row($query);
@ -310,11 +293,6 @@ function PMA_RTN_getRoutineDataFromName($db, $name, $all = true)
*
* @return array Data necessary to create the routine editor.
*
* @uses isset()
* @uses is_array()
* @uses in_array()
* @uses strtolower()
* @uses PMA_getSupportedDatatypes()
*/
function PMA_RTN_getRoutineDataFromRequest()
{
@ -480,8 +458,6 @@ function PMA_RTN_getRoutineDataFromRequest()
*
* @return string HTML code of one row of parameter table for the routine editor.
*
* @uses PMA_getSupportedDatatypes()
* @uses PMA_getSupportedCharsets()
*/
function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
{
@ -573,11 +549,6 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
*
* @return string HTML code for the routine editor.
*
* @uses htmlentities()
* @uses PMA_generate_common_hidden_inputs()
* @uses strtoupper()
* @uses PMA_getSupportedDatatypes()
* @uses PMA_getSupportedCharsets()
*/
function PMA_RTN_getEditorForm($mode, $operation, $routine, $errors, $is_ajax) {
global $db, $titles, $param_directions, $param_sqldataaccess, $param_opts_num;
@ -804,16 +775,6 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine, $errors, $is_ajax) {
*
* @return string HTML code for the routine execution dialog.
*
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_unsupportedDatatypes()
* @uses stristr()
* @uses in_array()
* @uses strtolower()
* @uses strtoupper()
* @uses isset()
* @uses PMA_SQP_parse()
* @uses htmlentities()
* @uses PMA_unquote()
*/
function PMA_RTN_getExecuteForm($routine, $is_ajax)
{
@ -935,16 +896,6 @@ function PMA_RTN_getExecuteForm($routine, $is_ajax)
*
* @return string The CREATE [ROUTINE | PROCEDURE] query.
*
* @uses explode()
* @uses strpos()
* @uses PMA_backquote()
* @uses sprintf()
* @uses htmlspecialchars()
* @uses is_array()
* @uses preg_match()
* @uses count()
* @uses strtoupper()
* @uses strtolower()
*/
function PMA_RTN_getQueryFromRequest() {
global $_REQUEST, $cfg, $routine_errors, $param_sqldataaccess;
@ -1090,12 +1041,6 @@ function PMA_RTN_getQueryFromRequest() {
*
* @return string An HTML snippet containing a row for the routines list.
*
* @uses sprintf()
* @uses PMA_currentUserHasPrivilege()
* @uses PMA_backquote
* @uses PMA_RTN_getRoutineDataFromName()
* @uses htmlspecialchars()
* @uses urlencode()
*/
function PMA_RTN_getRowForRoutinesList($routine, $ct = 0, $is_ajax = false) {
global $titles, $db, $url_query, $ajax_class;
@ -1173,9 +1118,6 @@ function PMA_RTN_getRowForRoutinesList($routine, $ct = 0, $is_ajax = false) {
*
* @return string An HTML snippet with the list of routines.
*
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result()
* @uses PMA_RTN_getRowForRoutinesList()
*/
function PMA_RTN_getRoutinesList()
{
@ -1185,7 +1127,7 @@ function PMA_RTN_getRoutinesList()
* Get the routines
*/
$columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "'";
$where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "'";
$routines = PMA_DBI_fetch_result("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;");
/**
* Conditional classes switch the list on or off
@ -1235,9 +1177,6 @@ function PMA_RTN_getRoutinesList()
*
* @return string An HTML snippet with the link to add a new routine.
*
* @uses PMA_currentUserHasPrivilege()
* @uses PMA_getIcon()
* @uses PMA_showMySQLDocu()
*/
function PMA_RTN_getAddRoutineLink()
{

5
libraries/db_structure.lib.php
View File

@ -13,11 +13,6 @@ if (! defined('PHPMYADMIN')) {
* void PMA_TableHeader([bool $db_is_information_schema = false])
* display table header (<table><thead>...</thead><tbody>)
*
* @uses PMA_showHint()
* @uses $GLOBALS['cfg']['PropertiesNumColumns']
* @uses $GLOBALS['is_show_stats']
* @uses $GLOBALS['colspan_for_structure']
* @uses PMA_SortableTableHeader()
* @param boolean $db_is_information_schema
* @param boolean $replication
*/

2
libraries/db_table_exists.lib.php
View File

@ -46,7 +46,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A
if (! $is_table) {
$_result = PMA_DBI_try_query(
'SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, true) . '\';',
'SHOW TABLES LIKE \'' . PMA_sqlAddSlashes($table, true) . '\';',
null, PMA_DBI_QUERY_STORE);
$is_table = @PMA_DBI_num_rows($_result);
PMA_DBI_free_result($_result);

15
libraries/dbi/mysql.dbi.lib.php
View File

@ -182,7 +182,6 @@ function PMA_DBI_fetch_row($result)
/*
* Adjusts the result pointer to an arbitrary row in the result
*
* @uses mysql_data_seek()
* @param $result
* @param $offset
* @return boolean true on success, false on failure
@ -235,8 +234,6 @@ function PMA_DBI_next_result() {
/**
* Returns a string representing the type of connection used
* @uses mysql_get_host_info()
* @uses $GLOBALS['userlink'] as default for $link
* @param resource $link mysql link
* @return string type of connection used
*/
@ -254,8 +251,6 @@ function PMA_DBI_get_host_info($link = null)
/**
* Returns the version of the MySQL protocol used
* @uses mysql_get_proto_info()
* @uses $GLOBALS['userlink'] as default for $link
* @param resource $link mysql link
* @return integer version of the MySQL protocol used
*/
@ -273,7 +268,6 @@ function PMA_DBI_get_proto_info($link = null)
/**
* returns a string that represents the client library version
* @uses mysql_get_client_info()
* @return string MySQL client library version
*/
function PMA_DBI_get_client_info()
@ -284,13 +278,6 @@ function PMA_DBI_get_client_info()
/**
* returns last error message or false if no errors occured
*
* @uses PMA_DBI_convert_message()
* @uses $GLOBALS['errno']
* @uses $GLOBALS['userlink']
* @uses mysql_errno()
* @uses mysql_error()
* @uses defined()
* @uses PMA_generate_common_url()
* @param resource $link mysql link
* @return string|boolean $error or false
*/
@ -379,8 +366,6 @@ function PMA_DBI_insert_id($link = null)
/**
* returns the number of rows affected by last query
*
* @uses $GLOBALS['userlink']
* @uses mysql_affected_rows()
* @param object mysql $link the mysql object
* @param boolean $get_from_cache
* @return string integer

84
libraries/dbi/mysqli.dbi.lib.php
View File

@ -36,16 +36,6 @@ if (! defined('MYSQLI_BINARY_FLAG')) {
/**
* connects to the database server
*
* @uses $GLOBALS['cfg']['Server']
* @uses PMA_auth_fails()
* @uses PMA_DBI_postConnect()
* @uses MYSQLI_CLIENT_COMPRESS
* @uses MYSQLI_OPT_LOCAL_INFILE
* @uses strtolower()
* @uses mysqli_init()
* @uses mysqli_options()
* @uses mysqli_real_connect()
* @uses defined()
* @param string $user mysql user name
* @param string $password mysql user password
* @param boolean $is_controluser
@ -131,8 +121,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
/**
* selects given database
*
* @uses $GLOBALS['userlink']
* @uses mysqli_select_db()
* @param string $dbname database name to select
* @param object mysqli $link the mysqli object
* @return boolean true or false
@ -152,11 +140,6 @@ function PMA_DBI_select_db($dbname, $link = null)
/**
* runs a query and returns the result
*
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_QUERY_UNBUFFERED
* @uses MYSQLI_STORE_RESULT
* @uses MYSQLI_USE_RESULT
* @uses mysqli_query()
* @param string $query query to execute
* @param object mysqli $link mysqli object
* @param integer $options
@ -178,8 +161,6 @@ function PMA_DBI_real_query($query, $link, $options)
/**
* returns array of rows with associative and numeric keys from $result
*
* @uses mysqli_fetch_array()
* @uses MYSQLI_BOTH
* @param object mysqli result $result
* @return array result rows
*/
@ -191,8 +172,6 @@ function PMA_DBI_fetch_array($result)
/**
* returns array of rows with associative keys from $result
*
* @uses mysqli_fetch_array()
* @uses MYSQLI_ASSOC
* @param object mysqli result $result
* @return array result rows
*/
@ -204,8 +183,6 @@ function PMA_DBI_fetch_assoc($result)
/**
* returns array of rows with numeric keys from $result
*
* @uses mysqli_fetch_array()
* @uses MYSQLI_NUM
* @param object mysqli result $result
* @return array result rows
*/
@ -217,7 +194,6 @@ function PMA_DBI_fetch_row($result)
/*
* Adjusts the result pointer to an arbitrary row in the result
*
* @uses mysqli_data_seek()
* @param $result
* @param $offset
* @return boolean true on success, false on failure
@ -230,9 +206,6 @@ function PMA_DBI_data_seek($result, $offset)
/**
* Frees the memory associated with the results
*
* @uses mysqli_result
* @uses func_get_args()
* @uses mysqli_free_result()
* @param result $result,... one or more mysql result resources
*/
function PMA_DBI_free_result()
@ -247,8 +220,6 @@ function PMA_DBI_free_result()
/**
* Check if there are any more query results from a multi query
*
* @uses $GLOBALS['userlink']
* @uses mysqli_more_results()
* @param object mysqli $link the mysqli object
* @return boolean true or false
*/
@ -266,8 +237,6 @@ function PMA_DBI_more_results($link = null) {
/**
* Prepare next result from multi_query
*
* @uses $GLOBALS['userlink']
* @uses mysqli_next_result()
* @param object mysqli $link the mysqli object
* @return boolean true or false
*/
@ -284,8 +253,6 @@ function PMA_DBI_next_result($link = null) {
/**
* Returns a string representing the type of connection used
* @uses mysqli_get_host_info()
* @uses $GLOBALS['userlink'] as default for $link
* @param resource $link mysql link
* @return string type of connection used
*/
@ -303,8 +270,6 @@ function PMA_DBI_get_host_info($link = null)
/**
* Returns the version of the MySQL protocol used
* @uses mysqli_get_proto_info()
* @uses $GLOBALS['userlink'] as default for $link
* @param resource $link mysql link
* @return integer version of the MySQL protocol used
*/
@ -322,7 +287,6 @@ function PMA_DBI_get_proto_info($link = null)
/**
* returns a string that represents the client library version
* @uses mysqli_get_client_info()
* @return string MySQL client library version
*/
function PMA_DBI_get_client_info()
@ -333,14 +297,6 @@ function PMA_DBI_get_client_info()
/**
* returns last error message or false if no errors occured
*
* @uses PMA_DBI_convert_message()
* @uses $GLOBALS['errno']
* @uses $GLOBALS['userlink']
* @uses mysqli_errno()
* @uses mysqli_error()
* @uses mysqli_connect_errno()
* @uses mysqli_connect_error()
* @uses defined()
* @param resource $link mysql link
* @return string|boolean $error or false
*/
@ -406,8 +362,6 @@ function PMA_DBI_num_rows($result)
/**
* returns last inserted auto_increment id for given $link or $GLOBALS['userlink']
*
* @uses $GLOBALS['userlink']
* @uses mysqli_insert_id()
* @param object mysqli $link the mysqli object
* @return string ineteger
*/
@ -432,8 +386,6 @@ function PMA_DBI_insert_id($link = '')
/**
* returns the number of rows affected by last query
*
* @uses $GLOBALS['userlink']
* @uses mysqli_affected_rows()
* @param object mysqli $link the mysqli object
* @param boolean $get_from_cache
* @return string integer
@ -458,20 +410,6 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
* returns metainfo for fields in $result
*
* @todo preserve orignal flags value
* @uses PMA_DBI_field_flags()
* @uses MYSQLI_TYPE_*
* @uses MYSQLI_MULTIPLE_KEY_FLAG
* @uses MYSQLI_PRI_KEY_FLAG
* @uses MYSQLI_UNIQUE_KEY_FLAG
* @uses MYSQLI_NOT_NULL_FLAG
* @uses MYSQLI_UNSIGNED_FLAG
* @uses MYSQLI_ZEROFILL_FLAG
* @uses MYSQLI_NUM_FLAG
* @uses MYSQLI_TYPE_BLOB
* @uses MYSQLI_BLOB_FLAG
* @uses defined()
* @uses mysqli_fetch_fields()
* @uses is_array()
* @param object mysqli result $result
* @return array meta info for fields in $result
*/
@ -562,7 +500,6 @@ function PMA_DBI_num_fields($result)
/**
* returns the length of the given field $i in $result
*
* @uses mysqli_fetch_field_direct()
* @param object mysqli result $result
* @param integer $i field
* @return integer length of field
@ -575,7 +512,6 @@ function PMA_DBI_field_len($result, $i)
/**
* returns name of $i. field in $result
*
* @uses mysqli_fetch_field_direct()
* @param object mysqli result $result
* @param integer $i field
* @return string name of $i. field in $result
@ -588,26 +524,6 @@ function PMA_DBI_field_name($result, $i)
/**
* returns concatenated string of human readable field flags
*
* @uses MYSQLI_UNIQUE_KEY_FLAG
* @uses MYSQLI_NUM_FLAG
* @uses MYSQLI_PART_KEY_FLAG
* @uses MYSQLI_TYPE_SET
* @uses MYSQLI_TIMESTAMP_FLAG
* @uses MYSQLI_AUTO_INCREMENT_FLAG
* @uses MYSQLI_TYPE_ENUM
* @uses MYSQLI_ZEROFILL_FLAG
* @uses MYSQLI_UNSIGNED_FLAG
* @uses MYSQLI_BLOB_FLAG
* @uses MYSQLI_MULTIPLE_KEY_FLAG
* @uses MYSQLI_UNIQUE_KEY_FLAG
* @uses MYSQLI_PRI_KEY_FLAG
* @uses MYSQLI_NOT_NULL_FLAG
* @uses MYSQLI_TYPE_BLOB
* @uses MYSQLI_TYPE_MEDIUM_BLOB
* @uses MYSQLI_TYPE_LONG_BLOB
* @uses MYSQLI_TYPE_VAR_STRING
* @uses MYSQLI_TYPE_STRING
* @uses mysqli_fetch_field_direct()
* @param object mysqli result $result
* @param integer $i field
* @return string field flags

71
libraries/display_tbl.lib.php
View File

@ -206,8 +206,6 @@ function PMA_isSelect()
/**
* Displays a navigation button
*
* @uses $GLOBALS['cfg']['NavigationBarIconic']
* @uses PMA_generate_common_hidden_inputs()
*
* @param string iconic caption for button
* @param string text for button
@ -256,10 +254,6 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q
/**
* Displays a navigation bar to browse among the results of a SQL query
*
* @uses $_SESSION['tmp_user_values']['disp_direction']
* @uses $_SESSION['tmp_user_values']['repeat_cells']
* @uses $_SESSION['tmp_user_values']['max_rows']
* @uses $_SESSION['tmp_user_values']['pos']
* @param integer the offset for the "next" page
* @param integer the offset for the "previous" page
* @param string the URL-encoded query
@ -452,12 +446,6 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
/**
* Displays the headers of the results table
*
* @uses $_SESSION['tmp_user_values']['disp_direction']
* @uses $_SESSION['tmp_user_values']['repeat_cells']
* @uses $_SESSION['tmp_user_values']['max_rows']
* @uses $_SESSION['tmp_user_values']['display_text']
* @uses $_SESSION['tmp_user_values']['display_binary']
* @uses $_SESSION['tmp_user_values']['display_binary_as_hex']
* @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
@ -1125,13 +1113,6 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca
/**
* Displays the body of the results table
*
* @uses $_SESSION['tmp_user_values']['disp_direction']
* @uses $_SESSION['tmp_user_values']['repeat_cells']
* @uses $_SESSION['tmp_user_values']['max_rows']
* @uses $_SESSION['tmp_user_values']['display_text']
* @uses $_SESSION['tmp_user_values']['display_binary']
* @uses $_SESSION['tmp_user_values']['display_binary_as_hex']
* @uses $_SESSION['tmp_user_values']['display_blob']
* @param integer the link id associated to the query which results have
* to be displayed
* @param array which elements to display
@ -1606,7 +1587,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// do not wrap if date field type
$nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : '');
$where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\'';
$where_comparison = ' = \'' . PMA_sqlAddSlashes($row[$i]) . '\'';
$vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
} else {
@ -1702,7 +1683,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
*
* @return boolean always true
*
* @uses $_SESSION['tmp_user_values']['repeat_cells']
* @global array $vertical_display the information to display
*
* @access private
@ -1898,29 +1878,6 @@ function PMA_displayVerticalTable()
/**
*
* @uses $_SESSION['tmp_user_values']['disp_direction']
* @uses $_REQUEST['disp_direction']
* @uses $GLOBALS['cfg']['DefaultDisplay']
* @uses $_SESSION['tmp_user_values']['repeat_cells']
* @uses $_REQUEST['repeat_cells']
* @uses $GLOBALS['cfg']['RepeatCells']
* @uses $_SESSION['tmp_user_values']['max_rows']
* @uses $_REQUEST['session_max_rows']
* @uses $GLOBALS['cfg']['MaxRows']
* @uses $_SESSION['tmp_user_values']['pos']
* @uses $_REQUEST['pos']
* @uses $_SESSION['tmp_user_values']['display_text']
* @uses $_REQUEST['display_text']
* @uses $_SESSION['tmp_user_values']['relational_display']
* @uses $_REQUEST['relational_display']
* @uses $_SESSION['tmp_user_values']['display_binary']
* @uses $_REQUEST['display_binary']
* @uses $_SESSION['tmp_user_values']['display_binary_as_hex']
* @uses $_REQUEST['display_binary_as_hex']
* @uses $_SESSION['tmp_user_values']['display_blob']
* @uses $_REQUEST['display_blob']
* @uses PMA_isValid()
* @uses $GLOBALS['sql_query']
* @todo make maximum remembered queries configurable
* @todo move/split into SQL class!?
* @todo currently this is called twice unnecessary
@ -2070,7 +2027,6 @@ function PMA_displayTable_checkConfigParams()
* @param array the display mode
* @param array the analyzed query
*
* @uses $_SESSION['tmp_user_values']['pos']
* @global string $db the database name
* @global string $table the table name
* @global string $goto the URL to go back in case of errors
@ -2435,8 +2391,6 @@ function default_function($buffer) {
* @param array the display mode
* @param array the analyzed query
*
* @uses $_SESSION['tmp_user_values']['pos']
* @uses $_SESSION['tmp_user_values']['display_text']
* @global string $db the database name
* @global string $table the table name
* @global string $sql_query the current SQL query
@ -2577,12 +2531,6 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
* Verifies what to do with non-printable contents (binary or BLOB)
* in Browse mode.
*
* @uses is_null()
* @uses isset()
* @uses strlen()
* @uses PMA_formatByteDown()
* @uses strpos()
* @uses str_replace()
* @param string $category BLOB|BINARY|GEOMETRY
* @param string $content the binary content
* @param string $transform_function
@ -2628,15 +2576,6 @@ 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
*
* @uses is_array()
* @uses PMA_backquote()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_free_result()
* @uses $GLOBALS['printview']
* @uses htmlspecialchars()
* @uses PMA_generate_common_url()
* @param string $class
* @param string $condition_field
* @param string $analyzed_sql
@ -2738,7 +2677,6 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m
/**
* Generates a checkbox for multi-row submits
*
* @uses htmlspecialchars
* @param string $del_url
* @param array $is_display
* @param string $row_no
@ -2768,7 +2706,6 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla
/**
* Generates an Edit link
*
* @uses PMA_linkOrButton()
* @param string $edit_url
* @param string $class
* @param string $edit_str
@ -2796,7 +2733,6 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
/**
* Generates an Copy link
*
* @uses PMA_linkOrButton()
* @param string $copy_url
* @param string $copy_str
* @param string $where_clause
@ -2827,7 +2763,6 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
/**
* Generates a Delete link
*
* @uses PMA_linkOrButton()
* @param string $del_url
* @param string $del_str
* @param string $js_conf
@ -2852,10 +2787,6 @@ 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)
*
* @uses PMA_generateCheckboxForMulti()
* @uses PMA_generateEditLink()
* @uses PMA_generateDeleteLink()
* @uses PMA_generateCopyLink()
* @param string $position
* @param string $del_url
* @param array $is_display

14
libraries/engines/innodb.lib.php
View File

@ -11,8 +11,6 @@
class PMA_StorageEngine_innodb extends PMA_StorageEngine
{
/**
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
* @return array
*/
function getVariables()
@ -121,8 +119,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
}
/**
* @uses $this->support
* @uses PMA_ENGINE_SUPPORT_YES
* @return array detail pages
*/
function getInfoPages()
@ -139,12 +135,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
/**
* returns html tables with stats over inno db buffer pool
*
* @uses PMA_DBI_fetch_result()
* @uses PMA_formatNumber()
* @uses PMA_formatByteDown()
* @uses join()
* @uses htmlspecialchars()
* @uses PMA_formatNumber()
* @return string html table with stats
*/
function getPageBufferpool()
@ -272,8 +262,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
/**
* returns InnoDB status
*
* @uses htmlspecialchars()
* @uses PMA_DBI_fetch_value()
* @return string result of SHOW INNODB STATUS inside pre tags
*/
function getPageStatus()
@ -286,8 +274,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
/**
* returns content for page $id
*
* @uses $this->getInfoPages()
* @uses array_key_exists()
* @param string $id page id
* @return string html output
*/

8
libraries/export/sql.php
View File

@ -595,7 +595,7 @@ function PMA_exportDBFooter($db)
$delimiter = '$$';
if (PMA_MYSQL_INT_VERSION > 50100) {
$event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
$event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
} else {
$event_names = array();
}
@ -690,7 +690,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
$new_crlf = $crlf;
// need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
$result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\'', null, PMA_DBI_QUERY_STORE);
$result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE);
if ($result != false) {
if (PMA_DBI_num_rows($result) > 0) {
$tmpres = PMA_DBI_fetch_assoc($result);
@ -1192,10 +1192,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
}
// detection of 'bit' works only on mysqli extension
} elseif ($fields_meta[$j]->type == 'bit') {
$values[] = "b'" . PMA_sqlAddslashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
$values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
// something else -> treat as a string
} else {
$values[] = '\'' . str_replace($search, $replace, PMA_sqlAddslashes($row[$j])) . '\'';
$values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\'';
} // end if
} // end for

25
libraries/footer.inc.php
View File

@ -13,31 +13,6 @@
*
* always use $GLOBALS, as this script is also included by functions
*
* @uses $_REQUEST['no_history']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['collation_connection']
* @uses $GLOBALS['server']
* @uses $GLOBALS['db']
* @uses $GLOBALS['table']
* @uses $GLOBALS['error_message']
* @uses $GLOBALS['reload']
* @uses $GLOBALS['sql_query']
* @uses $GLOBALS['focus_querywindow']
* @uses $GLOBALS['checked_special']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['controllink'] to close it
* @uses $GLOBALS['userlink'] to close it
* @uses $cfg['Server']['user']
* @uses $cfg['NavigationBarIconic']
* @uses $cfg['MaxCharactersInDisplayedSQL']
* @uses PMA_isValid()
* @uses PMA_setHistory()
* @uses PMA_ifSetOr()
* @uses PMA_escapeJsString()
* @uses PMA_getenv()
* @uses PMA_generate_common_url()
* @uses basename()
* @uses file_exists()
* @package phpMyAdmin
*/
if (! defined('PHPMYADMIN')) {

5
libraries/grab_globals.lib.php
View File

@ -15,11 +15,6 @@ if (! defined('PHPMYADMIN')) {
/**
* copy values from one array to another, usually from a superglobal into $GLOBALS
*
* @uses $GLOBALS['_import_blacklist']
* @uses preg_replace()
* @uses array_keys()
* @uses array_unique()
* @uses stripslashes()
* @param array $array values from
* @param array $target values to
* @param boolean $sanitize prevent importing key names in $_import_blacklist

2
libraries/header.inc.php
View File

@ -154,8 +154,6 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
/**
* Displays table comment
* @uses $show_comment from libraries/tbl_info.inc.php
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/
if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) {
if (strstr($show_comment, '; InnoDB free')) {

67
libraries/import.lib.php
View File

@ -73,7 +73,6 @@ 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.
*
* @uses $GLOBALS['finished'] read and write
* @param string query to run
* @param string query to display, this might be commented
* @param bool whether to use control user for queries
@ -228,11 +227,6 @@ function PMA_lookForUse($buffer, $db, $reload)
/**
* Returns next part of imported file/buffer
*
* @uses $GLOBALS['offset'] read and write
* @uses $GLOBALS['import_file'] read only
* @uses $GLOBALS['import_text'] read and write
* @uses $GLOBALS['finished'] read and write
* @uses $GLOBALS['read_limit'] read only
* @param integer size of buffer to read (this is maximal size
* function will return)
* @return string part of file/buffer
@ -338,7 +332,6 @@ function PMA_importGetNextChunk($size = 32768)
*
* @access public
*
* @uses chr()
* @param int $num
* @return string The column's "Excel" name
*/
@ -386,9 +379,6 @@ function PMA_getColumnAlphaName($num)
*
* @access public
*
* @uses strtoupper()
* @uses strlen()
* @uses ord()
* @param string $name (i.e. "A", or "BC", etc.)
* @return int The column number
*/
@ -449,8 +439,6 @@ define("SIZES", 1);
*
* @access public
*
* @uses substr()
* @uses strpos()
* @param string $last_cumulative_size
* @return int Precision of the given decimal size notation
*/
@ -464,9 +452,6 @@ function PMA_getM($last_cumulative_size) {
*
* @access public
*
* @uses substr()
* @uses strpos()
* @uses strlen()
* @param string $last_cumulative_size
* @return int Scale of the given decimal size notation
*/
@ -480,8 +465,6 @@ function PMA_getD($last_cumulative_size) {
*
* @access public
*
* @uses strlen()
* @uses strpos()
* @param string &$cell
* @return array Contains the precision, scale, and full size representation of the given decimal cell
*/
@ -504,19 +487,6 @@ function PMA_getDecimalSize(&$cell) {
*
* @access public
*
* @uses M
* @uses D
* @uses FULL
* @uses VARCHAR
* @uses DECIMAL
* @uses BIGINT
* @uses INT
* @uses NONE
* @uses strcmp()
* @uses strlen()
* @uses PMA_getM()
* @uses PMA_getD()
* @uses PMA_getDecimalSize()
* @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)
@ -729,15 +699,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
*
* @access public
*
* @uses DECIMAL
* @uses BIGINT
* @uses INT
* @uses VARCHAR
* @uses NONE
* @uses is_numeric()
* @uses strcmp()
* @uses strpos()
* @uses substr_count()
* @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)
@ -779,18 +740,6 @@ function PMA_detectType($last_cumulative_type, &$cell) {
*
* @access public
*
* @uses TBL_NAME
* @uses COL_NAMES
* @uses ROWS
* @uses VARCHAR
* @uses DECIMAL
* @uses BIGINT
* @uses INT
* @uses NONE
* @uses count()
* @uses is_array()
* @uses PMA_detectType()
* @uses PMA_detectSize()
* @param &$table array(string $table_name, array $col_names, array $rows)
* @return array array(array $types, array $sizes)
*/
@ -885,20 +834,6 @@ $import_notice = NULL;
*
* @access public
*
* @uses TBL_NAME
* @uses COL_NAMES
* @uses ROWS
* @uses TYPES
* @uses SIZES
* @uses strcmp()
* @uses count()
* @uses preg_match()
* @uses preg_replace()
* @uses PMA_isView()
* @uses PMA_backquote()
* @uses PMA_importRunQuery()
* @uses PMA_generate_common_url()
* @uses PMA_Message::notice()
* @param string $db_name Name of the database
* @param array &$tables Array of tables for the specified database
* @param array &$analyses = NULL Analyses of the tables
@ -1052,7 +987,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
}
$tempSQLStr .= (($is_varchar) ? "'" : "");
$tempSQLStr .= PMA_sqlAddslashes((string)$tables[$i][ROWS][$j][$k]);
$tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]);
$tempSQLStr .= (($is_varchar) ? "'" : "");
if ($k != ($num_cols - 1)) {

20
libraries/import/docsql.php
View File

@ -68,10 +68,10 @@ if ($data === true && !$error && !$timeout_passed) {
' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
(db_name, table_name, column_name, ' . PMA_backquote('comment') . ')
VALUES (
\'' . PMA_sqlAddslashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddslashes(trim($tab)) . '\',
\'' . PMA_sqlAddslashes(trim($inf[0])) . '\',
\'' . PMA_sqlAddslashes(trim($inf[1])) . '\')';
\'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddSlashes(trim($tab)) . '\',
\'' . PMA_sqlAddSlashes(trim($inf[0])) . '\',
\'' . PMA_sqlAddSlashes(trim($inf[1])) . '\')';
PMA_importRunQuery($qry, $qry . '-- ' . htmlspecialchars($tab) . '.' . htmlspecialchars($inf[0]), true);
} // end inf[1] exists
if (!empty($inf[2]) && strlen(trim($inf[2])) > 0) {
@ -81,12 +81,12 @@ if ($data === true && !$error && !$timeout_passed) {
' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '
(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)
VALUES (
\'' . PMA_sqlAddslashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddslashes(trim($tab)) . '\',
\'' . PMA_sqlAddslashes(trim($inf[0])) . '\',
\'' . PMA_sqlAddslashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddslashes(trim($for[0])) . '\',
\'' . PMA_sqlAddslashes(trim($for[1])) . '\')';
\'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddSlashes(trim($tab)) . '\',
\'' . PMA_sqlAddSlashes(trim($inf[0])) . '\',
\'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\',
\'' . PMA_sqlAddSlashes(trim($for[0])) . '\',
\'' . PMA_sqlAddSlashes(trim($for[1])) . '\')';
PMA_importRunQuery($qry, $qry . '-- ' . htmlspecialchars($tab) . '.' . htmlspecialchars($inf[0]) . '(' . htmlspecialchars($inf[2]) . ')', true);
} // end inf[2] exists
} // End lines loop

6
libraries/import/ldi.php
View File

@ -63,7 +63,7 @@ $sql = 'LOAD DATA';
if (isset($ldi_local_option)) {
$sql .= ' LOCAL';
}
$sql .= ' INFILE \'' . PMA_sqlAddslashes($import_file) . '\'';
$sql .= ' INFILE \'' . PMA_sqlAddSlashes($import_file) . '\'';
if (isset($ldi_replace)) {
$sql .= ' REPLACE';
} elseif (isset($ldi_ignore)) {
@ -75,10 +75,10 @@ if (strlen($ldi_terminated) > 0) {
$sql .= ' FIELDS TERMINATED BY \'' . $ldi_terminated . '\'';
}
if (strlen($ldi_enclosed) > 0) {
$sql .= ' ENCLOSED BY \'' . PMA_sqlAddslashes($ldi_enclosed) . '\'';
$sql .= ' ENCLOSED BY \'' . PMA_sqlAddSlashes($ldi_enclosed) . '\'';
}
if (strlen($ldi_escaped) > 0) {
$sql .= ' ESCAPED BY \'' . PMA_sqlAddslashes($ldi_escaped) . '\'';
$sql .= ' ESCAPED BY \'' . PMA_sqlAddSlashes($ldi_escaped) . '\'';
}
if (strlen($ldi_new_line) > 0){
if ($ldi_new_line == 'auto') {

7
libraries/js_escape.lib.php
View File

@ -13,11 +13,6 @@
* This function is used to displays a javascript confirmation box for
* "DROP/DELETE/ALTER" queries.
*
* @uses PMA_escapeJsString()
* @uses PMA_backquote()
* @uses is_string()
* @uses htmlspecialchars()
* @uses str_replace()
* @param string $a_string the string to format
* @param boolean $add_backquotes whether to add backquotes to the string or not
*
@ -47,8 +42,6 @@ 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.
*
* @uses strtr()
* @uses preg_replace()
* @param string $string the string to be escaped
* @return string the escaped string
*/

8
libraries/mysql_charsets.lib.php
View File

@ -160,10 +160,6 @@ function PMA_generateCharsetQueryPart($collation) {
/**
* returns collation of given db
*
* @uses PMA_DBI_fetch_value()
* @uses PMA_DBI_select_db()
* @uses PMA_sqlAddSlashes()
* @uses $GLOBALS['db']
* @param string $db name of db
* @return string collation of $db
*/
@ -193,7 +189,6 @@ function PMA_getDbCollation($db) {
/**
* returns default server collation from show variables
*
* @uses PMA_DBI_fetch_value()
* @return string $server_collation
*/
function PMA_getServerCollation() {
@ -204,9 +199,6 @@ function PMA_getServerCollation() {
/**
* returns description for given collation
*
* @uses is_array()
* @uses explode()
* @uses count()
*
* @param string $collation MySQL collation string
* @return string collation description

12
libraries/ob.lib.php
View File

@ -17,10 +17,6 @@
* because both header and footer functions must know what each other is
* doing.
*
* @uses $cfg['OBGzip']
* @uses function_exists()
* @uses ini_get()
* @uses ob_get_level()
* @staticvar integer remember last calculated value
* @return integer the output buffer mode
*/
@ -66,11 +62,6 @@ function PMA_outBufferModeGet()
* output buffering is turned on. It also needs to be passed $mode from
* the PMA_outBufferModeGet() function or it will be useless.
*
* @uses PMA_outBufferModeGet()
* @uses PMA_outBufferPost() to register it as shutdown function
* @uses ob_start()
* @uses header() to send X-ob_mode:
* @uses register_shutdown_function() to register PMA_outBufferPost()
*/
function PMA_outBufferPre()
{
@ -89,9 +80,6 @@ function PMA_outBufferPre()
* buffering is turned on. It also needs to be passed $mode from the
* PMA_outBufferModeGet() function or it will be useless.
*
* @uses PMA_outBufferModeGet()
* @uses ob_flush()
* @uses flush()
*/
function PMA_outBufferPost()
{

26
libraries/plugin_interface.lib.php
View File

@ -11,11 +11,6 @@
*
* Reads all plugin information from directory $plugins_dir.
*
* @uses ksort()
* @uses opendir()
* @uses readdir()
* @uses is_file()
* @uses preg_match()
* @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
@ -45,7 +40,6 @@ function PMA_getPlugins($plugins_dir, $plugin_param)
*
* returns locale string for $name or $name if no locale is found
*
* @uses $GLOBALS
* @param string $name for local string
* @return string locale string for $name
*/
@ -59,10 +53,6 @@ function PMA_getString($name)
*
* returns html input tag option 'checked' if plugin $opt should be set by config or request
*
* @uses $_REQUEST
* @uses $_GET
* @uses $GLOBALS['cfg']
* @uses $GLOBALS['timeout_passed']
* @param string $section name of config section in
* $GLOBALS['cfg'][$section] for plugin
* @param string $opt name of option
@ -83,11 +73,6 @@ function PMA_pluginCheckboxCheck($section, $opt)
*
* returns default value for option $opt
*
* @uses htmlspecialchars()
* @uses $_REQUEST
* @uses $_GET
* @uses $GLOBALS['cfg']
* @uses $GLOBALS['timeout_passed']
* @param string $section name of config section in
* $GLOBALS['cfg'][$section] for plugin
* @param string $opt name of option
@ -122,9 +107,6 @@ function PMA_pluginGetDefault($section, $opt)
*
* returns html input tag option 'checked' if option $opt should be set by config or request
*
* @uses $_REQUEST
* @uses $GLOBALS['cfg']
* @uses $GLOBALS['timeout_passed']
* @param string $section name of config section in
* $GLOBALS['cfg'][$section] for plugin
* @param string $opt name of option
@ -149,8 +131,6 @@ 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
*
* @uses PMA_pluginGetDefault()
* @uses PMA_getString()
* @param string $section name of config section in
* $GLOBALS['cfg'][$section] for plugin
* @param string $name name of select element
@ -193,9 +173,6 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
*
* returns single option in a list element
*
* @uses PMA_getString()
* @uses PMA_pluginCheckboxCheck()
* @uses PMA_pluginGetDefault()
* @param string $section name of config section in
* $GLOBALS['cfg'][$section] for plugin
* @param string $plugin_name unique plugin name
@ -308,9 +285,6 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
*
* return html div with editable options for plugin
*
* @uses PMA_getString()
* @uses PMA_pluginGetOneOption()
* @uses PMA_pluginGetDefault();
* @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

188
libraries/relation.lib.php
View File

@ -42,11 +42,6 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0)
} // end of the "PMA_query_as_controluser()" function
/**
* @uses $_SESSION['relation'][$GLOBALS['server']] for caching
* @uses $GLOBALS['cfgRelation'] to set it
* @uses $GLOBALS['server'] to ensure we are using server-specific pmadb
* @uses PMA__getRelationsParam()
* @uses PMA_printRelationsParamDiagnostic()
* @param bool $verbose whether to print diagnostic info
* @return array $cfgRelation
*/
@ -70,12 +65,6 @@ function PMA_getRelationsParam($verbose = false)
/**
* prints out diagnostic info for pma relation feature
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['controllink']
* @uses $cfg['Server']['pmadb']
* @uses sprintf()
* @uses PMA_printDiagMessageForFeature()
* @uses PMA_printDiagMessageForParameter()
* @param array $cfgRelation
*/
function PMA_printRelationsParamDiagnostic($cfgRelation)
@ -204,17 +193,6 @@ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $
* just a copy of the functions used for relations ;-)
* but added some stuff to check what will work
*
* @uses $cfg['Server']['user']
* @uses $cfg['Server']['pmadb']
* @uses $cfg['Server']['verbose_check']
* @uses $GLOBALS['server']
* @uses $GLOBALS['controllink']
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_select_db()
* @uses PMA_backquote()
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_fetch_row()
* @uses PMA_DBI_free_result()
* @access protected
* @return array the relation parameters for the current user
*/
@ -382,17 +360,6 @@ function PMA__getRelationsParam()
* optionally a given column in a table
*
* @access public
* @uses $GLOBALS['controllink']
* @uses $GLOBALS['information_schema_relations']
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result()
* @uses PMA_DBI_fetch_value()
* @uses PMA_SQP_analyze()
* @uses PMA_SQP_parse()
* @uses count()
* @uses strlen()
* @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
@ -411,10 +378,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
`foreign_table`,
`foreign_field`
FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '
WHERE `master_db` = \'' . PMA_sqlAddslashes($db) . '\'
AND `master_table` = \'' . PMA_sqlAddslashes($table) . '\' ';
WHERE `master_db` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `master_table` = \'' . PMA_sqlAddSlashes($table) . '\' ';
if (strlen($column)) {
$rel_query .= ' AND `master_field` = \'' . PMA_sqlAddslashes($column) . '\'';
$rel_query .= ' AND `master_field` = \'' . PMA_sqlAddSlashes($column) . '\'';
}
$foreign = PMA_DBI_fetch_result($rel_query, 'master_field', null, $GLOBALS['controllink']);
}
@ -495,12 +462,6 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
* Gets the display field of a table
*
* @access public
* @uses $GLOBALS['controllink']
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_single_row()
* @uses trim()
* @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
@ -516,8 +477,8 @@ function PMA_getDisplayField($db, $table)
$disp_query = '
SELECT `display_field`
FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . '
WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\'';
WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\'';
$row = PMA_DBI_fetch_single_row($disp_query, 'ASSOC', $GLOBALS['controllink']);
if (isset($row['display_field'])) {
@ -546,8 +507,6 @@ function PMA_getDisplayField($db, $table)
* Gets the comments for all rows of a table or the db itself
*
* @access public
* @uses PMA_DBI_get_columns()
* @uses PMA_getDbComment()
* @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
@ -577,15 +536,6 @@ function PMA_getComments($db, $table = '')
* Gets the comment for a db
*
* @access public
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @uses strlen()
* @param string the name of the db to check for
* @return string comment
*/
@ -599,7 +549,7 @@ function PMA_getDbComment($db)
$com_qry = "
SELECT `comment`
FROM " . PMA_backquote($cfgRelation['db']) . "." . PMA_backquote($cfgRelation['column_info']) . "
WHERE db_name = '" . PMA_sqlAddslashes($db) . "'
WHERE db_name = '" . PMA_sqlAddSlashes($db) . "'
AND table_name = ''
AND column_name = '(db_comment)'";
$com_rs = PMA_query_as_controluser($com_qry, true, PMA_DBI_QUERY_STORE);
@ -618,15 +568,6 @@ function PMA_getDbComment($db)
* Gets the comment for a db
*
* @access public
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @uses strlen()
* @param string the name of the db to check for
* @return string comment
*/
@ -657,11 +598,6 @@ function PMA_getDbComments()
/**
* Set a database comment to a certain value.
*
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @uses strlen()
* @access public
* @param string $db the name of the db
* @param string $comment the value of the column
@ -681,17 +617,17 @@ function PMA_setDbComment($db, $comment = '')
" . PMA_backquote($cfgRelation['db']) . "." . PMA_backquote($cfgRelation['column_info']) . "
(`db_name`, `table_name`, `column_name`, `comment`)
VALUES (
'" . PMA_sqlAddslashes($db) . "',
'" . PMA_sqlAddSlashes($db) . "',
'',
'(db_comment)',
'" . PMA_sqlAddslashes($comment) . "')
'" . PMA_sqlAddSlashes($comment) . "')
ON DUPLICATE KEY UPDATE
`comment` = '" . PMA_sqlAddslashes($comment) . "'";
`comment` = '" . PMA_sqlAddSlashes($comment) . "'";
} else {
$upd_query = '
DELETE FROM
' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `table_name` = \'\'
AND `column_name` = \'(db_comment)\'';
}
@ -706,16 +642,6 @@ function PMA_setDbComment($db, $comment = '')
/**
* Set a SQL history entry
*
* @uses $_SESSION['sql_history']
* @uses $cfg['QueryHistoryDB']
* @uses $cfg['QueryHistoryMax']
* @uses PMA_getRelationsParam()
* @uses PMA_query_as_controluser()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses count()
* @uses md5()
* @uses array_shift()
* @param string $db the name of the db
* @param string $table the name of the table
* @param string $username the username
@ -764,23 +690,16 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
`timevalue`,
`sqlquery`)
VALUES
(\'' . PMA_sqlAddslashes($username) . '\',
\'' . PMA_sqlAddslashes($db) . '\',
\'' . PMA_sqlAddslashes($table) . '\',
(\'' . PMA_sqlAddSlashes($username) . '\',
\'' . PMA_sqlAddSlashes($db) . '\',
\'' . PMA_sqlAddSlashes($table) . '\',
NOW(),
\'' . PMA_sqlAddslashes($sqlquery) . '\')');
\'' . PMA_sqlAddSlashes($sqlquery) . '\')');
} // end of 'PMA_setHistory()' function
/**
* Gets a SQL history entry
*
* @uses $_SESSION['sql_history']
* @uses $GLOBALS['controllink']
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result()
* @uses array_reverse()
* @param string $username the username
* @return array list of history items
* @access public
@ -798,7 +717,7 @@ function PMA_getHistory($username)
`table`,
`sqlquery`
FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . '
WHERE `username` = \'' . PMA_sqlAddslashes($username) . '\'
WHERE `username` = \'' . PMA_sqlAddSlashes($username) . '\'
ORDER BY `id` DESC';
return PMA_DBI_fetch_result($hist_query, null, null, $GLOBALS['controllink']);
@ -810,13 +729,6 @@ function PMA_getHistory($username)
* deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the
* given user
*
* @uses $cfg['QueryHistoryMax']
* @uses $cfg['QueryHistoryDB']
* @uses $GLOBALS['controllink']
* @uses PMA_backquote()
* @uses PMA_sqlAddSlashes()
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_fetch_value()
* @param string $username the username
* @access public
*/
@ -850,15 +762,6 @@ function PMA_purgeHistory($username)
/**
* Prepares the dropdown for one mode
*
* @uses $cfg['LimitChars']
* @uses $cfg['NaturalOrder']
* @uses PMA_strlen()
* @uses htmlspecialchars()
* @uses substr()
* @uses uksort()
* @uses ksort()
* @uses natcasesort()
* @uses asort()
* @param array $foreign the keys and values for foreigns
* @param string $data the current data of the dropdown
* @param string $mode the needed mode
@ -922,11 +825,6 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode)
/**
* Outputs dropdown with values of foreign fields
*
* @uses $cfg['ForeignKeyMaxLimit']
* @uses $cfg['ForeignKeyDropdownOrder']
* @uses PMA__foreignDropdownBuild()
* @uses PMA_isValid()
* @uses implode()
* @param array array of the displayed row
* @param string the foreign field
* @param string the foreign field to display
@ -999,15 +897,6 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data,
/**
* Gets foreign keys in preparation for a drop-down selector
*
* @uses PMA_Table::countRecords()
* @uses PMA_backquote()
* @uses PMA_getDisplayField()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_value()
* @uses PMA_DBI_free_result()
* @uses PMA_DBI_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_assoc()
* @param array array of the foreign keys
* @param string the foreign field name
* @param bool whether to override the total
@ -1045,9 +934,9 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
. (($foreign_display == false) ? '' : ', ' . PMA_backquote($foreign_display));
$f_query_from = ' FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table);
$f_query_filter = empty($foreign_filter) ? '' : ' WHERE ' . PMA_backquote($foreign_field)
. ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"'
. ' LIKE "%' . PMA_sqlAddSlashes($foreign_filter, true) . '%"'
. (($foreign_display == false) ? '' : ' OR ' . PMA_backquote($foreign_display)
. ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"'
. ' LIKE "%' . PMA_sqlAddSlashes($foreign_filter, true) . '%"'
);
$f_query_order = ($foreign_display == false) ? '' :' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display);
$f_query_limit = isset($foreign_limit) ? $foreign_limit : '';
@ -1091,9 +980,6 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
/**
* Finds all related tables
*
* @uses $GLOBALS['controllink']
* @uses $GLOBALS['cfgRelation']
* @uses $GLOBALS['db']
* @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
@ -1117,8 +1003,8 @@ function PMA_getRelatives($from)
$rel_query = 'SELECT *'
. ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_backquote($GLOBALS['cfgRelation']['relation'])
. ' WHERE ' . $from . '_db = \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\''
. ' AND ' . $to . '_db = \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\''
. ' WHERE ' . $from . '_db = \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\''
. ' AND ' . $to . '_db = \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\''
. ' AND ' . $from . '_table IN ' . $in_know
. ' AND ' . $to . '_table IN ' . $in_left;
$relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']);
@ -1145,10 +1031,6 @@ function PMA_getRelatives($from)
*
* usually called after a field in a table was renamed in tbl_alter.php
*
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @param string $db
* @param string $table
* @param string $field
@ -1160,26 +1042,26 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
if ($cfgRelation['displaywork']) {
$table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' SET display_field = \'' . PMA_sqlAddslashes($new_name) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND display_field = \'' . PMA_sqlAddslashes($field) . '\'';
. ' SET display_field = \'' . PMA_sqlAddSlashes($new_name) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND display_field = \'' . PMA_sqlAddSlashes($field) . '\'';
PMA_query_as_controluser($table_query);
}
if ($cfgRelation['relwork']) {
$table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' SET master_field = \'' . PMA_sqlAddslashes($new_name) . '\''
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($field) . '\'';
. ' SET master_field = \'' . PMA_sqlAddSlashes($new_name) . '\''
. ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddSlashes($field) . '\'';
PMA_query_as_controluser($table_query);
$table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' SET foreign_field = \'' . PMA_sqlAddslashes($new_name) . '\''
. ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddslashes($field) . '\'';
. ' SET foreign_field = \'' . PMA_sqlAddSlashes($new_name) . '\''
. ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddSlashes($field) . '\'';
PMA_query_as_controluser($table_query);
} // end if relwork
}
@ -1187,12 +1069,6 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
/**
* Create a PDF page
*
* @uses PMA_backquote()
* @uses $GLOBALS['cfgRelation']['db']
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_insert_id()
* @uses $GLOBALS['controllink']
* @param string $newpage
* @param array $cfgRelation
* @param string $db
@ -1205,7 +1081,7 @@ function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option)
}
$ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' (db_name, page_descr)'
. ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')';
. ' VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($newpage) . '\')';
PMA_query_as_controluser($ins_query, false, $query_default_option);
return PMA_DBI_insert_id(isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : '');
}

76
libraries/relation_cleanup.lib.php
View File

@ -12,10 +12,6 @@ if (! defined('PHPMYADMIN')) {
/**
* Cleanu column related relation stuff
*
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @param string $db
* @param string $table
* @param string $column
@ -26,31 +22,31 @@ function PMA_relationsCleanupColumn($db, $table, $column)
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND column_name = \'' . PMA_sqlAddslashes($column) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND column_name = \'' . PMA_sqlAddSlashes($column) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND display_field = \'' . PMA_sqlAddslashes($column) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND display_field = \'' . PMA_sqlAddSlashes($column) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($column) . '\'';
. ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddSlashes($column) . '\'';
PMA_query_as_controluser($remove_query);
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddslashes($column) . '\'';
. ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddSlashes($column) . '\'';
PMA_query_as_controluser($remove_query);
}
}
@ -58,10 +54,6 @@ function PMA_relationsCleanupColumn($db, $table, $column)
/**
* Cleanup table related relation stuff
*
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @param string $db
* @param string $table
*/
@ -71,41 +63,41 @@ function PMA_relationsCleanupTable($db, $table)
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['pdfwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['designerwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\'';
PMA_query_as_controluser($remove_query);
}
}
@ -113,10 +105,6 @@ function PMA_relationsCleanupTable($db, $table)
/**
* Cleanup database related relation stuff
*
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @param string $db
*/
function PMA_relationsCleanupDatabase($db)
@ -125,45 +113,45 @@ function PMA_relationsCleanupDatabase($db)
if ($cfgRelation['commwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['bookmarkwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['bookmark'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['displaywork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['pdfwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['designerwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
if ($cfgRelation['relwork']) {
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
$remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\'';
PMA_query_as_controluser($remove_query);
}
}

1
libraries/replication_gui.lib.php
View File

@ -199,7 +199,6 @@ function PMA_replication_print_slaves_table($hidden = false) {
/**
* get the correct username and hostname lengths for this MySQL server
*
* @uses strtok()
* @return array username length, hostname length
*/

2
libraries/sanitizing.lib.php
View File

@ -18,8 +18,6 @@
*
* <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
*
* @uses preg_replace()
* @uses strtr()
* @param string the message
* @param boolean whether to escape html in result
*

10
libraries/schema/Dia_Relation_Schema.class.php
View File

@ -184,8 +184,6 @@ class PMA_DIA extends XMLWriter
* and helps in drawing/generating the Tables in dia XML document.
*
* @name Table_Stats
* @copyright
* @license
* @see PMA_DIA
*/
class Table_Stats
@ -242,8 +240,8 @@ class Table_Stats
$sql = 'SELECT x, y FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
if (!$result || !PMA_DBI_num_rows($result)) {
@ -435,8 +433,6 @@ class Table_Stats
* in dia XML document.
*
* @name Relation_Stats
* @copyright
* @license
* @see PMA_DIA
*/
class Relation_Stats
@ -636,8 +632,6 @@ class Relation_Stats
* to this class
*
* @name Dia_Relation_Schema
* @copyright
* @license
*/
class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
{

10
libraries/schema/Eps_Relation_Schema.class.php
View File

@ -347,8 +347,6 @@ class PMA_EPS
* and helps in drawing/generating the Tables in EPS.
*
* @name Table_Stats
* @copyright
* @license
* @see PMA_EPS
*/
class Table_Stats
@ -429,8 +427,8 @@ class Table_Stats
// x and y
$sql = 'SELECT x, y FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
@ -550,8 +548,6 @@ class Table_Stats
* in EPS document.
*
* @name Relation_Stats
* @copyright
* @license
* @see PMA_EPS
*/
class Relation_Stats
@ -715,8 +711,6 @@ class Relation_Stats
* to this class
*
* @name Eps_Relation_Schema
* @copyright
* @license
*/
class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
{

4
libraries/schema/Export_Relation_Schema.class.php
View File

@ -162,7 +162,7 @@ class PMA_Export_Relation_Schema
global $cfgRelation;
// Get All tables
$tab_sql = 'SELECT table_name FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$tab_rs = PMA_query_as_controluser($tab_sql, null, PMA_DBI_QUERY_STORE);
@ -170,7 +170,7 @@ class PMA_Export_Relation_Schema
$this->dieSchema('',__('This page does not contain any tables!'));
}
while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) {
$alltables[] = PMA_sqlAddslashes($curr_table['table_name']);
$alltables[] = PMA_sqlAddSlashes($curr_table['table_name']);
}
return $alltables;
}

12
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -219,7 +219,7 @@ class PMA_PDF extends TCPDF
global $cfgRelation, $db, $pdf_page_number, $with_doc;
if ($with_doc) {
$test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND page_nr = \'' . $pdf_page_number . '\'';
$test_rs = PMA_query_as_controluser($test_query);
$pages = @PMA_DBI_fetch_assoc($test_rs);
@ -438,8 +438,6 @@ class PMA_PDF extends TCPDF
* and helps in drawing/generating the Tables in PDF document.
*
* @name Table_Stats
* @copyright
* @license
* @see PMA_PDF
*/
class Table_Stats
@ -512,8 +510,8 @@ class Table_Stats
}
$sql = 'SELECT x, y FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
if (!$result || !PMA_DBI_num_rows($result)) {
@ -652,8 +650,6 @@ class Table_Stats
* in PDF document.
*
* @name Relation_Stats
* @copyright
* @license
* @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale
*/
class Relation_Stats
@ -797,8 +793,6 @@ class Relation_Stats
* to this class
*
* @name Pdf_Relation_Schema
* @copyright
* @license
*/
class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
{

10
libraries/schema/Svg_Relation_Schema.class.php
View File

@ -317,8 +317,6 @@ class PMA_SVG extends XMLWriter
* and helps in drawing/generating the Tables in SVG XML document.
*
* @name Table_Stats
* @copyright
* @license
* @see PMA_SVG
*/
class Table_Stats
@ -399,8 +397,8 @@ class Table_Stats
// x and y
$sql = 'SELECT x, y FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
@ -527,8 +525,6 @@ class Table_Stats
* in SVG XML document.
*
* @name Relation_Stats
* @copyright
* @license
* @see PMA_SVG::printElementLine
*/
class Relation_Stats
@ -691,8 +687,6 @@ class Relation_Stats
* to this class
*
* @name Svg_Relation_Schema
* @copyright
* @license
*/
class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
{

42
libraries/schema/User_Schema.class.php
View File

@ -134,7 +134,7 @@ class PMA_User_Schema
{
global $db,$table,$query_default_option,$cfgRelation;
$page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'';
$page_rs = PMA_query_as_controluser($page_query, false, $query_default_option);
if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) {
?>
@ -207,8 +207,8 @@ class PMA_User_Schema
<h2><?php echo __('Select Tables') ;?></h2>
<?php
$page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\'';
$page_rs = PMA_query_as_controluser($page_query, false, $query_default_option);
$array_sh_page = array();
while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) {
@ -538,9 +538,9 @@ class PMA_User_Schema
{
foreach ($delrow as $current_row) {
$del_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . "\n"
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . "\n"
. ' AND table_name = \'' . PMA_sqlAddslashes($current_row) . '\'' . "\n"
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . "\n"
. ' AND table_name = \'' . PMA_sqlAddSlashes($current_row) . '\'' . "\n"
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($chpage) . '\'';
echo $del_query;
PMA_query_as_controluser($del_query, false, $query_default_option);
}
@ -583,8 +583,8 @@ class PMA_User_Schema
public function deleteCoordinates($db, $cfgRelation, $choosePage, $query_default_option)
{
$query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($choosePage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($choosePage) . '\'';
PMA_query_as_controluser($query, false, $query_default_option);
}
@ -600,8 +600,8 @@ class PMA_User_Schema
public function deletePages($db, $cfgRelation, $choosePage, $query_default_option)
{
$query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND page_nr = \'' . PMA_sqlAddslashes($choosePage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND page_nr = \'' . PMA_sqlAddSlashes($choosePage) . '\'';
PMA_query_as_controluser($query, false, $query_default_option);
}
@ -732,7 +732,7 @@ class PMA_User_Schema
*/
$insert_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
. '(db_name, table_name, pdf_page_number, x, y) '
. 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')';
. 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')';
PMA_query_as_controluser($insert_query, false, $query_default_option);
/*
@ -785,28 +785,28 @@ class PMA_User_Schema
}
if (isset($arrvalue['name']) && $arrvalue['name'] != '--') {
$test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\'';
$test_rs = PMA_query_as_controluser($test_query, false, $query_default_option);
//echo $test_query;
if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') {
$ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\'';
} else {
$ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
. 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y']
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\''
. ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\'';
}
} else {
$ch_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
. '(db_name, table_name, pdf_page_number, x, y) '
. 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
. 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\', \'' . PMA_sqlAddSlashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
}
//echo $ch_query;
PMA_query_as_controluser($ch_query, false, $query_default_option);

6
libraries/schema/Visio_Relation_Schema.class.php
View File

@ -243,8 +243,8 @@ class Table_Stats
// x and y
$sql = 'SELECT x, y FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\''
. ' AND pdf_page_number = ' . $pageNumber;
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
@ -469,8 +469,6 @@ class Relation_Stats
* to this class
*
* @name Visio_Relation_Schema
* @copyright
* @license
*/
class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
{

15
libraries/select_lang.lib.php
View File

@ -26,18 +26,6 @@ function PMA_langName($tmplang) {
/**
* tries to find the language to use
*
* @uses $GLOBALS['cfg']['lang']
* @uses $GLOBALS['cfg']['DefaultLang']
* @uses $GLOBALS['lang_failed_cfg']
* @uses $GLOBALS['lang_failed_cookie']
* @uses $GLOBALS['lang_failed_request']
* @uses $_REQUEST['lang']
* @uses $_COOKIE['pma_lang']
* @uses $_SERVER['HTTP_ACCEPT_LANGUAGE']
* @uses $_SERVER['HTTP_USER_AGENT']
* @uses PMA_langSet()
* @uses PMA_langDetect()
* @uses explode()
* @return bool success if valid lang is found, otherwise false
*/
function PMA_langCheck()
@ -114,8 +102,6 @@ function PMA_langCheck()
* checks given lang and sets it if valid
* returns true on success, otherwise flase
*
* @uses $GLOBALS['available_languages'] to check $lang
* @uses $GLOBALS['lang'] to set it
* @param string $lang language to set
* @return bool success
*/
@ -140,7 +126,6 @@ function PMA_langSet(&$lang)
*
* @return bool true on success, otherwise false
*
* @uses $GLOBALS['available_languages'] to check $lang
*
* @access private
*/

6
libraries/select_server.lib.php
View File

@ -9,12 +9,6 @@
/**
* display server selection in list or selectbox form, or option tags only
*
* @uses $GLOBALS['cfg']['DisplayServersList']
* @uses $GLOBALS['cfg']['Servers']
* @uses implode()
* @uses htmlspecialchars()
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_generate_common_url()
* @param boolean $not_only_options whether to include form tags or not
* @param boolean $ommit_fieldset whether to ommit fieldset tag or not
*/

6
libraries/server_common.inc.php
View File

@ -1,12 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* @uses PMA_generate_common_url()
* @uses PMA_isSuperuser()
* @uses PMA_DBI_select_db()
* @uses PMA_DBI_fetch_result()
* @uses PMA_DBI_QUERY_STORE
* @uses $userlink
* @package phpMyAdmin
*/
if (! defined('PHPMYADMIN')) {

55
libraries/server_synchronize.lib.php
View File

@ -68,9 +68,6 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo
* If update is required, it is placed in $update_array
* Otherwise that entry is placed in the $insert_array.
*
* @uses PMA_DBI_get_columns()
* @uses PMA_DBI_get_column_values()
* @uses PMA_DBI_fetch_result()
*
* @param $src_db name of source database
* @param $trg_db name of target database
@ -297,9 +294,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching
}
/**
* PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table.
* @uses sizeof()
* @uses PMA_DBI_get_column_values()
* @uses in_array()
*
* @param $delete_array array containing rows that are to be deleted
* @param $matching_table array containing matching table names
@ -376,7 +370,6 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma
/**
* PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon
* @uses PMA_DBI_fetch_result()
*
* @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
@ -395,8 +388,6 @@ 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]
*
* @uses PMA_DBI_fetch_result()
* @uses PMA_backquote()
*
* @param $table Array containing matching tables' names
* @param $update_array A three dimensional array containing field
@ -454,8 +445,6 @@ 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]
*
* @uses PMA_DBI_fetch_result()
* @uses PMA_backquote()
*
*
* @param $matching_table array containing matching table names
@ -571,11 +560,11 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
}
$insert_query .= ") VALUES(";
if (sizeof($table_fields[$matching_table_index]) == 1) {
$insert_query .= "'" . PMA_sqlAddslashes($result[0]) . "'";
$insert_query .= "'" . PMA_sqlAddSlashes($result[0]) . "'";
} else {
for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) {
if (isset($result[0][$table_fields[$matching_table_index][$field_index]])) {
$insert_query .= "'" . PMA_sqlAddslashes($result[0][$table_fields[$matching_table_index][$field_index]]) . "'";
$insert_query .= "'" . PMA_sqlAddSlashes($result[0][$table_fields[$matching_table_index][$field_index]]) . "'";
} else {
$insert_query .= "'NULL'";
}
@ -597,9 +586,6 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
/**
* PMA_createTargetTables() Create the missing table $uncommon_table in target database
*
* @uses PMA_DBI_get_columns()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_result()
*
* @param $src_db name of source database
* @param $trg_db name of target database
@ -652,10 +638,6 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm
}
/**
* PMA_populateTargetTables() inserts data into uncommon tables after they have been created
* @uses PMA_DBI_fetch_result()
* @uses PMA_backquote()
* @uses sizeof()
* @uses PMA_DBI_try_query()
*
* @param $src_db name of source database
* @param $trg_db name of target database
@ -678,7 +660,7 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom
$insert_query .= '(';
$key_of_last_value = count($one_row) - 1;
foreach($one_row as $key => $value) {
$insert_query .= "'" . PMA_sqlAddslashes($value) . "'";
$insert_query .= "'" . PMA_sqlAddSlashes($value) . "'";
if ($key < $key_of_last_value) {
$insert_query .= ",";
}
@ -695,9 +677,6 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom
}
/**
* PMA_deleteFromTargetTable() delete rows from target table
* @uses sizeof()
* @uses PMA_backquote()
* @uses PMA_DBI_try_query()
*
*
* @param $trg_db name of target database
@ -755,8 +734,6 @@ 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.
*
* @uses PMA_DBI_get_columns_full()
* @uses sizeof()
*
* @param $src_db name of source database
* @param $trg_db name of target database
@ -820,13 +797,6 @@ 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
* @uses sizeof()
* @uses in_array()
* @uses array_keys()
* @uses PMA_checkForeignKeys()
* @uses PMA_createTargetTables()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_fetch_result()
*
* @param $src_db name of source database
* @param $trg_db name of target database
@ -924,10 +894,6 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma
}
/**
* PMA_checkForeignKeys() checks if the referenced table have foreign keys.
* @uses sizeof()
* @uses in_array()
* @uses array_keys()
* @uses PMA_checkForeignKeys()
* uses PMA_createTargetTables()
*
* @param $src_db name of source database
@ -959,11 +925,6 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference
}
/**
* PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array
* @uses sizeof()
* @uses PMA_DBI_fetch_result()
* @uses is_string()
* @uses is_numeric()
* @uses PMA_DBI_try_query()
*
*
* @param $trg_db name of target database
@ -1099,9 +1060,6 @@ 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.
* @uses sizeof()
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_fetch_result()
*
* @param $trg_db name of target database
* @param $trg_link connection established with target server
@ -1222,8 +1180,6 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi
/**
* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes.
* @uses sizeof()
* @uses PMA_DBI_try_query()
*
* @param $trg_db name of target database
* @param $trg_link connection established with target server
@ -1311,7 +1267,6 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind
/**
* PMA_displayQuery() displays a query, taking the maximum display size
* into account
* @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
*
* @param $query the query to display
*/
@ -1324,8 +1279,6 @@ function PMA_displayQuery($query) {
/**
* PMA_syncDisplayHeaderSource() shows the header for source database
* @uses $_SESSION['src_type']
* @uses $_SESSION['src_server']['host']
*
* @param string $src_db source db name
*/
@ -1347,8 +1300,6 @@ function PMA_syncDisplayHeaderSource($src_db) {
/**
* PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables
* @uses $_SESSION['trg_type']
* @uses $_SESSION['trg_server']['host']
*
* @param string $trg_db target db name
* @param array $matching_tables

4
libraries/session.inc.php
View File

@ -6,9 +6,6 @@
* @todo add failover or warn if sessions are not configured properly
* @todo add an option to use mm-module for session handler
* @see http://www.php.net/session
* @uses session_name()
* @uses session_start()
* @uses ini_set()
* @package phpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -104,7 +101,6 @@ if (! isset($_SESSION[' PMA_token '])) {
* should be called before login and after successfull login
* (only required if sensitive information stored in session)
*
* @uses session_regenerate_id() to secure session from fixation
*/
function PMA_secureSession()
{

52
libraries/sql_query_form.lib.php
View File

@ -30,32 +30,6 @@ require_once './libraries/bookmark.lib.php'; // used for file listing
* @usedby tbl_structure.php
* @usedby tbl_tracking.php
* @usedby querywindow.php
* @uses $GLOBALS['table']
* @uses $GLOBALS['db']
* @uses $GLOBALS['server']
* @uses $GLOBALS['goto']
* @uses $GLOBALS['is_upload'] from common.inc.php
* @uses $GLOBALS['sql_query'] from grab_globals.lib.php
* @uses $GLOBALS['cfg']['DefaultQueryTable']
* @uses $GLOBALS['cfg']['DefaultQueryDatabase']
* @uses $GLOBALS['cfg']['Servers']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['cfg']['Bookmark']
* @uses PMA_generate_common_url()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_result()
* @uses PMA_showMySQLDocu()
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_sqlQueryFormBookmark()
* @uses PMA_sqlQueryFormInsert()
* @uses PMA_sqlQueryFormUpload()
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_set_enc_form()
* @uses sprintf()
* @uses htmlspecialchars()
* @uses str_replace()
* @uses md5()
* @uses function_exists()
* @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
@ -183,14 +157,6 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
* prints querybox fieldset
*
* @usedby PMA_sqlQueryForm()
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['cfg']['TextareaAutoSelect']
* @uses $GLOBALS['cfg']['TextareaCols']
* @uses $GLOBALS['cfg']['TextareaRows']
* @uses PMA_USR_OS
* @uses PMA_USR_BROWSER_AGENT
* @uses PMA_USR_BROWSER_VER
* @uses htmlspecialchars()
* @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
@ -391,12 +357,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
* prints bookmark fieldset
*
* @usedby PMA_sqlQueryForm()
* @uses PMA_Bookmark_getList()
* @uses $GLOBALS['db']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['ReplaceHelpImg']
* @uses count()
* @uses htmlspecialchars()
*/
function PMA_sqlQueryFormBookmark()
{
@ -460,18 +420,6 @@ function PMA_sqlQueryFormBookmark()
* prints bookmark fieldset
*
* @usedby PMA_sqlQueryForm()
* @uses $GLOBALS['cfg']['GZipDump']
* @uses $GLOBALS['cfg']['BZipDump']
* @uses $GLOBALS['cfg']['UploadDir']
* @uses $GLOBALS['cfg']['AvailableCharsets']
* @uses $GLOBALS['max_upload_size']
* @uses PMA_supportedDecompressions()
* @uses PMA_getFileSelectOptions()
* @uses PMA_displayMaximumUploadSize()
* @uses PMA_generateCharsetDropdownBox()
* @uses PMA_generateHiddenMaxFileSize()
* @uses PMA_CSDROPDOWN_CHARSET
* @uses empty()
*/
function PMA_sqlQueryFormUpload(){
$errors = array ();

10
libraries/string.lib.php
View File

@ -12,11 +12,6 @@
*
* The SQL Parser code relies heavily on these functions.
*
* @uses extension_loaded()
* @uses substr()
* @uses function_exists()
* @uses mb_internal_encoding()
* @uses defined()
* @todo a .lib filename should not have code in main(), split or rename file
* @package phpMyAdmin
*/
@ -62,10 +57,6 @@ if ($GLOBALS['PMA_allow_ctype']) {
/**
* Checks if a given character position in the string is escaped or not
*
* @uses PMA_strlen()
* @uses PMA_substr()
* @uses max()
* @uses intval()
* @param string string to check for
* @param integer the character to check for
* @param integer starting position in the string
@ -110,7 +101,6 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper)
/**
* Checks if a character is an SQL identifier
*
* @uses PMA_STR_isAlnum()
* @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

7
libraries/string_type_ctype.lib.php
View File

@ -18,7 +18,6 @@
/**
* Checks if a character is an alphanumeric one
*
* @uses ctype_alnum()
* @param string character to check for
* @return boolean whether the character is an alphanumeric one or not
*/
@ -30,7 +29,6 @@ function PMA_STR_isAlnum($c)
/**
* Checks if a character is an alphabetic one
*
* @uses ctype_alpha()
* @param string character to check for
* @return boolean whether the character is an alphabetic one or not
*/
@ -42,7 +40,6 @@ function PMA_STR_isAlpha($c)
/**
* Checks if a character is a digit
*
* @uses ctype_digit()
* @param string character to check for
* @return boolean whether the character is a digit or not
*/
@ -54,7 +51,6 @@ function PMA_STR_isDigit($c)
/**
* Checks if a character is an upper alphabetic one
*
* @uses ctype_upper()
* @param string character to check for
* @return boolean whether the character is an upper alphabetic one or not
*/
@ -67,7 +63,6 @@ function PMA_STR_isUpper($c)
/**
* Checks if a character is a lower alphabetic one
*
* @uses ctype_lower()
* @param string character to check for
* @return boolean whether the character is a lower alphabetic one or not
*/
@ -79,7 +74,6 @@ function PMA_STR_isLower($c)
/**
* Checks if a character is a space one
*
* @uses ctype_space()
* @param string character to check for
* @return boolean whether the character is a space one or not
*/
@ -91,7 +85,6 @@ function PMA_STR_isSpace($c)
/**
* Checks if a character is an hexadecimal digit
*
* @uses ctype_xdigit()
* @param string character to check for
* @return boolean whether the character is an hexadecimal digit or not
*/

15
libraries/string_type_native.lib.php
View File

@ -18,9 +18,6 @@
/**
* Checks if a character is an alphanumeric one
*
* @uses PMA_STR_isUpper()
* @uses PMA_STR_isLower()
* @uses PMA_STR_isDigit()
* @param string character to check for
* @return boolean whether the character is an alphanumeric one or not
*/
@ -32,8 +29,6 @@ function PMA_STR_isAlnum($c)
/**
* Checks if a character is an alphabetic one
*
* @uses PMA_STR_isUpper()
* @uses PMA_STR_isLower()
* @param string character to check for
* @return boolean whether the character is an alphabetic one or not
*/
@ -45,8 +40,6 @@ function PMA_STR_isAlpha($c)
/**
* Checks if a character is a digit
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is a digit or not
*/
@ -62,8 +55,6 @@ function PMA_STR_isDigit($c)
/**
* Checks if a character is an upper alphabetic one
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is an upper alphabetic one or not
*/
@ -79,8 +70,6 @@ function PMA_STR_isUpper($c)
/**
* Checks if a character is a lower alphabetic one
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is a lower alphabetic one or not
*/
@ -96,8 +85,6 @@ function PMA_STR_isLower($c)
/**
* Checks if a character is a space one
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is a space one or not
*/
@ -117,8 +104,6 @@ function PMA_STR_isSpace($c)
/**
* Checks if a character is an hexadecimal digit
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is an hexadecimal digit or not
*/

15
libraries/tbl_replace_fields.inc.php
View File

@ -18,15 +18,6 @@
* note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES
*
*
* @uses $_REQUEST
* @uses defined()
* @uses define()
* @uses bin2hex()
* @uses strlen()
* @uses md5()
* @uses implode()
* @uses PMA_NO_VARIABLES_IMPORT
* @uses PMA_sqlAddslashes()
* @package phpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -78,7 +69,7 @@ if (false !== $possibly_uploaded_val) {
} elseif ($type == 'set') {
if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) {
$val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]);
$val = "'" . PMA_sqlAddslashes($val) . "'";
$val = "'" . PMA_sqlAddSlashes($val) . "'";
}
} elseif ($type == 'protected') {
// here we are in protected mode (asked in the config)
@ -96,9 +87,9 @@ if (false !== $possibly_uploaded_val) {
}
} elseif ($type == 'bit') {
$val = preg_replace('/[^01]/', '0', $val);
$val = "b'" . PMA_sqlAddslashes($val) . "'";
$val = "b'" . PMA_sqlAddSlashes($val) . "'";
} elseif (! (($type == 'datetime' || $type == 'timestamp') && $val == 'CURRENT_TIMESTAMP')) {
$val = "'" . PMA_sqlAddslashes($val) . "'";
$val = "'" . PMA_sqlAddSlashes($val) . "'";
}
// Was the Null checkbox checked for this field?

63
libraries/transformations.lib.php
View File

@ -19,14 +19,6 @@
* // }
* </code>
*
* @uses preg_split()
* @uses array_shift()
* @uses trim()
* @uses rtrim()
* @uses ltrim()
* @uses strlen()
* @uses substr()
* @uses stripslashes()
* @param string $option_string comma separated options
* @return array options
*/
@ -70,13 +62,6 @@ function PMA_transformation_getOptions($option_string)
* Gets all available MIME-types
*
* @access public
* @uses opendir()
* @uses readdir()
* @uses closedir()
* @uses sort()
* @uses preg_match()
* @uses explode()
* @uses str_replace()
* @staticvar array mimetypes
* @return array array[mimetype], array[transformation]
*/
@ -132,11 +117,6 @@ function PMA_getAvailableMIMEtypes()
/**
* Gets the mimetypes for all columns of a table
*
* @uses $GLOBALS['controllink']
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_DBI_fetch_result()
* @access public
* @param string $db the name of the db to check for
* @param string $table the name of the table to check for
@ -157,8 +137,8 @@ function PMA_getMIME($db, $table, $strict = false)
`transformation`,
`transformation_options`
FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\'
WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\'
AND ( `mimetype` != \'\'' . (!$strict ? '
OR `transformation` != \'\'
OR `transformation_options` != \'\'' : '') . ')';
@ -168,15 +148,6 @@ function PMA_getMIME($db, $table, $strict = false)
/**
* Set a single mimetype to a certain value.
*
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_sqlAddslashes()
* @uses PMA_query_as_controluser()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_assoc()
* @uses PMA_DBI_free_result()
* @uses strlen()
* @access public
* @param string $db the name of the db
* @param string $table the name of the table
@ -200,9 +171,9 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
SELECT `mimetype`,
`comment`
FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\'
AND `column_name` = \'' . PMA_sqlAddslashes($key) . '\'';
WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\'
AND `column_name` = \'' . PMA_sqlAddSlashes($key) . '\'';
$test_rs = PMA_query_as_controluser($test_qry, true, PMA_DBI_QUERY_STORE);
if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
@ -214,27 +185,27 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
|| strlen($transformation_options) || strlen($row['comment']))) {
$upd_query = '
UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
SET `mimetype` = \'' . PMA_sqlAddslashes($mimetype) . '\',
`transformation` = \'' . PMA_sqlAddslashes($transformation) . '\',
`transformation_options` = \'' . PMA_sqlAddslashes($transformation_options) . '\'';
SET `mimetype` = \'' . PMA_sqlAddSlashes($mimetype) . '\',
`transformation` = \'' . PMA_sqlAddSlashes($transformation) . '\',
`transformation_options` = \'' . PMA_sqlAddSlashes($transformation_options) . '\'';
} else {
$upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']);
}
$upd_query .= '
WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\'
AND `column_name` = \'' . PMA_sqlAddslashes($key) . '\'';
WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\'
AND `column_name` = \'' . PMA_sqlAddSlashes($key) . '\'';
} elseif (strlen($mimetype) || strlen($transformation)
|| strlen($transformation_options)) {
$upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info'])
. ' (db_name, table_name, column_name, mimetype, transformation, transformation_options) '
. ' VALUES('
. '\'' . PMA_sqlAddslashes($db) . '\','
. '\'' . PMA_sqlAddslashes($table) . '\','
. '\'' . PMA_sqlAddslashes($key) . '\','
. '\'' . PMA_sqlAddslashes($mimetype) . '\','
. '\'' . PMA_sqlAddslashes($transformation) . '\','
. '\'' . PMA_sqlAddslashes($transformation_options) . '\')';
. '\'' . PMA_sqlAddSlashes($db) . '\','
. '\'' . PMA_sqlAddSlashes($table) . '\','
. '\'' . PMA_sqlAddSlashes($key) . '\','
. '\'' . PMA_sqlAddSlashes($mimetype) . '\','
. '\'' . PMA_sqlAddSlashes($transformation) . '\','
. '\'' . PMA_sqlAddSlashes($transformation_options) . '\')';
}
if (isset($upd_query)){

17
libraries/url_generating.lib.php
View File

@ -10,7 +10,6 @@
* Generates text with hidden inputs.
*
* @see PMA_generate_common_url()
* @uses PMA_getHiddenFields
* @param string optional database name
* (can also be an array of parameters)
* @param string optional table name
@ -161,19 +160,6 @@ function PMA_getHiddenFields($values, $pre = '')
* // script.php?server=1&amp;lang=en
* </code>
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['cfg']['ServerDefault']
* @uses $_COOKIE['pma_lang']
* @uses $GLOBALS['lang']
* @uses $_COOKIE['pma_collation_connection']
* @uses $GLOBALS['collation_connection']
* @uses $_SESSION[' PMA_token ']
* @uses PMA_get_arg_separator()
* @uses is_array()
* @uses strlen()
* @uses htmlentities()
* @uses urlencode()
* @uses implode()
* @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
*
@ -270,9 +256,6 @@ 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 &amp; and &
*
* @uses ini_get()
* @uses strpos()
* @uses strlen()
* @param string whether to encode separator or not, currently 'none' or 'html'
* @return string character used for separating url parts usally ; or &
* @access public

53
libraries/user_preferences.lib.php
View File

@ -9,12 +9,6 @@
/**
* Common initialization for user preferences modification pages
*
* @uses ConfigFile::getInstance()
* @uses ConfigFile::resetConfigData()
* @uses ConfigFile::setAllowedKeys()
* @uses ConfigFile::setCfgUpdateReadMapping()
* @uses ConfigFile::updateWithGlobalConfig()
* @uses PMA_read_userprefs_fieldnames()
*/
function PMA_userprefs_pageinit()
{
@ -36,14 +30,6 @@ function PMA_userprefs_pageinit()
* * mtime - last modification time
* * type - 'db' (config read from pmadb) or 'session' (read from user session)
*
* @uses $_SESSION['userconfig']
* @uses $GLOBALS['controllink']
* @uses PMA_array_merge_recursive
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_single_row()
* @uses PMA_getRelationsParam()
* @uses PMA_sqlAddslashes()
* @uses $GLOBALS['controllink']
* @return array
*/
function PMA_load_userprefs()
@ -66,7 +52,7 @@ function PMA_load_userprefs()
$query = '
SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts
FROM ' . $query_table . '
WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\'';
$row = PMA_DBI_fetch_single_row($query, 'ASSOC', $GLOBALS['controllink']);
return array(
@ -78,22 +64,6 @@ function PMA_load_userprefs()
/**
* Saves user preferences
*
* @uses $_SESSION['cache'][...]['userprefs']
* @uses $_SESSION['userconfig']
* @uses $GLOBALS['cfg']['ServerDefault']
* @uses $GLOBALS['controllink']
* @uses $GLOBALS['server']
* @uses ConfigFile::getConfigArray()
* @uses ConfigFile::getInstance()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_value
* @uses PMA_DBI_getError()
* @uses PMA_DBI_try_query()
* @uses PMA_Message::addMessage()
* @uses PMA_Message::error()
* @uses PMA_Message::rawError()
* @uses PMA_sqlAddslashes()
* @uses PMA_getRelationsParam()
* @param array $config_data
* @return true|PMA_Message
*/
@ -120,20 +90,20 @@ function PMA_save_userprefs(array $config_array)
$query = '
SELECT `username`
FROM ' . $query_table . '
WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\'';
$has_config = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']);
$config_data = json_encode($config_array);
if ($has_config) {
$query = '
UPDATE ' . $query_table . '
SET `config_data` = \'' . PMA_sqlAddslashes($config_data) . '\'
WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\'';
SET `config_data` = \'' . PMA_sqlAddSlashes($config_data) . '\'
WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\'';
} else {
$query = '
INSERT INTO ' . $query_table . ' (`username`, `config_data`)
VALUES (\'' . PMA_sqlAddslashes($cfgRelation['user']) . '\',
\'' . PMA_sqlAddslashes($config_data) . '\')';
VALUES (\'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\',
\'' . PMA_sqlAddSlashes($config_data) . '\')';
}
if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
unset($_SESSION['cache'][$cache_key]['userprefs']);
@ -151,8 +121,6 @@ function PMA_save_userprefs(array $config_array)
* Returns a user preferences array filtered by $cfg['UserprefsDisallow']
* (blacklist) and keys from user preferences form (whitelist)
*
* @uses PMA_array_write()
* @uses PMA_read_userprefs_fieldnames()
* @param array $config_data path => value pairs
* @return array
*/
@ -217,8 +185,6 @@ function PMA_read_userprefs_fieldnames(array $forms = null)
*
* No validation is done!
*
* @uses PMA_load_userprefs()
* @uses PMA_save_userprefs()
* @param string $cfg_name
* @param mixed $value
* @return void
@ -241,10 +207,6 @@ function PMA_persist_option($path, $value, $default_value)
/**
* Redirects after saving new user preferences
*
* @uses ConfigFile::getConfigArray()
* @uses ConfigFile::getInstance()
* @uses PMA_generate_common_url()
* @uses PMA_sendHeaderLocation()
* @param array $forms
* @param array $old_settings
* @param string $file_name
@ -287,9 +249,6 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
/**
* Shows form which allows to quickly load settings stored in browser's local storage
*
* @uses $_REQUEST['prefs_autoload']
* @uses $_SESSION['userprefs_autoload']
* @uses PMA_generate_common_hidden_inputs()
*/
function PMA_userprefs_autoload_header()
{

55
navigation.php
View File

@ -4,34 +4,6 @@
* the navigation frame - displays server, db and table selection tree
*
* @package phpMyAdmin
* @uses $GLOBALS['pma']->databases
* @uses $GLOBALS['server']
* @uses $GLOBALS['db']
* @uses $GLOBALS['table']
* @uses $GLOBALS['available_languages']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['LeftFrameLight']
* @uses $GLOBALS['cfg']['ShowTooltip']
* @uses $GLOBALS['cfg']['ShowTooltipAliasDB']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['cfgRelation']['commwork']) {
* @uses PMA_List_Database::getSingleItem()
* @uses PMA_List_Database::getHtmlSelectGrouped()
* @uses PMA_List_Database::getGroupedDetails()
* @uses PMA_generate_common_url()
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_getDbComment();
* @uses PMA_getTableCount()
* @uses PMA_getTableList()
* @uses PMA_getRelationsParam()
* @uses PMA_outBufferPre()
* @uses strlen()
* @uses session_write_close()
* @uses is_array()
* @uses implode()
* @uses htmlspecialchars()
*/
/**
@ -42,8 +14,6 @@ require_once './libraries/common.inc.php';
/**
* finish and cleanup navigation.php script execution, only to be used in navigation.php
*
* @uses $GLOBALS['controllink'] to close it
* @uses $GLOBALS['userlink'] to close it
* @access private
*/
function PMA_exitNavigationFrame()
@ -354,15 +324,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
/**
* displays collapsable db list
*
* @uses $_REQUEST['dbgroup']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses strpos()
* @uses urlencode()
* @uses printf()
* @uses htmlspecialchars()
* @uses PMA_generate_common_url()
* @uses PMA_getTableList()
* @uses PMA_displayTableList()
* @global integer $element_counter
* @global string $img_minus
* @global string $img_plus
@ -532,22 +493,6 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
* calls itself recursively if table in given list
* is a list itself
*
* @uses is_array()
* @uses count()
* @uses urlencode()
* @uses strpos()
* @uses printf()
* @uses htmlspecialchars()
* @uses strlen()
* @uses is_array()
* @uses PMA_displayTableList()
* @uses $_REQUEST['tbl_group']
* @uses $GLOBALS['common_url_query']
* @uses $GLOBALS['table']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['LeftFrameTableSeparator']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['cfg']['DefaultTabTable']
* @global integer the element counter
* @global string html code for '-' image
* @global string html code for '+' image

47
pmd_common.php
View File

@ -23,16 +23,6 @@ $GLOBALS['script_display_field'] =
/**
* retrieves table info and stores it in $GLOBALS['PMD']
*
* @uses $GLOBALS['script_display_field']
* @uses $GLOBALS['PMD'] to fill it
* @uses $GLOBALS['db']
* @uses PMA_DBI_get_tables_full()
* @uses PMA_DBI_select_db()
* @uses PMA_getDisplayField()
* @uses urlencode()
* @uses htmlspecialchars()
* @uses strtoupper()
* @uses urlencode()
*/
function get_tabs()
{
@ -78,13 +68,6 @@ function get_tabs()
/**
* retrieves table column info
*
* @uses $GLOBALS['db']
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_select_db()
* @uses PMA_DBI_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_backquote()
* @uses count()
* @return array table column nfo
*/
function get_tab_info()
@ -108,16 +91,6 @@ function get_tab_info()
/**
* returns JavaScript code for intializing vars
*
* @uses $GLOBALS['db']
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_DBI_select_db()
* @uses PMA_DBI_query()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_row()
* @uses PMA_getForeigners()
* @uses urlencode()
* @uses count()
* @uses in_array()
* @return string JavaScript code
*/
function get_script_contr()
@ -184,7 +157,6 @@ function get_script_contr()
}
/**
* @uses get_all_keys()
* @return array unique or primary indizes
*/
function get_pk_or_unique_keys()
@ -195,10 +167,6 @@ function get_pk_or_unique_keys()
/**
* returns all indizes
*
* @uses $GLOBALS['PMD']
* @uses PMA_Index::getFromTable()
* @uses PMA_Index->isUnique()
* @uses PMA_Index->getColumns()
* @param boolean whether to include ony unique ones
* @return array indizes
*/
@ -227,9 +195,6 @@ function get_all_keys($unique_only = false)
/**
*
*
* @uses $GLOBALS['PMD']
* @uses count()
* @uses in_array()
* @return array ???
*/
function get_script_tabs()
@ -251,15 +216,6 @@ function get_script_tabs()
}
/**
* @uses $GLOBALS['controllink']
* @uses $cfgRelation['designerwork']
* @uses $cfgRelation['db']
* @uses $cfgRelation['designer_coords']
* @uses PMA_DBI_QUERY_STORE
* @uses PMA_getRelationsParam()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_result()
* @uses count()
* @return array table positions and sizes
*/
function get_tab_pos()
@ -284,9 +240,6 @@ function get_tab_pos()
/**
* returns distinct values from $GLOBALS['PMD']['OWNER']
*
* @uses array_values()
* @uses array_unique()
* @uses $GLOBALS['PMD']['OWNER']
* @return array owner
*/
function get_owners()

16
pmd_display_field.php
View File

@ -19,21 +19,21 @@ if ($cfgRelation['displaywork']) {
if ($disp) {
if ($display_field != $disp) {
$upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' SET display_field = \'' . PMA_sqlAddslashes($display_field) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' SET display_field = \'' . PMA_sqlAddSlashes($display_field) . '\''
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
} else {
$upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'';
}
} elseif ($display_field != '') {
$upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info'])
. '(db_name, table_name, display_field) '
. ' VALUES('
. '\'' . PMA_sqlAddslashes($db) . '\','
. '\'' . PMA_sqlAddslashes($table) . '\','
. '\'' . PMA_sqlAddslashes($display_field) . '\')';
. '\'' . PMA_sqlAddSlashes($db) . '\','
. '\'' . PMA_sqlAddSlashes($table) . '\','
. '\'' . PMA_sqlAddSlashes($display_field) . '\')';
}
if (isset($upd_query)) {

10
pmd_pdf.php
View File

@ -22,7 +22,7 @@ if (isset($mode)) {
$pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']);
$pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']);
$scale_q = PMA_sqlAddslashes($scale);
$scale_q = PMA_sqlAddSlashes($scale);
if ('create_export' == $mode) {
/*
@ -38,10 +38,10 @@ if (isset($mode)) {
}
}
$pdf_page_number_q = PMA_sqlAddslashes($pdf_page_number);
$pdf_page_number_q = PMA_sqlAddSlashes($pdf_page_number);
if ('export' == $mode) {
$sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddslashes($db) . "'";
$sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddSlashes($db) . "'";
PMA_query_as_controluser($sql,true,PMA_DBI_QUERY_STORE);
}
@ -56,7 +56,7 @@ if (isset($mode)) {
AND
' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name`
AND
' . $pmd_table . '.`db_name`=\''. PMA_sqlAddslashes($db) .'\'
' . $pmd_table . '.`db_name`=\''. PMA_sqlAddSlashes($db) .'\'
AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE);
}
}
@ -83,7 +83,7 @@ $choices = array();
$table_info_result = PMA_query_as_controluser('SELECT * FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'');
. ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'');
if (PMA_DBI_num_rows($table_info_result) > 0) {
echo '<p>' . __('Page') . ':';

12
pmd_relation_new.php
View File

@ -73,12 +73,12 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
$q = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
. '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)'
. ' values('
. '\'' . PMA_sqlAddslashes($db) . '\', '
. '\'' . PMA_sqlAddslashes($T2) . '\', '
. '\'' . PMA_sqlAddslashes($F2) . '\', '
. '\'' . PMA_sqlAddslashes($db) . '\', '
. '\'' . PMA_sqlAddslashes($T1) . '\','
. '\'' . PMA_sqlAddslashes($F1) . '\')';
. '\'' . PMA_sqlAddSlashes($db) . '\', '
. '\'' . PMA_sqlAddSlashes($T2) . '\', '
. '\'' . PMA_sqlAddSlashes($F2) . '\', '
. '\'' . PMA_sqlAddSlashes($db) . '\', '
. '\'' . PMA_sqlAddSlashes($T1) . '\','
. '\'' . PMA_sqlAddSlashes($F1) . '\')';
if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) {
PMD_return_new(1, __('Internal relation added'));

12
pmd_relation_upd.php
View File

@ -44,12 +44,12 @@ if ($try_to_delete_internal_relation) {
PMA_query_as_controluser('DELETE FROM '
. PMA_backquote($GLOBALS['cfgRelation']['db']) . '.'
. $cfg['Server']['relation'].' WHERE '
. 'master_db = \'' . PMA_sqlAddslashes($DB2) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($T2) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($F2) . '\''
. ' AND foreign_db = \'' . PMA_sqlAddslashes($DB1) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddslashes($T1) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\''
. 'master_db = \'' . PMA_sqlAddSlashes($DB2) . '\''
. ' AND master_table = \'' . PMA_sqlAddSlashes($T2) . '\''
. ' AND master_field = \'' . PMA_sqlAddSlashes($F2) . '\''
. ' AND foreign_db = \'' . PMA_sqlAddSlashes($DB1) . '\''
. ' AND foreign_table = \'' . PMA_sqlAddSlashes($T1) . '\''
. ' AND foreign_field = \'' . PMA_sqlAddSlashes($F1) . '\''
, false, PMA_DBI_QUERY_STORE);
}
PMD_return_upd(1, __('Relation deleted'));

16
pmd_save_pos.php
View File

@ -20,18 +20,18 @@ foreach ($t_x as $key => $value) {
$KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp)
list($DB,$TAB) = explode(".", $KEY);
PMA_query_as_controluser('DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . '
WHERE `db_name` = \'' . PMA_sqlAddslashes($DB) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE);
WHERE `db_name` = \'' . PMA_sqlAddSlashes($DB) . '\'
AND `table_name` = \'' . PMA_sqlAddSlashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE);
PMA_query_as_controluser('INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . '
(db_name, table_name, x, y, v, h)
VALUES ('
. '\'' . PMA_sqlAddslashes($DB) . '\', '
. '\'' . PMA_sqlAddslashes($TAB) . '\', '
. '\'' . PMA_sqlAddslashes($t_x[$key]) . '\', '
. '\'' . PMA_sqlAddslashes($t_y[$key]) . '\', '
. '\'' . PMA_sqlAddslashes($t_v[$key]) . '\', '
. '\'' . PMA_sqlAddslashes($t_h[$key]) . '\''
. '\'' . PMA_sqlAddSlashes($DB) . '\', '
. '\'' . PMA_sqlAddSlashes($TAB) . '\', '
. '\'' . PMA_sqlAddSlashes($t_x[$key]) . '\', '
. '\'' . PMA_sqlAddSlashes($t_y[$key]) . '\', '
. '\'' . PMA_sqlAddSlashes($t_v[$key]) . '\', '
. '\'' . PMA_sqlAddSlashes($t_h[$key]) . '\''
. ')', true, PMA_DBI_QUERY_STORE);
}
//----------------------------------------------------------------------------

1020
po/af.po
View File

File diff suppressed because it is too large Load Diff

1286
po/ar.po
View File

File diff suppressed because it is too large Load Diff

1020
po/az.po
View File

File diff suppressed because it is too large Load Diff

1062
po/be.po
View File

File diff suppressed because it is too large Load Diff

1068
po/be@latin.po
View File

File diff suppressed because it is too large Load Diff

1018
po/bg.po
View File

File diff suppressed because it is too large Load Diff

1052
po/bn.po
View File

File diff suppressed because it is too large Load Diff

1308
po/br.po
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More