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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-03-19 05:00:51 +01:00
commit 4fd8e15cb8
217 changed files with 2019 additions and 1708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
+ Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
+ Patch #3498201 Contest-6: Export all privileges
+ Patch #3502814 for rfe #3187077 Change password buttons should match
+ rfe #3488640 Expand table-group in non-light navigation frame if only one
3.5.0.0 (not yet released)
+ rfe #2021981 [interface] Add support for mass prefix change.

792
Documentation.html
View File

File diff suppressed because it is too large Load Diff

20
browse_foreigners.php
View File

@ -9,19 +9,19 @@
/**
* Gets a core script and starts output buffering work
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
PMA_checkParameters(array('db', 'table', 'field'));
require_once './libraries/ob.lib.php';
require_once 'libraries/ob.lib.php';
PMA_outBufferPre();
require_once './libraries/header_http.inc.php';
require_once 'libraries/header_http.inc.php';
/**
* Displays the frame
*/
require_once './libraries/transformations.lib.php'; // Transformations
require_once 'libraries/transformations.lib.php'; // Transformations
$cfgRelation = PMA_getRelationsParam();
$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);
@ -72,21 +72,17 @@ if (is_array($foreignData['disp_row'])) {
}
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?php echo $available_languages[$lang][1]; ?>"
lang="<?php echo $available_languages[$lang][1]; ?>"
dir="<?php echo $text_dir; ?>">
<!DOCTYPE HTML>
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
<head>
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8" />
<link rel="stylesheet" type="text/css"
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php
// includes everything asked for by libraries/common.inc.php
require_once './libraries/header_scripts.inc.php';
require_once 'libraries/header_scripts.inc.php';
?>
<script type="text/javascript">
//<![CDATA[

22
changelog.php
View File

@ -9,7 +9,7 @@
/**
* Gets core libraries and defines some variables
*/
require './libraries/common.inc.php';
require 'libraries/common.inc.php';
$filename = CHANGELOG_FILE;
@ -99,16 +99,14 @@ $replaces = array(
);
header('Content-type: text/html; charset=utf-8');
echo '<?xml version="1.0" encoding="utf-8"?'.'>';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<!DOCTYPE HTML>
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<title>phpMyAdmin - ChangeLog</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title>phpMyAdmin - ChangeLog</title>
<meta charset="utf-8" />
</head>
<body>
<h1>phpMyAdmin - ChangeLog</h1>
@ -117,5 +115,11 @@ echo '<pre>';
echo preg_replace(array_keys($replaces), $replaces, $changelog);
echo '</pre>';
?>
<script type="text/javascript">
var links = document.getElementsByTagName("a");
for(var i = 0; i < links.length; i++) {
links[i].target = "_blank";
}
</script>
</body>
</html>

6
chk_rel.php
View File

@ -8,8 +8,8 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once './libraries/header.inc.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/header.inc.php';
/**
@ -21,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(true);
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

16
db_create.php
View File

@ -8,15 +8,15 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
if (!PMA_DRIZZLE) {
include_once './libraries/replication.inc.php';
include_once 'libraries/replication.inc.php';
}
require './libraries/build_html_for_db.lib.php';
require 'libraries/build_html_for_db.lib.php';
/**
* Sets globals from $_POST
@ -67,8 +67,8 @@ if (! $result) {
PMA_ajaxResponse($message, false);
}
include_once './libraries/header.inc.php';
include_once './main.php';
include_once 'libraries/header.inc.php';
include_once 'main.php';
} else {
$message = PMA_Message::success(__('Database %1$s has been created.'));
$message->addParam($new_db);
@ -138,7 +138,7 @@ if (! $result) {
PMA_ajaxResponse($message, true, $extra_data);
}
include_once './libraries/header.inc.php';
include_once './' . $cfg['DefaultTabDatabase'];
include_once 'libraries/header.inc.php';
include_once '' . $cfg['DefaultTabDatabase'];
}
?>

12
db_datadict.php
View File

@ -8,11 +8,11 @@
/**
* Gets the variables sent or posted to this script, then displays headers
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
if (! isset($selected_tbl)) {
include './libraries/db_common.inc.php';
include './libraries/db_info.inc.php';
include 'libraries/db_common.inc.php';
include 'libraries/db_info.inc.php';
}
@ -21,7 +21,7 @@ if (! isset($selected_tbl)) {
*/
$cfgRelation = PMA_getRelationsParam();
require_once './libraries/transformations.lib.php';
require_once 'libraries/transformations.lib.php';
/**
@ -228,7 +228,7 @@ foreach ($tables as $table) {
}
?>
</td>
<td<?php echo $type_nowrap; ?> xml:lang="en" dir="ltr"><?php echo $type; ?></td>
<td<?php echo $type_nowrap; ?> lang="en" dir="ltr"><?php echo $type; ?></td>
<?php /* <td<?php echo $type_nowrap; ?>><?php echo $attribute; ?></td>*/ ?>
<td><?php echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); ?></td>
<td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
@ -271,5 +271,5 @@ foreach ($tables as $table) {
*/
PMA_printButton();
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

8
db_events.php
View File

@ -9,8 +9,8 @@
/**
* Include required files
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/common.lib.php';
/**
* Include JavaScript libraries
@ -25,12 +25,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files
*/
require_once './libraries/rte/rte_events.lib.php';
require_once 'libraries/rte/rte_events.lib.php';
/**
* Do the magic
*/
$_PMA_RTE = 'EVN';
require_once './libraries/rte/rte_main.inc.php';
require_once 'libraries/rte/rte_main.inc.php';
?>

12
db_export.php
View File

@ -9,16 +9,16 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'export.js';
// $sub_part is also used in db_info.inc.php to see if we are coming from
// db_export.php, in which case we don't obey $cfg['MaxTableList']
$sub_part = '_export';
require_once './libraries/db_common.inc.php';
require_once 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_export.php';
require_once './libraries/db_info.inc.php';
require_once 'libraries/db_info.inc.php';
/**
* Displays the form
@ -28,7 +28,7 @@ $export_page_title = __('View dump (schema) of database');
// exit if no tables in db found
if ($num_tables < 1) {
PMA_Message::error(__('No tables found in database.'))->display();
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
exit;
} // end if
@ -77,10 +77,10 @@ $multi_values .= "\n";
$multi_values .= '</select></div>';
$export_type = 'database';
require_once './libraries/display_export.lib.php';
require_once 'libraries/display_export.lib.php';
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

10
db_import.php
View File

@ -8,22 +8,22 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'import.js';
/**
* Gets tables informations and displays top links
*/
require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php';
require 'libraries/db_common.inc.php';
require 'libraries/db_info.inc.php';
$import_type = 'database';
require './libraries/display_import.lib.php';
require 'libraries/display_import.lib.php';
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

18
db_operations.php
View File

@ -15,8 +15,8 @@
/**
* requirements
*/
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';
// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
@ -129,7 +129,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$views = array();
// remove all foreign key constraints, otherwise we can get errors
include_once './libraries/export/sql.php';
include_once 'libraries/export/sql.php';
foreach ($tables_full as $each_table => $tmp) {
$sql_constraints = '';
$sql_drop_foreign_keys = '';
@ -289,7 +289,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
/**
* cleanup pmadb stuff for this db
*/
include_once './libraries/relation_cleanup.lib.php';
include_once 'libraries/relation_cleanup.lib.php';
PMA_relationsCleanupDatabase($db);
// if someday the RENAME DATABASE reappears, do not DROP
@ -355,12 +355,12 @@ if (isset($_REQUEST['comment'])) {
* because there is no table in the database ($is_info is true)
*/
if (empty($is_info)) {
include './libraries/db_common.inc.php';
include 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_operations.php';
// Gets the database structure
$sub_part = '_structure';
include './libraries/db_info.inc.php';
include 'libraries/db_info.inc.php';
echo "\n";
if (isset($message)) {
@ -403,7 +403,7 @@ if (!$is_information_schema) {
}
?>
<div class="operations_half_width">
<?php include './libraries/display_create_table.lib.php'; ?>
<?php include 'libraries/display_create_table.lib.php'; ?>
</div>
<?php
/**
@ -558,7 +558,7 @@ echo __('Remove database');
if ($GLOBALS['cfg']['AjaxEnable']) {
echo ' class="ajax" ';
}
echo 'method="post" action="./db_operations.php">'
echo 'method="post" action="db_operations.php">'
. PMA_generate_common_hidden_inputs($db, $table)
. '<fieldset>' . "\n"
. ' <legend>';
@ -618,5 +618,5 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

32
db_printview.php
View File

@ -8,13 +8,13 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/**
* Gets the variables sent or posted to this script, then displays headers
*/
$print_view = true;
require_once './libraries/header.inc.php';
require_once 'libraries/header.inc.php';
PMA_checkParameters(array('db'));
@ -130,7 +130,7 @@ if ($num_tables == 0) {
if (isset($sts_data['TABLE_ROWS'])) {
?>
<td align="right">
<td class="right">
<?php
if ($merged_size) {
echo '<i>' . PMA_formatNumber($sts_data['TABLE_ROWS'], 0) . '</i>' . "\n";
@ -148,14 +148,14 @@ if ($num_tables == 0) {
$sum_size += $tblsize;
list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 1);
?>
<td align="right" nowrap="nowrap">
<td class="right" nowrap="nowrap">
<?php echo $formated_size . ' ' . $unit; ?>
</td>
<?php
} // end if
} else {
?>
<td colspan="3" align="center">
<td colspan="3" class="center">
<?php echo __('in use'); ?>
</td>
<?php
@ -181,8 +181,8 @@ if ($num_tables == 0) {
if (! empty($sts_data['Create_time'])) {
?>
<tr>
<td align="right"><?php echo __('Creation') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
<td class="right"><?php echo __('Creation') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
</tr>
<?php
}
@ -190,8 +190,8 @@ if ($num_tables == 0) {
if (! empty($sts_data['Update_time'])) {
?>
<tr>
<td align="right"><?php echo __('Last update') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
<td class="right"><?php echo __('Last update') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
</tr>
<?php
}
@ -199,8 +199,8 @@ if ($num_tables == 0) {
if (! empty($sts_data['Check_time'])) {
?>
<tr>
<td align="right"><?php echo __('Last check') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
<td class="right"><?php echo __('Last check') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
</tr>
<?php
}
@ -215,20 +215,20 @@ if ($num_tables == 0) {
}
?>
<tr>
<th align="center">
<th class="center">
<?php echo sprintf(_ngettext('%s table', '%s tables', $num_tables), PMA_formatNumber($num_tables, 0)); ?>
</th>
<th align="right" nowrap="nowrap">
<th class="right" nowrap="nowrap">
<?php echo PMA_formatNumber($sum_entries, 0); ?>
</th>
<th align="center">
<th class="center">
--
</th>
<?php
if ($cfg['ShowStats']) {
list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1);
?>
<th align="right" nowrap="nowrap">
<th class="right" nowrap="nowrap">
<?php echo $sum_formated . ' ' . $unit; ?>
</th>
<?php
@ -248,5 +248,5 @@ PMA_printButton();
echo "<div id='PMA_disable_floating_menubar'></div>\n";
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

42
db_qbe.php
View File

@ -9,7 +9,7 @@
/**
* requirements
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/**
* Gets the relation settings
@ -26,16 +26,16 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
$message_to_display = true;
} else {
$goto = 'db_sql.php';
include './sql.php';
include 'sql.php';
exit;
}
}
$sub_part = '_qbe';
require './libraries/db_common.inc.php';
require 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_qbe.php';
$url_params['goto'] = 'db_qbe.php';
require './libraries/db_info.inc.php';
require 'libraries/db_info.inc.php';
if ($message_to_display) {
PMA_Message::error(__('You have to choose at least one column to display'))->display();
@ -99,7 +99,7 @@ $tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';',
$tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
if (0 == $tbl_result_cnt) {
PMA_Message::error(__('No tables found in database.'))->display();
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
exit;
}
@ -146,7 +146,7 @@ $realwidth = $form_column_width . 'ex';
function showColumnSelectCell($columns, $column_number, $selected = '')
{
?>
<td align="center">
<td class="center">
<select name="Field[<?php echo $column_number; ?>]" size="1">
<option value="">&nbsp;</option>
<?php
@ -225,7 +225,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value="">&nbsp;</option>
<option value="ASC"><?php echo __('Ascending'); ?></option>
@ -241,7 +241,7 @@ for ($x = 0; $x < $col; $x++) {
continue;
}
?>
<td align="center">
<td class="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value="">&nbsp;</option>
<?php
@ -289,7 +289,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<input type="checkbox" name="Show[<?php echo $z; ?>]" />
</td>
<?php
@ -307,7 +307,7 @@ for ($x = 0; $x < $col; $x++) {
$checked = '';
}
?>
<td align="center">
<td class="center">
<input type="checkbox" name="Show[<?php echo $z; ?>]"<?php echo $checked; ?> />
</td>
<?php
@ -325,7 +325,7 @@ $z = 0;
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<input type="text" name="criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
@ -346,7 +346,7 @@ for ($x = 0; $x < $col; $x++) {
$curCriteria[$z] = $prev_criteria[$x];
}
?>
<td align="center">
<td class="center">
<input type="hidden" name="prev_criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($curCriteria[$z]); ?>" />
<input type="text" name="criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($tmp_criteria); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
@ -405,7 +405,7 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
@ -418,7 +418,7 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
@ -451,7 +451,7 @@ for ($y = 0; $y <= $row; $y++) {
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<!-- Row controls -->
<table border="0" cellpadding="0" cellspacing="0">
<table cellpadding="0" cellspacing="0">
<tr>
<td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<small><?php echo __('Ins'); ?>:</small>
@ -485,7 +485,7 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
@ -506,7 +506,7 @@ for ($y = 0; $y <= $row; $y++) {
$tmp_or = '';
}
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $w . '[' . $z . ']'; ?>" value="<?php echo htmlspecialchars($tmp_or); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
@ -540,7 +540,7 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = '';
}
?>
<td align="center">
<td class="center">
<strong><?php echo __('Or'); ?>:</strong>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
@ -571,7 +571,7 @@ for ($x = 0; $x < $col; $x++) {
$chk['or'] = '';
}
?>
<td align="center">
<td class="center">
<strong><?php echo __('Or'); ?>:</strong>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
@ -600,7 +600,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
?>
</fieldset>
<fieldset class="tblFooters">
<table border="0" cellpadding="2" cellspacing="1">
<table cellpadding="2" cellspacing="1">
<tr>
<td nowrap="nowrap">
<?php echo __('Add/Delete criteria rows'); ?>:
@ -962,5 +962,5 @@ if (!empty($qry_orderby)) {
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

14
db_routines.php
View File

@ -9,13 +9,13 @@
/**
* Include required files
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
if (PMA_DRIZZLE) {
include_once './libraries/data_drizzle.inc.php';
include_once 'libraries/data_drizzle.inc.php';
} else {
include_once './libraries/data_mysql.inc.php';
include_once 'libraries/data_mysql.inc.php';
}
/**
@ -31,12 +31,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files
*/
require_once './libraries/rte/rte_routines.lib.php';
require_once 'libraries/rte/rte_routines.lib.php';
/**
* Do the magic
*/
$_PMA_RTE = 'RTN';
require_once './libraries/rte/rte_main.inc.php';
require_once 'libraries/rte/rte_main.inc.php';
?>

16
db_search.php
View File

@ -11,7 +11,7 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'db_search.js';
$GLOBALS['js_include'][] = 'sql.js';
@ -21,7 +21,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js';
/**
* Gets some core libraries and send headers
*/
require './libraries/db_common.inc.php';
require 'libraries/db_common.inc.php';
/**
* init
@ -94,7 +94,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
$sub_part = '';
if ( $GLOBALS['is_ajax_request'] != true) {
include './libraries/db_info.inc.php';
include 'libraries/db_info.inc.php';
echo '<div id="searchresults">';
}
@ -278,7 +278,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
<td><input type="text" name="search_str" size="60"
value="<?php echo $searched; ?>" /></td>
</tr>
<tr><td align="right" valign="top">
<tr><td class="right" valign="top">
<?php echo __('Find:'); ?></td>
<td><?php
@ -296,7 +296,7 @@ unset($choices);
?>
</td>
</tr>
<tr><td align="right" valign="top">
<tr><td class="right" valign="top">
<?php echo __('Inside tables:'); ?></td>
<td rowspan="2">
<?php
@ -323,10 +323,10 @@ $alter_select
?>
</td>
</tr>
<tr><td align="right" valign="bottom">
<tr><td class="right" valign="bottom">
<?php echo $alter_select; ?></td>
</tr>
<tr><td align="right">
<tr><td class="right">
<?php echo __('Inside column:'); ?></td>
<td><input type="text" name="field_str" size="60"
value="<?php echo ! empty($field_str) ? htmlspecialchars($field_str) : ''; ?>" /></td>
@ -357,5 +357,5 @@ $alter_select
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

12
db_sql.php
View File

@ -8,7 +8,7 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/**
* Runs common work
@ -19,8 +19,8 @@ $GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
require './libraries/db_common.inc.php';
require_once './libraries/sql_query_form.lib.php';
require 'libraries/db_common.inc.php';
require_once 'libraries/sql_query_form.lib.php';
// After a syntax error, we return to this script
// with the typed query in the textarea.
@ -45,11 +45,11 @@ foreach ($get_params as $one_get_param) {
* Gets informations about the database and, if it is empty, move to the
* "db_structure.php" script where table can be created
*/
require './libraries/db_info.inc.php';
require 'libraries/db_info.inc.php';
if ($num_tables == 0 && empty($db_query_force)) {
$sub_part = '';
$is_info = true;
include './db_structure.php';
include 'db_structure.php';
exit();
}
@ -61,5 +61,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

70
db_structure.php
View File

@ -8,7 +8,7 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'db_structure.js';
@ -16,6 +16,24 @@ $GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
/**
* Sets globals from $_POST
*/
$post_params = array(
'error',
'is_info',
'message',
'mult_btn',
'selected_tbl',
'submit_mult'
);
foreach ($post_params as $one_post_param) {
if (isset($_POST[$one_post_param])) {
$GLOBALS[$one_post_param] = $_POST[$one_post_param];
}
}
/**
* Prepares the tables list if the user where not redirected to this script
* because there is no table in the database ($is_info is true)
@ -33,33 +51,33 @@ if (empty($is_info)) {
// -> db_structure.php and if we got an error on the multi submit,
// we must display it here and not call again mult_submits.inc.php
if (! isset($error) || false === $error) {
include './libraries/mult_submits.inc.php';
include 'libraries/mult_submits.inc.php';
}
if (empty($message)) {
$message = PMA_Message::success();
}
}
include './libraries/db_common.inc.php';
include 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_structure.php';
// Gets the database structure
$sub_part = '_structure';
include './libraries/db_info.inc.php';
include 'libraries/db_info.inc.php';
if (!PMA_DRIZZLE) {
include_once './libraries/replication.inc.php';
include_once 'libraries/replication.inc.php';
} else {
$server_slave_status = false;
}
}
require_once './libraries/bookmark.lib.php';
require_once 'libraries/bookmark.lib.php';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
$db_collation = PMA_getDbCollation($db);
// in a separate file to avoid redeclaration of functions in some code paths
require_once './libraries/db_structure.lib.php';
require_once 'libraries/db_structure.lib.php';
$titles = PMA_buildActionTitles();
// 1. No tables
@ -68,13 +86,13 @@ if ($num_tables == 0) {
echo '<p>' . __('No tables found in database') . '</p>' . "\n";
if (empty($db_is_information_schema)) {
include './libraries/display_create_table.lib.php';
include 'libraries/display_create_table.lib.php';
} // end if (Create Table dialog)
/**
* Displays the footer
*/
include_once './libraries/footer.inc.php';
include_once 'libraries/footer.inc.php';
exit;
}
@ -390,31 +408,31 @@ foreach ($tables as $keyname => $each_table) {
}
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
<td align="center">
<td class="center">
<input type="checkbox" name="selected_tbl[]"
value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
<th><?php echo $browse_table_label; ?>
<?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
</th>
<?php if ($server_slave_status) { ?><td align="center"><?php
<?php if ($server_slave_status) { ?><td class="center"><?php
echo $ignored
? PMA_getImage('s_cancel.png', 'NOT REPLICATED')
: ''.
$do
? PMA_getImage('s_success.png', 'REPLICATED')
: ''; ?></td><?php } ?>
<td align="center"><?php echo $browse_table; ?></td>
<td align="center">
<td class="center"><?php echo $browse_table; ?></td>
<td class="center">
<a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
<?php echo $titles['Structure']; ?></a></td>
<td align="center"><?php echo $search_table; ?></td>
<td class="center"><?php echo $search_table; ?></td>
<?php if (! $db_is_information_schema) { ?>
<td align="center" class="insert_table">
<td class="insert_table center">
<a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax"' : ''); ?> href="tbl_change.php?<?php echo $tbl_url_query; ?>">
<?php echo $titles['Insert']; ?></a></td>
<td align="center"><?php echo $empty_table; ?></td>
<td align="center">
<td class="center"><?php echo $empty_table; ?></td>
<td class="center">
<a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query;
?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php
echo urlencode($drop_query); ?>&amp;message_to_show=<?php
@ -479,7 +497,7 @@ foreach ($tables as $keyname => $each_table) {
<?php } ?>
<?php } else { ?>
<td colspan="<?php echo ($colspan_for_structure - ($db_is_information_schema ? 5 : 8)) ?>"
align="center">
class="center">
<?php echo __('in use'); ?></td>
<?php } // end if (isset($each_table['TABLE_ROWS'])) else ?>
</tr>
@ -496,7 +514,7 @@ if ($is_show_stats) {
</tbody>
<tbody id="tbl_summary_row">
<tr><th></th>
<th align="center" nowrap="nowrap" class="tbl_num">
<th nowrap="nowrap" class="tbl_num center">
<?php
echo sprintf(
_ngettext('%s table', '%s tables', $num_tables),
@ -509,18 +527,18 @@ if ($is_show_stats) {
echo ' <th>' . __('Replication') . '</th>' . "\n";
}
?>
<th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" align="center">
<th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" class="center">
<?php echo __('Sum'); ?></th>
<th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th>
<?php
if (!($cfg['PropertiesNumColumns'] > 1)) {
$default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1);
echo ' <th align="center">' . "\n"
echo ' <th class="center">' . "\n"
. ' <dfn title="'
. sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine)
. '">' .$default_engine . '</dfn></th>' . "\n";
// we got a case where $db_collation was empty
echo ' <th align="center">' . "\n";
echo ' <th class="center">' . "\n";
if (! empty($db_collation)) {
echo ' <dfn title="'
. PMA_getCollationDescr($db_collation) . ' (' . __('Default') . ')">' . $db_collation
@ -626,16 +644,16 @@ echo '<p>';
echo '<a href="db_printview.php?' . $url_query . '">';
echo PMA_getIcon('b_print.png', __('Print view'), true) . '</a>';
echo '<a href="./db_datadict.php?' . $url_query . '">';
echo '<a href="db_datadict.php?' . $url_query . '">';
echo PMA_getIcon('b_tblanalyse.png', __('Data Dictionary'), true) . '</a>';
echo '</p>';
if (empty($db_is_information_schema)) {
include './libraries/display_create_table.lib.php';
include 'libraries/display_create_table.lib.php';
} // end if (Create Table dialog)
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

14
db_tracking.php
View File

@ -7,7 +7,7 @@
/**
* Run common work
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
//Get some js files needed for Ajax requests
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
@ -17,13 +17,13 @@ $GLOBALS['js_include'][] = 'db_structure.js';
* If we are not in an Ajax request, then do the common work and show the links etc.
*/
if ($GLOBALS['is_ajax_request'] != true) {
include './libraries/db_common.inc.php';
include 'libraries/db_common.inc.php';
}
$url_query .= '&amp;goto=tbl_tracking.php&amp;back=db_tracking.php';
// Get the database structure
$sub_part = '_structure';
require './libraries/db_info.inc.php';
require 'libraries/db_info.inc.php';
// Work to do?
// (here, do not use $_REQUEST['db] as it can be crafted)
@ -48,11 +48,11 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
echo '<p>' . __('No tables found in database.') . '</p>' . "\n";
if (empty($db_is_information_schema)) {
include './libraries/display_create_table.lib.php';
include 'libraries/display_create_table.lib.php';
}
// Display the footer
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
exit;
}
@ -61,7 +61,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
/*
* Display top menu links
*/
require_once './libraries/db_links.inc.php';
require_once 'libraries/db_links.inc.php';
// Prepare statement to get HEAD version
$all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
@ -230,5 +230,5 @@ if (count($data['ddlog']) > 0) {
/**
* Display the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

8
db_triggers.php
View File

@ -9,8 +9,8 @@
/**
* Include required files
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/common.lib.php';
/**
* Include JavaScript libraries
@ -24,12 +24,12 @@ $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files
*/
require_once './libraries/rte/rte_triggers.lib.php';
require_once 'libraries/rte/rte_triggers.lib.php';
/**
* Do the magic
*/
$_PMA_RTE = 'TRI';
require_once './libraries/rte/rte_main.inc.php';
require_once 'libraries/rte/rte_main.inc.php';
?>

6
enum_editor.php
View File

@ -10,9 +10,9 @@
* @package PhpMyAdmin
*/
require_once './libraries/common.inc.php';
require_once './libraries/header_http.inc.php';
require_once './libraries/header_meta_style.inc.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/header_http.inc.php';
require_once 'libraries/header_meta_style.inc.php';
?>
</head>
<body>

6
examples/openid.php
View File

@ -36,12 +36,12 @@ function show_page($contents)
header('Content-Type: text/html; charset=utf-8');
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<!DOCTYPE HTML>
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
<meta charset="utf-8" />
<title>phpMyAdmin OpenID signon example</title>
</head>
<body>

6
examples/signon.php
View File

@ -37,12 +37,12 @@ if (isset($_POST['user'])) {
header('Content-Type: text/html; charset=utf-8');
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<!DOCTYPE HTML>
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
<meta charset="utf-8" />
<title>phpMyAdmin single signon example</title>
</head>
<body>

63
export.php
View File

@ -1,22 +1,31 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Main export hanling code
* Main export handling code
* @package PhpMyAdmin
*/
/**
* Get the variables sent or posted to this script and a core script
*/
require_once './libraries/common.inc.php';
require_once './libraries/zip.lib.php';
require_once './libraries/plugin_interface.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/zip.lib.php';
require_once 'libraries/plugin_interface.lib.php';
/**
* Sets globals from all $_POST (in export.php only)
* Would it not be tiresome to list all export-plugin options here?
*/
foreach ($_POST as $one_post_param => $one_post_value)
{
$GLOBALS[$one_post_param] = $one_post_value;
}
PMA_checkParameters(array('what', 'export_type'));
// Scan plugins
$export_list = PMA_getPlugins(
'./libraries/export/',
'libraries/export/',
array(
'export_type' => $export_type,
'single_table' => isset($single_table)));
@ -75,16 +84,16 @@ if ($_REQUEST['output_format'] == 'astext') {
// Does export require to be into file?
if (isset($export_list[$type]['force_file']) && ! $asfile) {
$message = PMA_Message::error(__('Selected export type has to be saved in file!'));
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include './server_export.php';
include 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include './db_export.php';
include 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include './tbl_export.php';
include 'tbl_export.php';
}
exit();
}
@ -107,7 +116,7 @@ if ($export_type == 'server') {
}
// Get the functions specific to the export type
require './libraries/export/' . PMA_securePath($type) . '.php';
require 'libraries/export/' . PMA_securePath($type) . '.php';
/**
* Increase time limit for script execution and initializes some variables
@ -328,16 +337,16 @@ if ($save_on_server) {
}
}
if (isset($message)) {
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include './server_export.php';
include 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include './db_export.php';
include 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include './tbl_export.php';
include 'tbl_export.php';
}
exit();
}
@ -362,14 +371,14 @@ if (!$save_on_server) {
$num_tables = count($tables);
if ($num_tables == 0) {
$message = PMA_Message::error(__('No tables found in database.'));
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
$active_page = 'db_export.php';
include './db_export.php';
include 'db_export.php';
exit();
}
}
$backup_cfgServer = $cfg['Server'];
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
$cfg['Server'] = $backup_cfgServer;
unset($backup_cfgServer);
echo "\n" . '<div align="' . $cell_align_left . '">' . "\n";
@ -426,7 +435,7 @@ do {
$cfgRelation = PMA_getRelationsParam();
}
if ($do_mime) {
include_once './libraries/transformations.lib.php';
include_once 'libraries/transformations.lib.php';
}
// Include dates in export?
@ -611,16 +620,16 @@ do {
// End of fake loop
if ($save_on_server && isset($message)) {
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include './server_export.php';
include 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include './db_export.php';
include 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include './tbl_export.php';
include 'tbl_export.php';
}
exit();
}
@ -665,16 +674,16 @@ if (!empty($asfile)) {
$message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
}
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
if ($export_type == 'server') {
$active_page = 'server_export.php';
include_once './server_export.php';
include_once 'server_export.php';
} elseif ($export_type == 'database') {
$active_page = 'db_export.php';
include_once './db_export.php';
include_once 'db_export.php';
} else {
$active_page = 'tbl_export.php';
include_once './tbl_export.php';
include_once 'tbl_export.php';
}
exit();
} else {
@ -715,6 +724,6 @@ if (!empty($asfile)) {
//]]>
</script>
<?php
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
} // end if
?>

2
file_echo.php
View File

@ -7,7 +7,7 @@
* @package PhpMyAdmin
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/* For chart exporting */
if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {

12
gis_data_editor.php
View File

@ -1,11 +1,11 @@
<?php
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
include_once './libraries/header_http.inc.php';
include_once './libraries/header_meta_style.inc.php';
include_once 'libraries/header_http.inc.php';
include_once 'libraries/header_meta_style.inc.php';
}
require_once './libraries/gis/pma_gis_factory.php';
require_once './libraries/gis_visualization.lib.php';
require_once 'libraries/gis/pma_gis_factory.php';
require_once 'libraries/gis_visualization.lib.php';
// Get data if any posted
$gis_data = array();
@ -336,6 +336,6 @@ if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

55
import.php
View File

@ -9,8 +9,8 @@
/**
* Get the variables sent or posted to this script and a core script
*/
require_once './libraries/common.inc.php';
//require_once './libraries/display_import_functions.lib.php';
require_once 'libraries/common.inc.php';
//require_once 'libraries/display_import_functions.lib.php';
if (isset($_REQUEST['show_as_php'])) {
$GLOBALS['show_as_php'] = $_REQUEST['show_as_php'];
@ -21,12 +21,20 @@ if (isset($_REQUEST['show_as_php'])) {
*/
$post_params = array(
'action_bookmark',
'allow_interrupt',
'bkm_label',
'bookmark_variable',
'charset_of_file',
'format',
'id_bookmark',
'import_type',
'is_js_confirmed',
'message_to_show'
'MAX_FILE_SIZE',
'message_to_show',
'noplugin',
'skip_queries'
);
foreach ($post_params as $one_post_param) {
if (isset($_POST[$one_post_param])) {
$GLOBALS[$one_post_param] = $_POST[$one_post_param];
@ -74,7 +82,7 @@ if (!empty($sql_query)) {
// upload limit has been reached, let's assume the second possibility.
;
if ($_POST == array() && $_GET == array()) {
include_once './libraries/header.inc.php';
include_once 'libraries/header.inc.php';
$message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
$message->addParam('[a@./Documentation.html#faq1_16@_blank]');
$message->addParam('[/a]');
@ -84,7 +92,24 @@ if ($_POST == array() && $_GET == array()) {
$_SESSION['Import_message']['go_back_url'] = $goto;
$message->display();
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
}
/**
* Sets globals from $_POST patterns, for import plugins
* We only need to load the selected plugin
*/
$post_patterns = array(
'/^force_file_/',
'/^'. $format . '_/'
);
foreach (array_keys($_POST) as $post_key) {
foreach ($post_patterns as $one_post_pattern) {
if (preg_match($one_post_pattern, $post_key)) {
$GLOBALS[$post_key] = $_POST[$post_key];
}
}
}
// Check needed parameters
@ -94,7 +119,7 @@ PMA_checkParameters(array('import_type', 'format'));
$format = PMA_securePath($format);
// Import functions
require_once './libraries/import.lib.php';
require_once 'libraries/import.lib.php';
// Create error and goto url
if ($import_type == 'table') {
@ -169,7 +194,7 @@ $bookmark_created = false;
// Bookmark Support: get a query back from bookmark if required
if (!empty($id_bookmark)) {
$id_bookmark = (int)$id_bookmark;
include_once './libraries/bookmark.lib.php';
include_once 'libraries/bookmark.lib.php';
switch ($action_bookmark) {
case 0: // bookmarked query that have to be run
$import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all));
@ -218,7 +243,7 @@ if (isset($GLOBALS['show_as_php'])) {
// Store the query as a bookmark before executing it if bookmarklabel was given
if (!empty($bkm_label) && !empty($import_text)) {
include_once './libraries/bookmark.lib.php';
include_once 'libraries/bookmark.lib.php';
$bfields = array(
'dbase' => $db,
'user' => $cfg['Bookmark']['user'],
@ -291,7 +316,7 @@ if ($import_file != 'none' && !$error) {
if (!empty($open_basedir)) {
$tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
$tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
if (is_writable($tmp_subdir)) {
@ -339,7 +364,7 @@ if ($import_file != 'none' && !$error) {
/**
* Load interface for zip extension.
*/
include_once './libraries/zip_extension.lib.php';
include_once 'libraries/zip_extension.lib.php';
$result = PMA_getZipContents($import_file);
if (! empty($result['error'])) {
$message = PMA_Message::rawError($result['error']);
@ -409,13 +434,13 @@ if (!$error && isset($skip)) {
if (!$error) {
// Check for file existance
if (!file_exists('./libraries/import/' . $format . '.php')) {
if (!file_exists('libraries/import/' . $format . '.php')) {
$error = true;
$message = PMA_Message::error(__('Could not load import plugins, please check your installation!'));
} else {
// Do the real import
$plugin_param = $import_type;
include './libraries/import/' . $format . '.php';
include 'libraries/import/' . $format . '.php';
}
}
@ -479,7 +504,7 @@ if (isset($message)) {
// (but if the query is too large, in case of an imported file, the parser
// can choke on it so avoid parsing)
if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
include_once './libraries/parse_analyze.lib.php';
include_once 'libraries/parse_analyze.lib.php';
}
// There was an error?
@ -499,10 +524,10 @@ if (! empty($last_query_with_results)) {
}
if ($go_sql) {
include './sql.php';
include 'sql.php';
} else {
$active_page = $goto;
include './' . $goto;
include '' . $goto;
}
exit();
?>

4
import_status.php
View File

@ -5,8 +5,8 @@
* @package PhpMyAdmin
*/
require_once './libraries/common.inc.php';
require_once './libraries/display_import_ajax.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/display_import_ajax.lib.php';
/**
* Sets globals from $_GET

8
index.php
View File

@ -10,7 +10,7 @@
/**
* Gets core libraries and defines some variables
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
// free the session file, for the other frames to be loaded
session_write_close();
@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
// start output
require './libraries/header_http.inc.php';
require 'libraries/header_http.inc.php';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@ -78,8 +78,8 @@ require './libraries/header_http.inc.php';
lang="<?php echo $lang_iso_code; ?>"
dir="<?php echo $GLOBALS['text_dir']; ?>">
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title>phpMyAdmin <?php echo PMA_VERSION; ?> -
<?php echo htmlspecialchars($HTTP_HOST); ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

4
js/codemirror/mode/mysql/mysql.js vendored
View File

@ -151,7 +151,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) {
for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
return obj;
}
var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill";
var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped event exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike routine schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill";
var cVerbs = "alter analyze begin binlog call change check checksum commit create deallocate describe do drop execute flush grant handler install kill load lock optimize cache partition prepare purge release rename repair replace reset resignal revoke rollback savepoint select set signal show start truncate uninstall unlock update use xa";
@ -172,4 +172,4 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) {
types: keywords(cTypes),
attributes: keywords(cAttributes)
});
}());
}());

48
js/functions.js
View File

@ -157,8 +157,8 @@ function PMA_current_version()
function displayPasswordGenerateButton()
{
$('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
$('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
$('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
$('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
}
/*
@ -1069,8 +1069,8 @@ $(document).ready(function(){
var old_text = $inner_sql.html();
var new_content = "<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">" + sql_query + "</textarea>\n";
new_content += "<input type=\"button\" class=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\">\n";
new_content += "<input type=\"button\" class=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">\n";
new_content += "<input type=\"submit\" class=\"button btnSave\" value=\"" + PMA_messages['strGo'] + "\">\n";
new_content += "<input type=\"button\" class=\"button btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">\n";
$inner_sql.replaceWith(new_content);
// These settings are duplicated from the .ready()function in functions.js
@ -1819,17 +1819,25 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
*/
var button_options = {};
button_options[PMA_messages['strOK']] = function(){
$(this).dialog("close").remove();
$(this).dialog("close");
if($.isFunction(callbackFn)) {
callbackFn.call(this, url);
}
};
button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
if($.isFunction(callbackFn)) {
callbackFn.call(this, url);
}
};
button_options[PMA_messages['strCancel']] = function() {
$(this).dialog("close");
}
$('<div id="confirm_dialog"></div>')
$('<div/>', {'id':'confirm_dialog'})
.prepend(question)
.dialog({buttons: button_options});
.dialog({
buttons: button_options,
close: function () {
$(this).remove();
},
modal: true
});
};
/**
@ -3060,9 +3068,9 @@ var toggleButton = function ($obj) {
// OFF state we need to move it now.
if ($('.container', $obj).hasClass('off')) {
if (right == 'right') {
$('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0);
$('.container', $obj).animate({'left': '-=' + move + 'px'}, 0);
} else {
$('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0);
$('.container', $obj).animate({'left': '+=' + move + 'px'}, 0);
}
}
// Attach an 'onclick' event to the switch
@ -3118,9 +3126,7 @@ var toggleButton = function ($obj) {
*/
$(window).load(function () {
$('.toggleAjax').each(function () {
$(this)
.show()
.find('.toggleButton')
$(this).show();
toggleButton($(this));
});
});
@ -3626,3 +3632,11 @@ function toggleRowColors($start)
}
}
}
/**
* Opens pma more themes link in themes browser, in new window instead of popup
* This way, we don't break HTML validity
*/
$(function () {
$("a._blank").prop("target", "_blank");
});

6
js/makegrid.js
View File

@ -722,7 +722,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
var gotoLink = document.createElement('div');
gotoLink.className = 'goto_link';
$(gotoLink).append(g.gotoLinkText + ': ')
.append($td.find('a').clone());
.append($td.find('a').clone().click(
function (event) {
event.preventDefault();
window.open(this.href);
}));
$editArea.append(gotoLink);
}

6
js/navigation.js
View File

@ -34,6 +34,12 @@ function toggle(id, only_open)
img.src = newimg.attr('src');
img.alt = '-';
}
// if only one sub-list, open as well
var $submenus = $(el).find("> li > ul");
var $sublinks = $(el).find("> li > a.item, > li > a.tableicon");
if ($submenus.length == 1 && $sublinks.length == 0) {
toggle($submenus.prop("id").split("subel").join(""), true);
}
} else {
el.style.display = 'none';
if (img) {

6
js/pmd/history.js
View File

@ -73,12 +73,12 @@ function display(init,finit)
else {
str +='<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
}
str +='<td style="padding-left: 5px;" align="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
str +='<td style="padding-left: 5px;" class="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
}
else {
str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
}
i++;
if(i >= history_array.length) {

51
js/server_privileges.js
View File

@ -473,6 +473,57 @@ $(document).ready(function() {
* @memberOf jQuery
* @name export_user_click
*/
$("button.mult_submit[value=export]").live('click', function(event) {
event.preventDefault();
// can't export if no users checked
if ($(this.form).find("input:checked").length == 0) {
return;
}
var $msgbox = PMA_ajaxShowMessage();
var button_options = {};
button_options[PMA_messages['strClose']] = function() {
$(this).dialog("close");
};
$.post($(this.form).prop('action'),
$(this.form).serialize() + '&submit_mult=export&ajax_request=true',
function(data) {
var $ajaxDialog = $('<div />')
.append(data.message)
.dialog({
title: data.title,
width: 500,
buttons: button_options,
close: function () {
$(this).remove();
}
});
PMA_ajaxRemoveMessage($msgbox);
// Attach syntax highlited editor to export dialog
CodeMirror.fromTextArea(
$ajaxDialog.find('textarea')[0],
{
lineNumbers: true,
matchBrackets: true,
indentUnit: 4,
mode: "text/x-mysql"
}
);
}); //end $.post
});
// if exporting non-ajax, highlight anyways
if ($("textarea.export").length > 0)
{
CodeMirror.fromTextArea(
$('textarea.export')[0],
{
lineNumbers: true,
matchBrackets: true,
indentUnit: 4,
mode: "text/x-mysql"
}
);
}
$(".export_user_anchor.ajax").live('click', function(event) {
event.preventDefault();
var $msgbox = PMA_ajaxShowMessage();

2
js/server_status.js
View File

@ -76,7 +76,7 @@ $(function() {
});
// Popup behaviour
$('a[rel="popupLink"]').click( function() {
$('a.popupLink').click( function() {
var $link = $(this);
$('.' + $link.attr('href').substr(1))

6
js/server_status_monitor.js
View File

@ -1581,7 +1581,7 @@ $(function() {
$('div#logTable table tfoot tr')
.html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
PMA_messages['strSumRows'] + ' ' + rowSum + '<span style="float:right">' +
PMA_messages['strTotal'] + '</span></th><th align="right">' + totalSum + '</th>');
PMA_messages['strTotal'] + '</span></th><th class="right">' + totalSum + '</th>');
}
}
@ -1615,7 +1615,7 @@ $(function() {
function buildLogTable(data) {
var rows = data.rows;
var cols = new Array();
var $table = $('<table border="0" class="sortable"></table>');
var $table = $('<table class="sortable"></table>');
var $tBody, $tRow, $tCell;
$('#logTable').html($table);
@ -1658,7 +1658,7 @@ $(function() {
$table.append('<tfoot>' +
'<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
' ' + data.numRows + '<span style="float:right">' + PMA_messages['strTotal'] +
'</span></th><th align="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
'</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
// Append a tooltip to the count column, if there exist one
if ($('#logTable th:last').html() == '#') {

40
libraries/Config.class.php
View File

@ -94,7 +94,7 @@ class PMA_Config
/**
* sets system and application settings
*
* @return nothing
* @return void
*/
function checkSystem()
{
@ -121,7 +121,7 @@ class PMA_Config
/**
* whether to use gzip output compression or not
*
* @return nothing
* @return void
*/
function checkOutputCompression()
{
@ -150,7 +150,7 @@ class PMA_Config
*
* @see http://www.phpbuilder.net/columns/tim20000821.php
*
* @return nothing
* @return void
*/
function checkClient()
{
@ -230,7 +230,7 @@ class PMA_Config
/**
* Whether GD2 is present
*
* @return nothing
* @return void
*/
function checkGd2()
{
@ -273,7 +273,7 @@ class PMA_Config
/**
* Whether the Web server php is running on is IIS
*
* @return nothing
* @return void
*/
function checkWebServer()
{
@ -292,7 +292,7 @@ class PMA_Config
/**
* Whether the os php is running on is windows or not
*
* @return nothing
* @return void
*/
function checkWebServerOs()
{
@ -313,7 +313,7 @@ class PMA_Config
/**
* detects PHP version
*
* @return nothing
* @return void
*/
function checkPhpVersion()
{
@ -625,7 +625,7 @@ class PMA_Config
* @param mixed $new_cfg_value new value
* @param mixed $default_value default value
*
* @return nothing
* @return void
*/
function setUserValue($cookie_name, $cfg_path, $new_cfg_value, $default_value = null)
{
@ -678,7 +678,7 @@ class PMA_Config
*
* @param string $source source
*
* @return nothing
* @return void
*/
function setSource($source)
{
@ -688,7 +688,7 @@ class PMA_Config
/**
* checks if the config folder still exists and terminates app if true
*
* @return nothing
* @return void
*/
function checkConfigFolder()
{
@ -732,7 +732,7 @@ class PMA_Config
* verifies the permissions on config file (if asked by configuration)
* (must be called after config.inc.php has been merged)
*
* @return nothing
* @return void
*/
function checkPermissions()
{
@ -771,7 +771,7 @@ class PMA_Config
* @param string $setting configuration option
* @param string $value new value for configuration option
*
* @return nothing
* @return void
*/
function set($setting, $value)
{
@ -964,7 +964,7 @@ class PMA_Config
*
* @todo check validity of $_REQUEST['collation_connection']
*
* @return nothing
* @return void
*/
function checkCollationConnection()
{
@ -979,7 +979,7 @@ class PMA_Config
/**
* checks for font size configuration, and sets font size as requested by user
*
* @return nothing
* @return void
*/
function checkFontsize()
{
@ -1007,7 +1007,7 @@ class PMA_Config
/**
* checks if upload is enabled
*
* @return nothing
* @return void
*/
function checkUpload()
{
@ -1029,7 +1029,7 @@ class PMA_Config
*
* this section generates $max_upload_size in bytes
*
* @return nothing
* @return void
*/
function checkUploadSize()
{
@ -1050,7 +1050,7 @@ class PMA_Config
/**
* check for https
*
* @return nothing
* @return void
*/
function checkIsHttps()
{
@ -1139,7 +1139,7 @@ class PMA_Config
/**
* detect correct cookie path
*
* @return nothing
* @return void
*/
function checkCookiePath()
{
@ -1169,7 +1169,7 @@ class PMA_Config
/**
* enables backward compatibility
*
* @return nothing
* @return void
*/
function enableBc()
{
@ -1206,7 +1206,7 @@ class PMA_Config
/**
* @todo finish
*
* @return nothing
* @return void
*/
function save()
{

12
libraries/Error.class.php
View File

@ -118,7 +118,7 @@ class PMA_Error extends PMA_Message
*
* @param array $backtrace backtrace
*
* @return nothing
* @return void
*/
public function setBacktrace($backtrace)
{
@ -130,7 +130,7 @@ class PMA_Error extends PMA_Message
*
* @param integer $line the line
*
* @return nothing
* @return void
*/
public function setLine($line)
{
@ -142,7 +142,7 @@ class PMA_Error extends PMA_Message
*
* @param string $file the file
*
* @return nothing
* @return void
*/
public function setFile($file)
{
@ -248,7 +248,7 @@ class PMA_Error extends PMA_Message
/**
* Display HTML backtrace
*
* @return nothing
* @return void
*/
public function displayBacktrace()
{
@ -281,7 +281,7 @@ class PMA_Error extends PMA_Message
* @param string $arg
* @param string $function
*
* @return nothing
* @return void
*/
protected function displayArg($arg, $function)
{
@ -304,7 +304,7 @@ class PMA_Error extends PMA_Message
/**
* Displays the error in HTML
*
* @return nothing
* @return void
*/
public function display()
{

20
libraries/Error_Handler.class.php
View File

@ -97,7 +97,7 @@ class PMA_Error_Handler
* @param string $errfile error file
* @param integer $errline error line
*
* @return nothing
* @return void
*/
public function handleError($errno, $errstr, $errfile, $errline)
{
@ -155,7 +155,7 @@ class PMA_Error_Handler
* @param string $file
* @param integer $line
*
* @return nothing
* @return void
*/
public function triggerError($errorInfo, $errorNumber = null, $file = null, $line = null)
{
@ -168,7 +168,7 @@ class PMA_Error_Handler
*
* @param PMA_Error $error the error
*
* @return nothing
* @return void
*/
protected function _dispFatalError($error)
{
@ -183,7 +183,7 @@ class PMA_Error_Handler
/**
* display the whole error page with all errors
*
* @return nothing
* @return void
*/
public function dispErrorPage()
{
@ -197,7 +197,7 @@ class PMA_Error_Handler
/**
* display user errors not displayed
*
* @return nothing
* @return void
*/
public function dispUserErrors()
{
@ -213,7 +213,7 @@ class PMA_Error_Handler
*
* @param PMA_error $error the error
*
* @return nothing
* @return void
*/
protected function _dispPageStart($error = null)
{
@ -229,7 +229,7 @@ class PMA_Error_Handler
/**
* display HTML footer
*
* @return nothing
* @return void
*/
protected function _dispPageEnd()
{
@ -239,7 +239,7 @@ class PMA_Error_Handler
/**
* display all errors regardless already displayed or user errors
*
* @return nothing
* @return void
*/
public function dispAllErrors()
{
@ -251,7 +251,7 @@ class PMA_Error_Handler
/**
* display errors not displayed
*
* @return nothing
* @return void
*/
public function dispErrors()
{
@ -273,7 +273,7 @@ class PMA_Error_Handler
/**
* look in session for saved errors
*
* @return nothing
* @return void
*/
protected function _checkSavedErrors()
{

2
libraries/File.class.php
View File

@ -143,7 +143,7 @@ class PMA_File
*
* @param string $name file name
*
* @return nothing
* @return void
* @access public
*/
function setName($name)

50
libraries/Index.class.php
View File

@ -86,7 +86,7 @@ class PMA_Index
/**
* Constructor
*
* @param array $params
* @param array $params parameters
*/
public function __construct($params = array())
{
@ -111,9 +111,10 @@ class PMA_Index
/**
* returns an array with all indexes from the given table
*
* @param string $table
* @param string $schema
* @return array
* @param string $table table
* @param string $schema schema
*
* @return array array of indexes
*/
static public function getFromTable($table, $schema)
{
@ -129,8 +130,9 @@ class PMA_Index
/**
* return primary if set, false otherwise
*
* @param string $table
* @param string $schema
* @param string $table table
* @param string $schema schema
*
* @return mixed primary index or false if no one exists
*/
static public function getPrimary($table, $schema)
@ -147,9 +149,10 @@ class PMA_Index
/**
* Load index data for table
*
* @param string $table
* @param string $schema
* @return boolean
* @param string $table table
* @param string $schema schema
*
* @return boolean whether loading was successful
*/
static protected function _loadIndexes($table, $schema)
{
@ -177,6 +180,8 @@ class PMA_Index
* Add column to index
*
* @param array $params column params
*
* @return void
*/
public function addColumn($params)
{
@ -216,8 +221,9 @@ class PMA_Index
/**
* Returns true if $column indexed in this index
*
* @param string $column
* @return boolean
* @param string $column the column
*
* @return boolean true if $column indexed in this index
*/
public function hasColumn($column)
{
@ -324,8 +330,9 @@ class PMA_Index
foreach (PMA_Index::getIndexChoices() as $each_index_choice) {
if ($each_index_choice === 'PRIMARY'
&& $this->_choice !== 'PRIMARY'
&& PMA_Index::getPrimary($this->_table, $this->_schema)) {
&& $this->_choice !== 'PRIMARY'
&& PMA_Index::getPrimary($this->_table, $this->_schema)
) {
// skip PRIMARY if there is already one in the table
continue;
}
@ -403,12 +410,13 @@ class PMA_Index
/**
* Show index data
*
* @param string $table The tablename
* @param array $indexes_info Referenced info array
* @param array $indexes_data Referenced data array
* @param boolean $print_mode
* @param string $table The table name
* @param string $schema The schema name
* @param boolean $print_mode Whether the output is for the print mode
*
* @return array Index collection array
*
* @access public
* @return array Index collection array
*/
static public function getView($table, $schema, $print_mode = false)
{
@ -543,9 +551,11 @@ class PMA_Index
/**
* Function to check over array of indexes and look for common problems
*
* @param string $table table name
* @param string $schema schema name
*
* @return string Output HTML
* @access public
* @param string name of table
* @return string Output HTML
*/
static public function findDuplicates($table, $schema)
{

32
libraries/List_Database.class.php
View File

@ -56,8 +56,8 @@ require_once './libraries/List.class.php';
/**
* Constructor
*
* @param mixed $db_link_user user database link resource|object
* @param mixed $db_link_control control database link resource|object
* @param mixed $db_link_user user database link resource|object
* @param mixed $db_link_control control database link resource|object
*/
public function __construct($db_link_user = null, $db_link_control = null)
{
@ -88,9 +88,10 @@ require_once './libraries/List.class.php';
/**
* retrieves database list from server
*
* @todo we could also search mysql tables if all fail?
* @param string $like_db_name usally a db_name containing wildcards
* @param string $like_db_name usally a db_name containing wildcards
*
* @return array
* @todo we could also search mysql tables if all fail?
*/
protected function _retrieve($like_db_name = null)
{
@ -101,8 +102,10 @@ require_once './libraries/List.class.php';
if (null !== $like_db_name) {
$command = "SHOW DATABASES LIKE '" . $like_db_name . "'";
} elseif (null === $this->_command) {
$command = str_replace('#user#', $GLOBALS['cfg']['Server']['user'],
$GLOBALS['cfg']['Server']['ShowDatabasesCommand']);
$command = str_replace(
'#user#', $GLOBALS['cfg']['Server']['user'],
$GLOBALS['cfg']['Server']['ShowDatabasesCommand']
);
$this->_command = $command;
} else {
$command = $this->_command;
@ -161,7 +164,8 @@ require_once './libraries/List.class.php';
protected function _checkOnlyDatabase()
{
if (is_string($GLOBALS['cfg']['Server']['only_db'])
&& strlen($GLOBALS['cfg']['Server']['only_db'])) {
&& strlen($GLOBALS['cfg']['Server']['only_db'])
) {
$GLOBALS['cfg']['Server']['only_db'] = array(
$GLOBALS['cfg']['Server']['only_db']
);
@ -176,8 +180,9 @@ require_once './libraries/List.class.php';
foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) {
if ($each_only_db === '*' && ! $this->_show_databases_disabled) {
// append all not already listed dbs to the list
$items = array_merge($items,
array_diff($this->_retrieve(), $items));
$items = array_merge(
$items, array_diff($this->_retrieve(), $items)
);
// there can only be one '*', and this can only be last
break;
}
@ -222,6 +227,7 @@ require_once './libraries/List.class.php';
*
* @param integer $offset
* @param integer $count
*
* @return array db list
*/
public function getGroupedDetails($offset, $count)
@ -229,7 +235,8 @@ require_once './libraries/List.class.php';
$dbgroups = array();
if ($GLOBALS['cfg']['ShowTooltip']
&& $GLOBALS['cfgRelation']['commwork']) {
&& $GLOBALS['cfgRelation']['commwork']
) {
$db_tooltips = PMA_getDbComments();
}
@ -299,6 +306,7 @@ require_once './libraries/List.class.php';
*
* @param integer $offset
* @param integer $count
*
* @return array some items
*/
public function getLimitedItems($offset, $count)
@ -317,7 +325,7 @@ require_once './libraries/List.class.php';
$selected = $this->getDefault();
}
$return = '<ul id="databaseList" xml:lang="en" dir="ltr">' . "\n";
$return = '<ul id="databaseList" lang="en" dir="ltr">' . "\n";
foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
if (count($dbs) > 1) {
$return .= '<li class="group"><span>' . htmlspecialchars($group) . '</span><ul>' . "\n";
@ -373,7 +381,7 @@ require_once './libraries/List.class.php';
$selected = $this->getDefault();
}
$return = '<select name="db" id="lightm_db" xml:lang="en" dir="ltr"'
$return = '<select name="db" id="lightm_db" lang="en" dir="ltr"'
. ' onchange="if (this.value != \'\') window.parent.openDb(this.value);">' . "\n"
. '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
. '(' . __('Databases') . ') ...</option>' . "\n";

8
libraries/Table.class.php
View File

@ -108,7 +108,7 @@ class PMA_Table
*
* @param string $table_name new table name
*
* @return nothing
* @return void
*/
function setName($table_name)
{
@ -135,7 +135,7 @@ class PMA_Table
*
* @param string $db_name database name
*
* @return nothing
* @return void
*/
function setDbName($db_name)
{
@ -204,7 +204,7 @@ class PMA_Table
* @param string $param name
* @param mixed $value value
*
* @return nothing
* @return void
*/
function set($param, $value)
{
@ -1428,7 +1428,7 @@ class PMA_Table
* If pmadb and table_uiprefs is set, it will load the UI preferences from
* phpMyAdmin database.
*
* @return nothing
* @return void
*/
protected function loadUiPrefs()
{

2
libraries/Theme_Manager.class.php
View File

@ -295,7 +295,7 @@ class PMA_Theme_Manager
$theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
$select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n";
$select_box .= '<select name="set_theme" xml:lang="en" dir="ltr" class="autosubmit">';
$select_box .= '<select name="set_theme" lang="en" dir="ltr" class="autosubmit">';
foreach ($this->themes as $each_theme_id => $each_theme) {
$select_box .= '<option value="' . $each_theme_id . '"';
if ($this->active_theme === $each_theme_id) {

6
libraries/Tracker.class.php
View File

@ -81,7 +81,7 @@ class PMA_Tracker
*
* @static
*
* @return nothing
* @return void
*/
static protected function init()
{
@ -105,7 +105,7 @@ class PMA_Tracker
*
* @static
*
* @return nothing
* @return void
*/
static public function enable()
{
@ -855,7 +855,7 @@ class PMA_Tracker
*
* @static
*
* @return nothing
* @return void
*/
static public function handleQuery($query)
{

2
libraries/auth/config.auth.lib.php
View File

@ -86,7 +86,7 @@ function PMA_auth_fails()
<h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
</center>
<br />
<table border="0" cellpadding="0" cellspacing="3" align="center" width="80%">
<table cellpadding="0" cellspacing="3" style="margin: 0 auto" width="80%">
<tr>
<td>

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

@ -172,7 +172,7 @@ if (top != self) {
<?php
echo sprintf(
__('Welcome to %s'),
'<bdo dir="ltr" xml:lang="en">' . $page_title . '</bdo>'
'<bdo dir="ltr" lang="en">' . $page_title . '</bdo>'
);
?>
</h1>
@ -198,7 +198,7 @@ if (top != self) {
<legend>
<?php
echo __('Log in');
echo '<a href="./Documentation.html" target="documentation" ' .
echo '<a href="Documentation.html" target="documentation" ' .
'title="' . __('phpMyAdmin documentation') . '"> ';
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo PMA_getImage('b_help.png', __('phpMyAdmin documentation'));

2
libraries/auth/swekey/swekey.auth.lib.php
View File

@ -115,7 +115,7 @@ function Swekey_auth_error()
if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0)
return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']);
include_once "./libraries/auth/swekey/swekey.php";
include_once "libraries/auth/swekey/swekey.php";
Swekey_SetCheckServer($_SESSION['SWEKEY']['CONF_SERVER_CHECK']);
Swekey_SetRndTokenServer($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN']);

19
libraries/bfShapeFiles/ShapeFile.lib.php
View File

@ -1,4 +1,17 @@
<?php
/**
* BytesFall ShapeFiles library
*
* The library implements the 2D variants of the ShapeFile format as defined in
* http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf.
* The library currently supports reading and editing of ShapeFiles and the
* Associated information (DBF file).
*
* @package bfShapeFiles
* @version 0.0.2
* @link http://bfshapefiles.sourceforge.net/
* @license http://www.gnu.org/copyleft/gpl.html GPLv2
*/
function loadData($type, $data) {
if (!$data) return $data;
$tmp = unpack($type, $data);
@ -32,7 +45,11 @@
return $result;
}
/**
* ShapeFile class
*
* @package bfShapeFiles
*/
class ShapeFile {
var $FileName;

2
libraries/build_html_for_db.lib.php
View File

@ -148,7 +148,7 @@ function PMA_buildHtmlForDb(
$out .= '<td class="tool">'
. '<a onclick="'
. 'if (window.parent.setDb) window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');'
. '" href="./server_privileges.php?' . $url_query
. '" href="server_privileges.php?' . $url_query
. '&amp;checkprivs=' . urlencode($current['SCHEMA_NAME'])
. '" title="' . sprintf(__('Check privileges for database &quot;%s&quot;.'), htmlspecialchars($current['SCHEMA_NAME']))
. '">'

2
libraries/check_user_privileges.lib.php
View File

@ -30,7 +30,7 @@ $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.
*
* @return nothing
* @return void
*/
function PMA_analyseShowGrant()
{

2
libraries/cleanup.lib.php
View File

@ -11,7 +11,7 @@
*
* @param string &$whitelist list of variables to allow
*
* @return nothing
* @return void
* @access public
*/
function PMA_remove_request_vars(&$whitelist)

2
libraries/common.inc.php
View File

@ -618,7 +618,7 @@ if ($GLOBALS['PMA_Config']->error_config_default_file) {
trigger_error($error, E_USER_ERROR);
}
if ($GLOBALS['PMA_Config']->error_pma_uri) {
trigger_error(__('The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!'), E_USER_ERROR);
trigger_error(__('The <code>$cfg[\'PmaAbsoluteUri\']</code> directive MUST be set in your configuration file!'), E_USER_ERROR);
}

22
libraries/common.lib.php
View File

@ -930,7 +930,7 @@ function PMA_removeBackquote($a_name)
*/
function PMA_whichCrlf()
{
// The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php"
// The 'PMA_USR_OS' constant is defined in "libraries/Config.class.php"
// Win case
if (PMA_USR_OS == 'Win') {
$the_crlf = "\r\n";
@ -947,7 +947,7 @@ function PMA_whichCrlf()
*
* @param bool $jsonly prints out pure JavaScript
*
* @return nothing
* @return void
*
* @access public
*/
@ -2079,7 +2079,7 @@ function PMA_flipstring($string, $Separator = "<br />\n")
* until you know all needed parameters to check).
* @param bool $request Whether to include this list in checking for special params.
*
* @return nothing
* @return void
*
* @global string path to current script
* @global boolean flag whether any special variable was required
@ -2507,7 +2507,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
. $frame . '">' . $caption2 . '</a>';
}
echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n";
echo "\n", '<form action="', basename($script), '" method="post" target="', $frame, '">', "\n";
echo PMA_generate_common_hidden_inputs($_url_params);
echo PMA_pageselector(
$max_count,
@ -2817,7 +2817,7 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
/**
* Clears cache content which needs to be refreshed on user change.
*
* @return nothing
* @return void
*/
function PMA_clearUserCache()
{
@ -2883,7 +2883,7 @@ function PMA_cacheSet($var, $val = null, $server = 0)
* @param string $var variable name
* @param int|true $server server
*
* @return nothing
* @return void
*/
function PMA_cacheUnset($var, $server = 0)
{
@ -3263,7 +3263,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array())
* @param array $extra_data extra data optional -
* any other data as part of the json request
*
* @return nothing
* @return void
*/
function PMA_ajaxResponse($message, $success = true, $extra_data = array())
{
@ -3309,7 +3309,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
*
* @param string $max_upload_size maximum upload size
*
* @return nothing
* @return void
*/
function PMA_browseUploadFile($max_upload_size)
{
@ -3328,7 +3328,7 @@ function PMA_browseUploadFile($max_upload_size)
* @param array $import_list array of import types
* @param string $uploaddir upload directory
*
* @return nothing
* @return void
*/
function PMA_selectUploadFile($import_list, $uploaddir)
{
@ -3861,12 +3861,12 @@ function PMA_analyzeLimitClause($limit_clause)
/**
* Outputs HTML code for print button.
*
* @return nothing
* @return void
*/
function PMA_printButton()
{
echo '<p class="print_ignore">';
echo '<input type="button" id="print" value="' . __('Print') . '" />';
echo '<input type="button" class="button" id="print" value="' . __('Print') . '" />';
echo '</p>';
}
?>

20
libraries/core.lib.php
View File

@ -265,7 +265,7 @@ function PMA_getPHPDocLink($target)
* @param bool $fatal Whether the error is fatal.
* @param string $extra Extra string to append to messsage.
*
* @return nothing
* @return void
*/
function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
{
@ -412,7 +412,7 @@ function PMA_array_merge_recursive()
* @param string $function function to call for every array element
* @param bool $apply_to_keys_also whether to call the function for the keys also
*
* @return nothing
* @return void
*
* @see http://www.php-security.org/MOPB/MOPB-02-2007.html
* @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549
@ -560,7 +560,7 @@ function PMA_sendHeaderLocation($uri)
/**
* Outputs headers to prevent caching in browser (and on the way).
*
* @return nothing
* @return void
*/
function PMA_no_cache_header()
{
@ -588,7 +588,7 @@ function PMA_no_cache_header()
* @param int $length Length of content (optional)
* @param bool $no_cache Whether to include no-caching headers.
*
* @return nothing
* @return void
*/
function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true)
{
@ -640,7 +640,7 @@ function PMA_array_read($path, $array, $default = null)
* @param array &$array the array
* @param mixed $value value to store
*
* @return nothing
* @return void
*/
function PMA_array_write($path, &$array, $value)
{
@ -662,7 +662,7 @@ function PMA_array_write($path, &$array, $value)
* @param string $path path in the array
* @param array &$array the array
*
* @return nothing
* @return void
*/
function PMA_array_remove($path, &$array)
{
@ -729,9 +729,9 @@ function PMA_linkURL($url)
function PMA_includeJS($url)
{
if (strpos($url, '?') === false) {
return '<script src="./js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n";
return '<script src="js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n";
} else {
return '<script src="./js/' . $url . '" type="text/javascript"></script>' . "\n";
return '<script src="js/' . $url . '" type="text/javascript"></script>' . "\n";
}
}
@ -741,7 +741,7 @@ function PMA_includeJS($url)
*
* @param string $str Js code to be added (e.g. "token=1234;")
*
* @return nothing
* @return void
*/
function PMA_AddJSCode($str)
{
@ -755,7 +755,7 @@ function PMA_AddJSCode($str)
* @param mixed $value Value to set, can be either string or array of strings
* @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code)
*
* @return nothing
* @return void
*/
function PMA_AddJSVar($key, $value, $escape = true)
{

2
libraries/db_info.inc.php
View File

@ -39,7 +39,7 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
* @param array &$tooltip_aliasname tooltip data
* @param array $table tabledata
*
* @return nothing
* @return void
*/
function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
{

6
libraries/display_select_lang.lib.php
View File

@ -50,13 +50,13 @@ function PMA_select_language($use_fieldset = false, $show_doc = true)
$language_title .= PMA_showDocu('faq7_2');
}
if ($use_fieldset) {
echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
echo '<fieldset><legend lang="en" dir="ltr">' . $language_title . '</legend>';
} else {
echo '<bdo xml:lang="en" dir="ltr">' . $language_title . ':</bdo>';
echo '<bdo lang="en" dir="ltr">' . $language_title . ':</bdo>';
}
?>
<select name="lang" class="autosubmit" xml:lang="en" dir="ltr">
<select name="lang" class="autosubmit" lang="en" dir="ltr">
<?php
uasort($GLOBALS['available_languages'], 'PMA_language_cmp');

38
libraries/display_tbl.lib.php
View File

@ -214,7 +214,7 @@ function PMA_isSelect()
* @param string $input_for_real_end optional hidden field for special treatment
* @param string $onclick optional onclick clause
*
* @return nothing
* @return void
*
* @global string $db the database name
* @global string $table the table name
@ -261,7 +261,7 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q
* @param string $sql_query the URL-encoded query
* @param string $id_for_direction_dropdown the id for the direction dropdown
*
* @return nothing
* @return void
*
* @global string $db the database name
* @global string $table the table name
@ -297,7 +297,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
?>
<!-- Navigation bar -->
<table border="0" cellpadding="0" cellspacing="0" class="navigation">
<table cellpadding="0" cellspacing="0" class="navigation">
<tr>
<td class="navigation_separator"></td>
<?php
@ -1146,7 +1146,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
*/
function PMA_buildValueDisplay($class, $condition_field, $value)
{
return '<td align="left"' . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $value . '</td>';
return '<td class="left ' . $class . ($condition_field ? ' condition' : '') . '">' . $value . '</td>';
}
/**
@ -1556,15 +1556,15 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// so use the $pointer
if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"');
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay('right '.$class, $condition_field, $meta, '');
} elseif ($row[$i] != '') {
$nowrap = ' nowrap';
$where_comparison = ' = ' . $row[$i];
$vertical_display['data'][$row_no][$i] = '<td align="right"' . 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);
$vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data('right '.$class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
} else {
$vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, $meta, 'align="right"');
$vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay('right '.$class, $condition_field, $meta, '');
}
// b l o b
@ -2018,7 +2018,7 @@ function PMA_displayVerticalTable()
* @todo currently this is called twice unnecessary
* @todo ignore LIMIT and ORDER in query!?
*
* @return nothing
* @return void
*/
function PMA_displayTable_checkConfigParams()
{
@ -2193,7 +2193,7 @@ function PMA_displayTable_checkConfigParams()
* PMA_displayTableNavigation(), PMA_displayTableHeaders(),
* PMA_displayTableBody(), PMA_displayResultsOperations()
*
* @return nothing
* @return void
*/
function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
{
@ -2569,7 +2569,7 @@ function default_function($buffer)
* PMA_displayTableNavigation(), PMA_displayTableHeaders(),
* PMA_displayTableBody(), PMA_displayResultsOperations()
*
* @return nothing
* @return void
*/
function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql)
{
@ -2877,7 +2877,7 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla
if (! empty($class)) {
$ret .= 'class="' . $class . '"';
}
$ret .= ' align="center">'
$ret .= ' class="center">'
. '<input type="checkbox" id="id_rows_to_delete' . $row_no . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"'
. ' class="multi_checkbox"'
. ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />'
@ -2902,7 +2902,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
{
$ret = '';
if (! empty($edit_url)) {
$ret .= '<td class="' . $class . '" align="center" ' . ' ><span class="nowrap">'
$ret .= '<td class="' . $class . ' center" ' . ' ><span class="nowrap">'
. PMA_linkOrButton($edit_url, $edit_str, array(), false);
/*
* Where clause for selecting this row uniquely is provided as
@ -2931,18 +2931,18 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
{
$ret = '';
if (! empty($copy_url)) {
$ret .= '<td ';
$ret .= '<td class="';
if (! empty($class)) {
$ret .= 'class="' . $class . '" ';
$ret .= $class . ' ';
}
$ret .= 'align="center" ' . ' ><span class="nowrap">'
$ret .= 'center" ' . ' ><span class="nowrap">'
. PMA_linkOrButton($copy_url, $copy_str, array(), false);
/*
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling grid editing
*/
if (! empty($where_clause)) {
$ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
$ret .= '<input type="hidden" class="where_clause" value="' . $where_clause_html . '" />';
}
$ret .= '</span></td>';
}
@ -2963,11 +2963,11 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class)
{
$ret = '';
if (! empty($del_url)) {
$ret .= '<td ';
$ret .= '<td class="';
if (! empty($class)) {
$ret .= 'class="' . $class . '" ';
$ret .= $class . ' ';
}
$ret .= 'align="center" ' . ' >'
$ret .= 'center" ' . ' >'
. PMA_linkOrButton($del_url, $del_str, $js_conf, false)
. '</td>';
}

10
libraries/error.inc.php
View File

@ -12,13 +12,13 @@ if (! defined('PHPMYADMIN')) {
header('Content-Type: text/html; charset=utf-8');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
<!DOCTYPE HTML>
<html lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8" />
<style type="text/css">
<!--
html {

12
libraries/gis/pma_gis_visualization.php
View File

@ -74,7 +74,7 @@ class PMA_GIS_Visualization
/**
* All the variable initialization, options handling has to be done here.
*
* @return nothing
* @return void
*/
protected function init()
{
@ -85,7 +85,7 @@ class PMA_GIS_Visualization
* A function which handles passed parameters. Useful if desired
* chart needs to be a little bit different from the default one.
*
* @return nothing
* @return void
*/
private function _handleOptions()
{
@ -124,7 +124,7 @@ class PMA_GIS_Visualization
* @param string $type mime type
* @param string $ext extension of the file
*
* @return nothing
* @return void
*/
private function _toFile($file_name, $type, $ext)
{
@ -175,7 +175,7 @@ class PMA_GIS_Visualization
*
* @param string $file_name File name
*
* @return nothing
* @return void
*/
public function toFileAsSvg($file_name)
{
@ -235,7 +235,7 @@ class PMA_GIS_Visualization
*
* @param string $file_name File name
*
* @return nothing
* @return void
*/
public function toFileAsPng($file_name)
{
@ -289,7 +289,7 @@ class PMA_GIS_Visualization
*
* @param string $file_name File name
*
* @return nothing
* @return void
*/
public function toFileAsPdf($file_name)
{

5
libraries/header.inc.php
View File

@ -57,9 +57,8 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
include_once './libraries/header_http.inc.php';
include_once './libraries/header_meta_style.inc.php';
include_once './libraries/header_scripts.inc.php';
?>
<meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" />
<?php /* remove vertical scroll bar bug in ie */ ?>
/* remove vertical scroll bar bug in ie */ ?>
<!--[if IE 6]>
<style type="text/css">
/* <![CDATA[ */

11
libraries/header_meta_style.inc.php
View File

@ -31,13 +31,12 @@ if ($GLOBALS['text_dir'] == 'ltr') {
/* echo '<?xml version="1.0" encoding="utf-8"?>'; */
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<!DOCTYPE HTML>
<html lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta charset="utf-8" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title><?php
if (!empty($page_title)) {
echo htmlspecialchars($page_title);

11
libraries/header_printview.inc.php
View File

@ -38,14 +38,13 @@ if ($text_dir == 'ltr') {
$cell_align_right = 'left';
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
<!DOCTYPE HTML>
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta charset="utf-8" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
<link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=print&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php

6
libraries/iconv_wrapper.lib.php
View File

@ -40,9 +40,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
* Wrapper around IBM AIX iconv(), whose character set naming differs
* from the GNU version of iconv().
*
* @param string input character set
* @param string output character set
* @param string the string to convert
* @param string $in_charset input character set
* @param string $out_charset output character set
* @param string $str the string to convert
*
* @return mixed converted string or false on failure
*

203
libraries/import.lib.php
View File

@ -44,7 +44,8 @@ function PMA_checkTimeout()
/**
* Detects what compression filse uses
*
* @param string $filepath filename to check
* @param string $filepath filename to check
*
* @return string MIME type of compression, none for none
* @access public
*/
@ -73,9 +74,10 @@ function PMA_detectCompression($filepath)
* Runs query inside import buffer. This is needed to allow displaying
* of last SELECT, SHOW or HANDLER results and similar nice stuff.
*
* @param string $sql query to run
* @param string $full query to display, this might be commented
* @param bool $controluser whether to use control user for queries
* @param string $sql query to run
* @param string $full query to display, this might be commented
* @param bool $controluser whether to use control user for queries
*
* @access public
*/
function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
@ -214,9 +216,10 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
/**
* Looks for the presence of USE to possibly change current db
*
* @param string $buffer buffer to examine
* @param string $db current db
* @param bool $reload reload
* @param string $buffer buffer to examine
* @param string $db current db
* @param bool $reload reload
*
* @return array (current or new db, whether to reload)
* @access public
*/
@ -240,7 +243,9 @@ function PMA_lookForUse($buffer, $db, $reload)
/**
* Returns next part of imported file/buffer
*
* @param int $size size of buffer to read (this is maximal size function will return)
* @param int $size size of buffer to read
* (this is maximal size function will return)
*
* @return string part of file/buffer
* @access public
*/
@ -283,23 +288,23 @@ function PMA_importGetNextChunk($size = 32768)
}
switch ($compression) {
case 'application/bzip2':
$result = bzread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
case 'application/gzip':
$result = gzread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
case 'application/zip':
$result = substr($GLOBALS['import_text'], 0, $size);
$GLOBALS['import_text'] = substr($GLOBALS['import_text'], $size);
$GLOBALS['finished'] = empty($GLOBALS['import_text']);
break;
case 'none':
$result = fread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
case 'application/bzip2':
$result = bzread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
case 'application/gzip':
$result = gzread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
case 'application/zip':
$result = substr($GLOBALS['import_text'], 0, $size);
$GLOBALS['import_text'] = substr($GLOBALS['import_text'], $size);
$GLOBALS['finished'] = empty($GLOBALS['import_text']);
break;
case 'none':
$result = fread($import_handle, $size);
$GLOBALS['finished'] = feof($import_handle);
break;
}
$GLOBALS['offset'] += $size;
@ -389,10 +394,10 @@ function PMA_getColumnAlphaName($num)
* calculates the corresponding value, based on character value
* (A = 1, ..., Z = 26) and position in the string.
*
* @access public
* @param string $name column name(i.e. "A", or "BC", etc.)
*
* @param string $name (i.e. "A", or "BC", etc.)
* @return int The column number
* @access public
*/
function PMA_getColumnNumberFromName($name)
{
@ -401,19 +406,19 @@ function PMA_getColumnNumberFromName($name)
$num_chars = strlen($name);
$column_number = 0;
for ($i = 0; $i < $num_chars; ++$i) {
// read string from back to front
$char_pos = ($num_chars - 1) - $i;
// read string from back to front
$char_pos = ($num_chars - 1) - $i;
// convert capital character to ASCII value
// and subtract 64 to get corresponding decimal value
// ASCII value of "A" is 65, "B" is 66, etc.
// Decimal equivalent of "A" is 1, "B" is 2, etc.
$number = (ord($name[$char_pos]) - 64);
// convert capital character to ASCII value
// and subtract 64 to get corresponding decimal value
// ASCII value of "A" is 65, "B" is 66, etc.
// Decimal equivalent of "A" is 1, "B" is 2, etc.
$number = (ord($name[$char_pos]) - 64);
// base26 to base10 conversion : multiply each number
// with corresponding value of the position, in this case
// $i=0 : 1; $i=1 : 26; $i=2 : 676; ...
$column_number += $number * pow(26, $i);
// base26 to base10 conversion : multiply each number
// with corresponding value of the position, in this case
// $i=0 : 1; $i=1 : 26; $i=2 : 676; ...
$column_number += $number * pow(26, $i);
}
return $column_number;
} else {
@ -451,10 +456,10 @@ define("FORMATTEDSQL", 2);
/**
* Obtains the precision (total # of digits) from a size of type decimal
*
* @access public
*
* @param string $last_cumulative_size
*
* @return int Precision of the given decimal size notation
* @access public
*/
function PMA_getM($last_cumulative_size)
{
@ -462,25 +467,31 @@ function PMA_getM($last_cumulative_size)
}
/**
* Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal
*
* @access public
* Obtains the scale (# of digits to the right of the decimal point)
* from a size of type decimal
*
* @param string $last_cumulative_size
*
* @return int Scale of the given decimal size notation
* @access public
*/
function PMA_getD($last_cumulative_size)
{
return (int)substr($last_cumulative_size, (strpos($last_cumulative_size, ",") + 1), (strlen($last_cumulative_size) - strpos($last_cumulative_size, ",")));
return (int) substr(
$last_cumulative_size,
(strpos($last_cumulative_size, ",") + 1),
(strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))
);
}
/**
* Obtains the decimal size of a given cell
*
* @access public
* @param string &$cell cell content
*
* @param string &$cell
* @return array Contains the precision, scale, and full size representation of the given decimal cell
* @return array Contains the precision, scale, and full size
* representation of the given decimal cell
* @access public
*/
function PMA_getDecimalSize(&$cell)
{
@ -497,15 +508,17 @@ function PMA_getDecimalSize(&$cell)
/**
* Obtains the size of the given cell
*
* @todo Handle the error cases more elegantly
* @param string $last_cumulative_size Last cumulative column size
* @param int $last_cumulative_type Last cumulative column type
* (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param int $curr_type Type of the current cell
* (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param string &$cell The current cell
*
* @return string Size of the given cell in the type-appropriate format
* @access public
*
* @param string $last_cumulative_size Last cumulative column size
* @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT)
* @param string &$cell The current cell
* @return string Size of the given cell in the type-appropriate format
* @todo Handle the error cases more elegantly
*/
function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell)
{
@ -711,11 +724,14 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
/**
* Determines what MySQL type a cell is
*
* @access public
* @param int $last_cumulative_type Last cumulative column type
* (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @param string &$cell String representation of the cell for which
* a best-fit type is to be determined
*
* @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @param string &$cell String representation of the cell for which a best-fit type is to be determined
* @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @return int The MySQL type representation
* (VARCHAR or INT or BIGINT or DECIMAL or NONE)
* @access public
*/
function PMA_detectType($last_cumulative_type, &$cell)
{
@ -731,14 +747,17 @@ function PMA_detectType($last_cumulative_type, &$cell)
return $last_cumulative_type;
}
} elseif (is_numeric($cell)) {
if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) {
if ($cell == (string)(float)$cell
&& strpos($cell, ".") !== false
&& substr_count($cell, ".") == 1
) {
return DECIMAL;
} else {
if (abs($cell) > 2147483647) {
return BIGINT;
} else {
return INT;
}
if (abs($cell) > 2147483647) {
return BIGINT;
} else {
return INT;
}
}
} else {
return VARCHAR;
@ -748,14 +767,14 @@ function PMA_detectType($last_cumulative_type, &$cell)
/**
* Determines if the column types are int, decimal, or string
*
* @param array &$table array(string $table_name, array $col_names, array $rows)
*
* @return array array(array $types, array $sizes)
* @access public
*
* @link http://wiki.phpmyadmin.net/pma/Import
*
* @todo Handle the error case more elegantly
*
* @access public
*
* @param &$table array(string $table_name, array $col_names, array $rows)
* @return array array(array $types, array $sizes)
*/
function PMA_analyzeTable(&$table)
{
@ -782,7 +801,11 @@ function PMA_analyzeTable(&$table)
$curr_size = 0;
/* If the passed array is not of the correct form, do not process it */
if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) {
if (is_array($table)
&& ! is_array($table[TBL_NAME])
&& is_array($table[COL_NAMES])
&& is_array($table[ROWS])
) {
/* Analyze each column */
for ($i = 0; $i < $numCols; ++$i) {
/* Analyze the column in each row */
@ -842,16 +865,16 @@ $import_notice = null;
* Builds and executes SQL statements to create the database and tables
* as necessary, as well as insert all the data.
*
* @link http://wiki.phpmyadmin.net/pma/Import
* @param string $db_name Name of the database
* @param array &$tables Array of tables for the specified database
* @param array &$analyses Analyses of the tables
* @param array &$additional_sql Additional SQL statements to be executed
* @param array $options Associative array of options
*
* @return void
* @access public
*
* @param string $db_name Name of the database
* @param array &$tables Array of tables for the specified database
* @param array &$analyses Analyses of the tables
* @param array &$additional_sql Additional SQL statements to be executed
* @param array $options Associative array of options
* @return void
* @link http://wiki.phpmyadmin.net/pma/Import
*/
function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null)
{
@ -886,7 +909,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
}
/**
* The calling plug-in should include this statement, if necessary, in the $additional_sql parameter
* The calling plug-in should include this statement,
* if necessary, in the $additional_sql parameter
*
* $sql[] = "USE " . PMA_backquote($db_name);
*/
@ -928,7 +952,14 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
}
if ($analyses != null) {
$type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint", GEOMETRY => 'geometry');
$type_array = array(
NONE => "NULL",
VARCHAR => "varchar",
INT => "int",
DECIMAL => "decimal",
BIGINT => "bigint",
GEOMETRY => 'geometry'
);
/* TODO: Do more checking here to make sure they really are matched */
if (count($tables) != count($analyses)) {
@ -940,14 +971,16 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
$num_tables = count($tables);
for ($i = 0; $i < $num_tables; ++$i) {
$num_cols = count($tables[$i][COL_NAMES]);
$tempSQLStr = "CREATE TABLE IF NOT EXISTS " . PMA_backquote($db_name) . '.' . PMA_backquote($tables[$i][TBL_NAME]) . " (";
$tempSQLStr = "CREATE TABLE IF NOT EXISTS " . PMA_backquote($db_name)
. '.' . PMA_backquote($tables[$i][TBL_NAME]) . " (";
for ($j = 0; $j < $num_cols; ++$j) {
$size = $analyses[$i][SIZES][$j];
if ((int)$size == 0) {
$size = 10;
}
$tempSQLStr .= PMA_backquote($tables[$i][COL_NAMES][$j]) . " " . $type_array[$analyses[$i][TYPES][$j]];
$tempSQLStr .= PMA_backquote($tables[$i][COL_NAMES][$j]) . " "
. $type_array[$analyses[$i][TYPES][$j]];
if ($analyses[$i][TYPES][$j] != GEOMETRY) {
$tempSQLStr .= "(" . $size . ")";
}
@ -1141,10 +1174,12 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
sprintf(__('Edit settings for %s'), htmlspecialchars(PMA_backquote($db_name)))
);
} else {
$message .= sprintf('<li><a href="%s" title="%s">%s</a></li>',
$tbl_url,
sprintf(__('Go to view: %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))),
htmlspecialchars($tables[$i][TBL_NAME]));
$message .= sprintf(
'<li><a href="%s" title="%s">%s</a></li>',
$tbl_url,
sprintf(__('Go to view: %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))),
htmlspecialchars($tables[$i][TBL_NAME])
);
}
}

62
libraries/ip_allow_deny.lib.php
View File

@ -58,8 +58,8 @@ function PMA_getIp()
* Does not match:
* xxx.xxx.xxx.xx[yyy-zzz] (range, partial octets not supported)
*
* @param string string of IP range to match
* @param string string of IP to test against range
* @param string $testRange string of IP range to match
* @param string $ipToTest string of IP to test against range
*
* @return boolean always true
*
@ -67,36 +67,35 @@ function PMA_getIp()
*/
function PMA_ipMaskTest($testRange, $ipToTest)
{
$result = true;
$result = true;
if (preg_match('|([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/([0-9]+)|', $testRange, $regs)) {
// performs a mask match
$ipl = ip2long($ipToTest);
$rangel = ip2long($regs[1] . '.' . $regs[2] . '.' . $regs[3] . '.' . $regs[4]);
if (preg_match('|([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/([0-9]+)|', $testRange, $regs)) {
// performs a mask match
$ipl = ip2long($ipToTest);
$rangel = ip2long($regs[1] . '.' . $regs[2] . '.' . $regs[3] . '.' . $regs[4]);
$maskl = 0;
$maskl = 0;
for ($i = 0; $i < 31; $i++) {
if ($i < $regs[5] - 1) {
$maskl = $maskl + PMA_pow(2, (30 - $i));
} // end if
} // end for
for ($i = 0; $i < 31; $i++) {
if ($i < $regs[5] - 1) {
$maskl = $maskl + PMA_pow(2, (30 - $i));
} // end if
} // end for
if (($maskl & $rangel) == ($maskl & $ipl)) {
return true;
} else {
return false;
}
} else {
// range based
$maskocts = explode('.', $testRange);
$ipocts = explode('.', $ipToTest);
if (($maskl & $rangel) == ($maskl & $ipl)) {
return true;
} else {
return false;
}
} else {
// range based
$maskocts = explode('.', $testRange);
$ipocts = explode('.', $ipToTest);
// perform a range match
for ($i = 0; $i < 4; $i++) {
// perform a range match
for ($i = 0; $i < 4; $i++) {
if (preg_match('|\[([0-9]+)\-([0-9]+)\]|', $maskocts[$i], $regs)) {
if (($ipocts[$i] > $regs[2])
|| ($ipocts[$i] < $regs[1])) {
if (($ipocts[$i] > $regs[2]) || ($ipocts[$i] < $regs[1])) {
$result = false;
} // end if
} else {
@ -104,17 +103,17 @@ function PMA_ipMaskTest($testRange, $ipToTest)
$result = false;
} // end if
} // end if/else
} //end for
} //end if/else
} //end for
} //end if/else
return $result;
return $result;
} // end of the "PMA_IPMaskTest()" function
/**
* Runs through IP Allow/Deny rules the use of it below for more information
*
* @param string 'allow' | 'deny' type of rule to match
* @param string $type 'allow' | 'deny' type of rule to match
*
* @return bool Matched a rule ?
*
@ -162,7 +161,8 @@ function PMA_allowDeny($type)
// check for username
if (($rule_data[1] != '%') //wildcarded first
&& ($rule_data[1] != $username)) {
&& ($rule_data[1] != $username)
) {
continue;
}

40
libraries/js_escape.lib.php
View File

@ -13,8 +13,8 @@
* This function is used to displays a javascript confirmation box for
* "DROP/DELETE/ALTER" queries.
*
* @param string $a_string the string to format
* @param boolean $add_backquotes whether to add backquotes to the string or not
* @param string $a_string the string to format
* @param boolean $add_backquotes whether to add backquotes to the string or not
*
* @return string the formatted string
*
@ -41,19 +41,26 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true)
* We also remove NUL byte as some browsers (namely MSIE) ignore it and
* inserting it anywhere inside </script would allow to bypass this check.
*
* @param string $string the string to be escaped
* @param string $string the string to be escaped
*
* @return string the escaped string
*/
function PMA_escapeJsString($string)
{
return preg_replace('@</script@i', '</\' + \'script',
strtr($string, array(
"\000" => '',
'\\' => '\\\\',
'\'' => '\\\'',
'"' => '\"',
"\n" => '\n',
"\r" => '\r')));
return preg_replace(
'@</script@i', '</\' + \'script',
strtr(
$string,
array(
"\000" => '',
'\\' => '\\\\',
'\'' => '\\\'',
'"' => '\"',
"\n" => '\n',
"\r" => '\r'
)
)
);
}
/**
@ -61,7 +68,7 @@ function PMA_escapeJsString($string)
*
* @param string $value String to be formatted.
*
* @retrun string formatted value.
* @return string formatted value.
*/
function PMA_formatJsVal($value)
{
@ -84,7 +91,8 @@ function PMA_formatJsVal($value)
*
* @param string $key Name of value to set
* @param mixed $value Value to set, can be either string or array of strings
* @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code)
* @param bool $escape Whether to escape value or keep it as it is
* (for inclusion of js code)
*
* @return string Javascript code.
*/
@ -109,10 +117,10 @@ function PMA_getJsValue($key, $value, $escape = true)
* Prints an javascript assignment with proper escaping of a value
* and support for assigning array of strings.
*
* @param string $key Name of value to set
* @param mixed $value Value to set, can be either string or array of strings
* @param string $key Name of value to set
* @param mixed $value Value to set, can be either string or array of strings
*
* @return nothing
* @return void
*/
function PMA_printJsValue($key, $value)
{

14
libraries/kanji-encoding.lib.php
View File

@ -67,9 +67,9 @@ function PMA_change_enc_order()
* Kanji string encoding convert
* 2002/1/4 by Y.Kawada
*
* @param string the string to convert
* @param string the destination encoding code
* @param string set 'kana' convert to JIS-X208-kana
* @param string $str the string to convert
* @param string $enc the destination encoding code
* @param string $kana set 'kana' convert to JIS-X208-kana
*
* @global string the available encoding codes list
*
@ -101,9 +101,9 @@ function PMA_kanji_str_conv($str, $enc, $kana)
* Kanji file encoding convert
* 2002/1/4 by Y.Kawada
*
* @param string the name of the file to convert
* @param string the destination encoding code
* @param string set 'kana' convert to JIS-X208-kana
* @param string $file the name of the file to convert
* @param string $enc the destination encoding code
* @param string $kana set 'kana' convert to JIS-X208-kana
*
* @return string the name of the converted file
*/
@ -135,7 +135,7 @@ function PMA_kanji_file_conv($file, $enc, $kana)
* Defines radio form fields to switch between encoding modes
* 2002/1/4 by Y.Kawada
*
* @param string spaces character to prepend the output with
* @param string $spaces spaces character to prepend the output with
*
* @return string xhtml code for the radio controls
*/

2
libraries/mult_submits.inc.php
View File

@ -295,7 +295,7 @@ if (!empty($submit_mult) && !empty($what)) {
}
echo __('Do you really want to execute following query?');
?>:</legend>
<tt><?php echo $full_query; ?></tt>
<code><?php echo $full_query; ?></code>
</fieldset>
<fieldset class="tblFooters">
<input type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes" />

2
libraries/mysql_charsets.lib.php
View File

@ -104,7 +104,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
}
}
$return_str = '<select xml:lang="en" dir="ltr" name="'
$return_str = '<select lang="en" dir="ltr" name="'
. htmlspecialchars($name) . '"'
. (empty($id) ? '' : ' id="' . htmlspecialchars($id) . '"')
. ($submitOnChange ? ' class="autosubmit"' : '') . '>' . "\n";

20
libraries/relation.lib.php
View File

@ -69,7 +69,7 @@ function PMA_getRelationsParam($verbose = false)
*
* @param array $cfgRelation
*
* @return nothing
* @return void
*/
function PMA_printRelationsParamDiagnostic($cfgRelation)
{
@ -116,7 +116,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForFeature(__('Browser transformation'), 'mimework', $messages);
if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) {
echo '<tr><td colspan=2 align="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n";
echo '<tr><td colspan=2 class="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n";
}
PMA_printDiagMessageForParameter('bookmarktable', isset($cfgRelation['bookmark']), $messages, 'bookmark');
@ -166,11 +166,11 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
* @param array $messages utility messages
* @param boolean $skip_line whether to skip a line after the message
*
* @return nothing
* @return void
*/
function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true)
{
echo ' <tr><td colspan=2 align="right">' . $feature_name . ': '
echo ' <tr><td colspan=2 class="right">' . $feature_name . ': '
. ($GLOBALS['cfgRelation'][$relation_parameter] ? $messages['enabled'] : $messages['disabled'])
. '</td></tr>' . "\n";
if ($skip_line) {
@ -186,12 +186,12 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes
* @param array $messages utility messages
* @param string $doc_anchor anchor in Documentation.html
*
* @return nothing
* @return void
*/
function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor)
{
echo ' <tr><th align="left">';
echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\'] ... </th><td align="right">';
echo ' <tr><th class="left">';
echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\'] ... </th><td class="right">';
echo ($relation_parameter_set ? $messages['ok'] : sprintf($messages['error'], $doc_anchor)) . '</td></tr>' . "\n";
}
@ -671,7 +671,7 @@ function PMA_setDbComment($db, $comment = '')
* @param string $username the username
* @param string $sqlquery the sql query
*
* @return nothing
* @return void
*
* @access public
*/
@ -761,7 +761,7 @@ function PMA_getHistory($username)
*
* @param string $username the username
*
* @return nothing
* @return void
*
* @access public
*/
@ -1083,7 +1083,7 @@ function PMA_getRelatives($from)
* @param string $field old field name
* @param string $new_name new field name
*
* @return nothing
* @return void
*/
function PMA_REL_renameField($db, $table, $field, $new_name)
{

2
libraries/replication_gui.lib.php
View File

@ -366,7 +366,7 @@ function PMA_replication_gui_master_addslaveuser()
. ' ' . __('Generate Password') . ':'
. '</label>'
. '<span class="options">'
. ' <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
. ' <input type="button" class="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
. '</span>'
. '<input type="text" name="generated_pw" id="generated_pw" />'
. '</div>'

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

@ -56,7 +56,7 @@ class PMA_Export_Relation_Schema
*
* @param string $value 'on' to set the the variable
*
* @return nothing
* @return void
*/
public function setShowColor($value)
{

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

@ -36,7 +36,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @param float $c_margin margin
*
* @return nothing
* @return void
*/
public function setCMargin($c_margin)
{
@ -54,7 +54,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*/
function PMA_PDF_setScale($scale = 1, $xMin = 0, $yMin = 0, $leftMargin = -1, $topMargin = -1)
{
@ -83,7 +83,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::Cell()
*/
@ -104,7 +104,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::Line()
*/
@ -125,7 +125,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::SetXY()
*/
@ -143,7 +143,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::SetX()
*/
@ -160,7 +160,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::SetFontSize()
*/
@ -178,7 +178,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @access public
*
* @return nothing
* @return void
*
* @see TCPDF::SetLineWidth()
*/
@ -191,7 +191,7 @@ class PMA_Schema_PDF extends PMA_PDF
/**
* This method is used to render the page header.
*
* @return nothing
* @return void
*
* @see TCPDF::Header()
*/
@ -219,7 +219,7 @@ class PMA_Schema_PDF extends PMA_PDF
/**
* This function must be named "Footer" to work with the TCPDF library
*
* @return nothing
* @return void
*
* @see PMA_PDF::Footer()
*/
@ -236,7 +236,7 @@ class PMA_Schema_PDF extends PMA_PDF
*
* @param array $w array of widths
*
* @return nothing
* @return void
*/
function SetWidths($w)
{
@ -377,7 +377,7 @@ class Table_Stats
* @global array The relations settings
* @global string The current db name
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF, Table_Stats::Table_Stats_setWidth,
* Table_Stats::Table_Stats_setHeight
@ -478,7 +478,7 @@ class Table_Stats
*
* @access private
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF
*/
@ -504,7 +504,7 @@ class Table_Stats
/**
* Sets the height of the table
*
* @return nothing
* @return void
*
* @access private
*/
@ -524,7 +524,7 @@ class Table_Stats
*
* @access public
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF
*/
@ -621,7 +621,7 @@ class Relation_Stats
* @param string $foreign_table The foreign table name
* @param string $foreign_field The relation field in the foreign table
*
* @return nothing
* @return void
*
* @see Relation_Stats::_getXy
*/
@ -697,7 +697,7 @@ class Relation_Stats
*
* @access public
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF
*/
@ -940,7 +940,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*
* @param string $table The table name of which sets XY co-ordinates
*
* @return nothing
* @return void
*
* @access private
*/
@ -963,7 +963,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*
* @access private
*
* @return nothing
* @return void
*
* @see _setMinMax
*/
@ -996,7 +996,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*
* @access private
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF
*/
@ -1059,7 +1059,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*
* @access private
*
* @return nothing
* @return void
*
* @see Relation_Stats::relationdraw()
*/
@ -1079,7 +1079,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*
* @access private
*
* @return nothing
* @return void
*
* @see Table_Stats::tableDraw()
*/
@ -1102,7 +1102,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
* $cfg['Servers'][$i]['table_coords'] table)
* @access private
*
* @return nothing
* @return void
*
* @see PMA_Schema_PDF
*/

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

@ -482,7 +482,7 @@ class Table_Stats
*
* @global object The current SVG image document
*
* @return nothing
* @return void
* @access private
*
* @see PMA_SVG
@ -513,7 +513,7 @@ class Table_Stats
*
* @param integer $fontSize font size
*
* @return nothing
* @return void
* @access private
*/
function _setHeightTable($fontSize)
@ -530,7 +530,7 @@ class Table_Stats
* @global object The current SVG image document
*
* @access public
* @return nothing
* @return void
*
* @see PMA_SVG,PMA_SVG::printElement
*/
@ -600,7 +600,7 @@ class Relation_Stats
* @param string $foreign_table The foreign table name
* @param string $foreign_field The relation field in the foreign table
*
* @return nothing
* @return void
*
* @see Relation_Stats::_getXy
*/
@ -676,7 +676,7 @@ class Relation_Stats
*
* @global object The current SVG image document
*
* @return nothing
* @return void
* @access public
*
* @see PMA_SVG
@ -860,7 +860,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
*
* @param string $table The table name
*
* @return nothing
* @return void
* @access private
*/
private function _setMinMax($table)
@ -883,7 +883,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
* @param boolean $showInfo Whether to display table position or not
*
* @access private
* @return nothing
* @return void
*
* @see _setMinMax,Table_Stats::__construct(),Relation_Stats::__construct()
*/
@ -917,7 +917,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
*
* @param boolean $changeColor Whether to use one color per relation or not
*
* @return nothing
* @return void
* @access private
*
* @see Relation_Stats::relationDraw()
@ -934,7 +934,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
*
* @param boolean $changeColor Whether to show color for primary fields or not
*
* @return nothing
* @return void
* @access private
*
* @see Table_Stats::Table_Stats_tableDraw()

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

@ -267,7 +267,7 @@ class PMA_User_Schema
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->chosenPage); ?>" />
<input type="hidden" name="do" value="edcoord" />
<table border="0">
<table>
<tr>
<th><?php echo __('Table'); ?></th>
<th><?php echo __('Delete'); ?></th>
@ -502,7 +502,7 @@ class PMA_User_Schema
{
global $with_field_names, $db;
?>
<script type="text/javascript" src="./js/dom-drag.js"></script>
<script type="text/javascript" src="js/dom-drag.js"></script>
<form method="post" action="schema_edit.php" name="dragdrop">
<input type="button" name="dragdrop" value="<?php echo __('Toggle scratchboard'); ?>" onclick="ToggleDragDrop('pdflayout');" />
<input type="button" name="dragdropreset" value="<?php echo __('Reset'); ?>" onclick="resetDrag();" />
@ -613,7 +613,7 @@ class PMA_User_Schema
PMA_DBI_select_db($db);
include "./libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
$obj_schema = eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
}

6
libraries/server_synchronize.lib.php
View File

@ -369,7 +369,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma
* @param int $index index of a table from $matching_table array
* @param array &$row_count number of rows
*
* @return nothing
* @return void
*/
function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count)
{
@ -1274,7 +1274,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind
*
* @param string $query the query to display
*
* @return nothing
* @return void
*/
function PMA_displayQuery($query)
{
@ -1290,7 +1290,7 @@ function PMA_displayQuery($query)
* @param string $src_db source db name
* @param string $trg_db target db name
*
* @return nothing
* @return void
*/
function PMA_syncDisplayHeaderCompare($src_db, $trg_db)
{

24
libraries/sql_query_form.lib.php
View File

@ -238,9 +238,9 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
$sqlquerycontainer_id = 'sqlquerycontainerfull';
}
echo '<a name="querybox"></a>' . "\n"
echo '<a id="querybox"></a>' . "\n"
.'<div id="queryboxcontainer">' . "\n"
.'<fieldset id="querybox">' . "\n";
.'<fieldset id="queryboxf">' . "\n";
echo '<legend>' . $legend . '</legend>' . "\n";
echo '<div id="queryfieldscontainer">' . "\n";
echo '<div id="' . $sqlquerycontainer_id . '">' . "\n"
@ -251,13 +251,13 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
.$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n";
// Add buttons to generate query easily for select all,single select,insert,update and delete
if (count($fields_list)) {
echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />';
echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />';
echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />';
echo '<input type="button" value="UPDATE" id="update" class="sqlbutton" />';
echo '<input type="button" value="DELETE" id="delete" class="sqlbutton" />';
echo '<input type="button" value="SELECT *" id="selectall" class="button sqlbutton" />';
echo '<input type="button" value="SELECT" id="select" class="button sqlbutton" />';
echo '<input type="button" value="INSERT" id="insert" class="button sqlbutton" />';
echo '<input type="button" value="UPDATE" id="update" class="button sqlbutton" />';
echo '<input type="button" value="DELETE" id="delete" class="button sqlbutton" />';
}
echo '<input type="button" value="' . __('Clear') . '" id="clear" class="sqlbutton" />';
echo '<input type="button" value="' . __('Clear') . '" id="clear" class="button sqlbutton" />';
echo '</div>' . "\n";
if (count($fields_list)) {
@ -277,11 +277,11 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
echo '</select>' . "\n"
.'<div id="tablefieldinsertbuttoncontainer">' . "\n";
if ($GLOBALS['cfg']['PropertiesIconic']) {
echo '<input type="button" name="insert" value="&lt;&lt;"'
echo '<input type="button" class="button" name="insert" value="&lt;&lt;"'
.' onclick="insertValueQuery()"'
.' title="' . __('Insert') . '" />' . "\n";
} else {
echo '<input type="button" name="insert"'
echo '<input type="button" class="button" name="insert"'
.' value="' . __('Insert') . '"'
.' onclick="insertValueQuery()" />' . "\n";
}
@ -387,11 +387,11 @@ function PMA_sqlQueryFormBookmark()
echo '<div class="formelement">' . "\n";
echo __('Variable');
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo ' <a href="./Documentation.html#faqbookmark"'
echo ' <a href="Documentation.html#faqbookmark"'
.' target="documentation">'
. PMA_getImage('b_help.png', __('Documentation')) . '</a>';
} else {
echo ' (<a href="./Documentation.html#faqbookmark"'
echo ' (<a href="Documentation.html#faqbookmark"'
.' target="documentation">' . __('Documentation') . '</a>): ';
}
echo '<input type="text" name="bookmark_variable" class="textfield"'

2
libraries/sqlvalidator.lib.php
View File

@ -64,7 +64,7 @@ function PMA_validateSQL($sql)
if ($cfg['SQLValidator']['use']) {
if (isset($GLOBALS['sqlvalidator_error'])
&& $GLOBALS['sqlvalidator_error']) {
$str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '<a href="./Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
$str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '<a href="Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
} else {
// create new class instance
$srv = new PMA_SQLValidator();

6
libraries/tbl_properties.inc.php
View File

@ -549,7 +549,7 @@ for ($i = 0; $i < $num_fields; $i++) {
} // end for
?>
<script src="./js/keyhandler.js" type="text/javascript"></script>
<script src="js/keyhandler.js" type="text/javascript"></script>
<script type="text/javascript">
// <![CDATA[
var switch_movement = 0;
@ -605,7 +605,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
if (is_array($content_row)) {
foreach ($content_row as $content_row_val) {
?>
<td align="center"><?php echo $content_row_val; ?></td>
<td class="center"><?php echo $content_row_val; ?></td>
<?php
}
}
@ -624,7 +624,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
if ($display_type == 'horizontal') {
$new_field = '';
foreach ($empty_row as $content_row_val) {
$new_field .= '<td align="center">' . $content_row_val . '</td>';
$new_field .= '<td class="center">' . $content_row_val . '</td>';
}
?>
<script type="text/javascript">

2
libraries/tcpdf/tcpdf.php
View File

@ -20710,7 +20710,7 @@ class TCPDF {
// define self-closing tags
$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
// remove all unsupported tags (the line below lists all supported tags)
$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><code><u><ul>');
//replace some blank characters
$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);

4
libraries/zip.lib.php
View File

@ -63,7 +63,7 @@ class zipfile
*
* @access public
*
* @return nothing
* @return void
*/
function setDoWrite()
{
@ -107,7 +107,7 @@ class zipfile
*
* @access public
*
* @return nothing
* @return void
*/
function addFile($data, $name, $time = 0)
{

2
license.php
View File

@ -12,7 +12,7 @@
/**
* Gets core libraries and defines some variables
*/
require './libraries/common.inc.php';
require 'libraries/common.inc.php';
/**
*

32
main.php
View File

@ -8,7 +8,7 @@
/**
* Gets some core libraries and displays a top message if required
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
@ -17,7 +17,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
$GLOBALS['db'] = '';
$GLOBALS['table'] = '';
$show_query = '1';
require_once './libraries/header.inc.php';
require_once 'libraries/header.inc.php';
// Any message to display?
if (! empty($message)) {
@ -30,9 +30,9 @@ $common_url_query = PMA_generate_common_url('', '');
// when $server > 0, a server has been chosen so we can display
// all MySQL-related information
if ($server > 0) {
include './libraries/server_common.inc.php';
include './libraries/StorageEngine.class.php';
include './libraries/server_links.inc.php';
include 'libraries/server_common.inc.php';
include 'libraries/StorageEngine.class.php';
include 'libraries/server_links.inc.php';
// Use the verbose name of the server instead of the hostname
// if a value is set
@ -71,7 +71,7 @@ if ($server > 0
if (! $cfg['LeftDisplayServers']
&& (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) {
echo '<li id="li_select_server">';
include_once './libraries/select_server.lib.php';
include_once 'libraries/select_server.lib.php';
PMA_select_server(true, true);
echo '</li>';
}
@ -80,7 +80,7 @@ if ($server > 0
* Displays the mysql server related links
*/
if ($server > 0 && !PMA_DRIZZLE) {
include_once './libraries/check_user_privileges.lib.php';
include_once 'libraries/check_user_privileges.lib.php';
// Logout for advanced authentication
if ($cfg['Server']['auth_type'] != 'config') {
@ -93,7 +93,7 @@ if ($server > 0
PMA_printListItem(
__('Change password'),
'li_change_password',
'./user_password.php?' . $common_url_query,
'user_password.php?' . $common_url_query,
null,
null,
'change_password_anchor',
@ -127,7 +127,7 @@ echo ' <ul>';
// Displays language selection combo
if (empty($cfg['Lang'])) {
echo '<li id="li_select_lang">';
include_once './libraries/display_select_lang.lib.php';
include_once 'libraries/display_select_lang.lib.php';
PMA_select_language();
echo '</li>';
}
@ -152,7 +152,7 @@ if ($server > 0) {
echo PMA_printListItem(
__('More settings'),
'li_user_preferences',
'./prefs_manage.php?' . $common_url_query
'prefs_manage.php?' . $common_url_query
);
echo '</ul>';
}
@ -182,7 +182,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
echo ' <li id="li_select_mysql_charset">';
echo ' ' . __('Server charset') . ': '
. ' <span xml:lang="en" dir="ltr">'
. ' <span lang="en" dir="ltr">'
. ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
. ' (' . $mysql_charset_map['utf-8'] . ')' . "\n"
. ' </span>' . "\n"
@ -218,7 +218,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
}
if ($cfg['ShowPhpInfo']) {
PMA_printListItem(__('Show PHP information'), 'li_phpinfo', './phpinfo.php?' . $common_url_query);
PMA_printListItem(__('Show PHP information'), 'li_phpinfo', 'phpinfo.php?' . $common_url_query);
}
echo ' </ul>';
echo ' </div>';
@ -312,7 +312,7 @@ if (!empty($_SESSION['auto_blowfish_secret']) &&
* Check for existence of config directory which should not exist in
* production environment.
*/
if (file_exists('./config')) {
if (file_exists('config')) {
trigger_error(__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'), E_USER_WARNING);
}
@ -398,8 +398,8 @@ if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning
*
* The data file is created while creating release by ./scripts/remove-incomplete-mo
*/
if (file_exists('./libraries/language_stats.inc.php')) {
include './libraries/language_stats.inc.php';
if (file_exists('libraries/language_stats.inc.php')) {
include 'libraries/language_stats.inc.php';
/*
* This message is intentionally not translated, because we're
* handling incomplete translations here and focus on english
@ -457,5 +457,5 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

34
navigation.php
View File

@ -9,7 +9,7 @@
/**
* Gets a core script and starts output buffering work
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/**
* finish and cleanup navigation.php script execution, only to be used in navigation.php
@ -22,8 +22,8 @@ function PMA_exitNavigationFrame()
exit;
}
require_once './libraries/common.lib.php';
require_once './libraries/RecentTable.class.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/RecentTable.class.php';
/**
* Check if it is an ajax request to reload the recent tables list.
@ -58,7 +58,7 @@ if (empty($_SESSION['debug'])) {
/**
* the output compression library
*/
require_once './libraries/ob.lib.php';
require_once 'libraries/ob.lib.php';
PMA_outBufferPre();
@ -80,7 +80,7 @@ $cfgRelation = PMA_getRelationsParam();
* For re-usability, moved http-headers to a seperate file.
* It can now be included by libraries/header.inc.php, querywindow.php.
*/
require_once './libraries/header_http.inc.php';
require_once 'libraries/header_http.inc.php';
/*
* Displays the frame
@ -88,18 +88,14 @@ require_once './libraries/header_http.inc.php';
// xml declaration moves IE into quirks mode, making much trouble with CSS
/* echo '<?xml version="1.0" encoding="utf-8"?>'; */
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?php echo $available_languages[$lang][1]; ?>"
lang="<?php echo $available_languages[$lang][1]; ?>"
dir="<?php echo $GLOBALS['text_dir']; ?>">
<!DOCTYPE HTML>
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8" />
<base target="frame_content" />
<link rel="stylesheet" type="text/css"
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
@ -159,7 +155,7 @@ require_once './libraries/header_http.inc.php';
<body id="body_leftFrame">
<?php
require './libraries/navigation_header.inc.php';
require 'libraries/navigation_header.inc.php';
// display recently used tables
if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
@ -406,8 +402,8 @@ function PMA_displayDbList($ext_dblist, $offset, $count)
title="<?php echo htmlspecialchars($db['comment']); ?>"
onclick="
if (! toggle('<?php echo $element_counter; ?>', true))
window.parent.goTo('./navigation.php?<?php echo $common_url_query; ?>');
window.parent.goTo('./<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
window.parent.goTo('navigation.php?<?php echo $common_url_query; ?>');
window.parent.goTo('<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . $common_url_query; ?>', 'main');
return false;">
<?php
@ -541,8 +537,8 @@ function PMA_displayTableList($tables, $visible = false,
target="_parent"
onclick="
if (! toggle('<?php echo $element_counter; ?>', true))
window.parent.goTo('./navigation.php?<?php echo $common_url_query; ?>');
window.parent.goTo('./<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
window.parent.goTo('navigation.php?<?php echo $common_url_query; ?>');
window.parent.goTo('<?php echo $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . $common_url_query; ?>', 'main');
return false;">
<?php

2
phpinfo.php
View File

@ -8,7 +8,7 @@
/**
* Gets core libraries and defines some variables
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
/**

4
phpmyadmin.css.php
View File

@ -12,8 +12,8 @@
define('PMA_FRAME', (! empty($_REQUEST['js_frame']) && is_string($_REQUEST['js_frame'])) ? $_REQUEST['js_frame'] : 'right');
define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.inc.php';
require_once './libraries/sqlparser.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/sqlparser.lib.php';
// MSIE 6 (at least some unpatched versions) has problems loading CSS
// when zlib_compression is on

2
pmd_display_field.php
View File

@ -7,7 +7,7 @@
/**
*
*/
require_once './libraries/pmd_common.php';
require_once 'libraries/pmd_common.php';
$table = $T;

122
pmd_general.php
View File

@ -7,9 +7,9 @@
/**
*
*/
require_once './libraries/pmd_common.php';
require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php';
require_once 'libraries/pmd_common.php';
require 'libraries/db_common.inc.php';
require 'libraries/db_info.inc.php';
$tab_column = get_tab_info();
$script_tabs = get_script_tabs();
@ -22,7 +22,7 @@ $params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
require_once './libraries/header_scripts.inc.php';
require_once 'libraries/header_scripts.inc.php';
?>
<script type="text/javascript">
// <![CDATA[
@ -120,7 +120,7 @@ echo $script_tabs . $script_contr . $script_display_field;
<canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas>
</div>
<div id="layer_menu" style="display:none;">
<div align="center" style="padding-top:5px;">
<div class="center" style="padding-top:5px;">
<a href="#"
onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self">
<img title="<?php echo __('Hide/Show all'); ?>" alt="v"
@ -166,10 +166,10 @@ for ($i = 0; $i < $name_cnt; $i++) {
</table>
</div>
<div align="center">
<div class="center">
<?php echo __('Number of tables') . ': ' . $name_cnt; ?>
</div>
<div align="right">
<div class="right">
<div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">
</div>
</div>
@ -330,7 +330,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<div id='layer_action' style="display:none;">Load...</div>
<table id="layer_new_relation" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -340,15 +340,15 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
</tr>
</thead>
<tbody id="foreign_relation">
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong>FOREIGN KEY</strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong>FOREIGN KEY</strong></td>
</tr>
<tr>
<td width="58" nowrap="nowrap">on delete</td>
@ -375,7 +375,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="New_relation()" />
<input type="button" class="butt" name="Button"
@ -397,7 +397,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="layer_upd_relation" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -407,12 +407,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="100%" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="100%" class="center" cellpadding="2" cellspacing="0">
<tr>
<td colspan="3" align="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
<td colspan="3" class="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
</tr>
<tr>
<td colspan="3" align="center" nowrap="nowrap">
<td colspan="3" class="center" nowrap="nowrap">
<input name="Button" type="button" class="butt"
onclick="Upd_relation()" value="<?php echo __('Delete'); ?>" />
<input type="button" class="butt" name="Button"
@ -432,7 +432,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="pmd_optionse" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -442,23 +442,23 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td>
<td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" class="center"></td>
</tr>
</thead>
<tbody id="where">
<tr><td align="center" nowrap="nowrap"><b>WHERE</b></td></tr>
<tr><td class="center" nowrap="nowrap"><b>WHERE</b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="102"><select name="rel_opt" id="rel_opt">
<option value="--" selected="selected"> -- </option>
<option value="=" > = </option>
<option value=">"> > </option>
<option value="<"> < </option>
<option value=">="> >= </option>
<option value="<="> <= </option>
<option value="="> = </option>
<option value="&gt;"> &gt; </option>
<option value="&lt;"> &lt; </option>
<option value="&gt;="> &gt;= </option>
<option value="&lt;="> &lt;= </option>
<option value="NOT"> NOT </option>
<option value="IN"> IN </option>
<option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@ -471,12 +471,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<td><textarea id="Query" value="" cols="18"></textarea>
</td>
</tr>
<tr><td align="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
<tr><td class="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td>
<td width="102"><input type="text" value="" id="new_name"/></td>
</tr>
<tr><td align="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
<tr><td class="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="operator" id="operator">
@ -489,14 +489,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</select>
</td></tr>
<tr>
<td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td>
<td nowrap="nowrap" width="58" class="center"><b>GROUP BY</b></td>
<td><input type="checkbox" value="groupby" id="groupby"/></td>
</tr>
<tr>
<td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td>
<td nowrap="nowrap" width="58" class="center"><b>ORDER BY</b></td>
<td><input type="checkbox" value="orderby" id="orderby"/></td>
</tr>
<tr><td align="center" nowrap="nowrap"><b>HAVING</b></td></tr>
<tr><td class="center" nowrap="nowrap"><b>HAVING</b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="h_operator" id="h_operator">
@ -513,11 +513,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="102"><select name="h_rel_opt" id="h_rel_opt">
<option value="--" selected="selected"> -- </option>
<option value="=" > = </option>
<option value=">"> > </option>
<option value="<"> < </option>
<option value=">="> >= </option>
<option value="<="> <= </option>
<option value="="> = </option>
<option value="&gt;"> &gt; </option>
<option value="&lt;"> &lt; </option>
<option value="&gt;="> &gt;= </option>
<option value="&lt;="> &lt;= </option>
<option value="NOT"> NOT </option>
<option value="IN"> IN </option>
<option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@ -532,7 +532,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="add_object()" />
<input type="button" class="butt" name="Button"
@ -554,7 +554,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="query_rename_to" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -564,10 +564,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
</tr>
</thead>
<tbody id="rename_to">
@ -580,7 +580,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Rename')" />
<input type="button" class="butt" name="Button"
@ -602,7 +602,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="query_having" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -612,10 +612,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong>HAVING</strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong>HAVING</strong></td>
</tr>
</thead>
<tbody id="rename_to">
@ -636,11 +636,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="hrel_opt" id="hrel_opt">
<option value="--" selected="selected"> -- </option>
<option value="=" > = </option>
<option value=">"> > </option>
<option value="<"> < </option>
<option value=">="> >= </option>
<option value="<="> <= </option>
<option value="="> = </option>
<option value="&gt;"> &gt; </option>
<option value="&lt;"> &lt; </option>
<option value="&gt;="> &gt;= </option>
<option value="&lt;="> &lt;= </option>
<option value="NOT"> NOT </option>
<option value="IN"> IN </option>
<option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@ -656,7 +656,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Having')" />
<input type="button" class="butt" name="Button"
@ -678,7 +678,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="query_Aggregate" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -688,10 +688,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
</tr>
</thead>
<tbody>
@ -710,7 +710,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" />
<input type="button" class="butt" name="Button"
@ -732,7 +732,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<table id="query_where" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
width="5%" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="frams1" width="10px"></td>
@ -742,10 +742,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<tr>
<td class="frams8"></td>
<td class="input_tab">
<table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" align="center" nowrap="nowrap"><strong>WHERE</strong></td>
<td colspan="2" class="center" nowrap="nowrap"><strong>WHERE</strong></td>
</tr>
</thead>
<tbody id="rename_to">
@ -754,10 +754,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<td width="102"><select name="erel_opt" id="erel_opt">
<option value="--" selected="selected"> -- </option>
<option value="=" > = </option>
<option value=">"> > </option>
<option value="<"> < </option>
<option value=">="> >= </option>
<option value="<="> <= </option>
<option value="&gt;"> &gt; </option>
<option value="&lt;"> &lt; </option>
<option value="&gt;="> &gt;= </option>
<option value="&lt;="> &lt;= </option>
<option value="NOT"> NOT </option>
<option value="IN"> IN </option>
<option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@ -773,7 +773,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" align="center" nowrap="nowrap">
<td colspan="2" class="center" nowrap="nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Where')" />
<input type="button" class="butt" name="Button"

4
pmd_pdf.php
View File

@ -5,7 +5,7 @@
* @package PhpMyAdmin-Designer
*/
require_once './libraries/pmd_common.php';
require_once 'libraries/pmd_common.php';
/**
* If called directly from the designer, first save the positions
@ -58,7 +58,7 @@ if (isset($mode)) {
}
// no need to use pmd/styles
require_once './libraries/header_meta_style.inc.php';
require_once 'libraries/header_meta_style.inc.php';
?>
</head>
<body>

2
pmd_relation_new.php
View File

@ -8,7 +8,7 @@
/**
*
*/
require_once './libraries/pmd_common.php';
require_once 'libraries/pmd_common.php';
$die_save_pos = 0;
require_once 'pmd_save_pos.php';
extract($_POST, EXTR_SKIP);

2
pmd_relation_upd.php
View File

@ -8,7 +8,7 @@
/**
*
*/
require_once './libraries/pmd_common.php';
require_once 'libraries/pmd_common.php';
extract($_POST, EXTR_SKIP);
extract($_GET, EXTR_SKIP);
$die_save_pos = 0;

2
pmd_save_pos.php
View File

@ -8,7 +8,7 @@
/**
*
*/
require_once './libraries/pmd_common.php';
require_once 'libraries/pmd_common.php';
$cfgRelation = PMA_getRelationsParam();

4
po/af.po
View File

@ -2880,10 +2880,10 @@ msgstr ""
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"Die <tt>$cfg['PmaAbsoluteUri']</tt> veranderlike MOET gestel wees in jou "
"Die <code>$cfg['PmaAbsoluteUri']</code> veranderlike MOET gestel wees in jou "
"konfigurasie leer!"
#: libraries/common.inc.php:647

4
po/ar.po
View File

@ -2769,10 +2769,10 @@ msgstr "لا يمكن تحميل الإعدادات الإفتراضية من :
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"المتغير <span dir=\"ltr\"><tt>$cfg['PmaAbsoluteUri']</tt></span> يجب تعديله "
"المتغير <span dir=\"ltr\"><code>$cfg['PmaAbsoluteUri']</code></span> يجب تعديله "
"في ملف التعريف !"
#: libraries/common.inc.php:647

4
po/az.po
View File

@ -2911,10 +2911,10 @@ msgstr ""
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"<tt>$cfg['PmaAbsoluteUri']</tt> direktivi PMA konfiqurasiya faylınızda "
"<code>$cfg['PmaAbsoluteUri']</code> direktivi PMA konfiqurasiya faylınızda "
"QURULMAMIŞDIR!"
#: libraries/common.inc.php:647

4
po/be.po
View File

@ -2979,10 +2979,10 @@ msgstr "Немагчыма загрузіць канфігурацыю па зм
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"Дырэктыва <tt>$cfg['PmaAbsoluteUri']</tt> ПАВІННА быць вызначаная ў вашым "
"Дырэктыва <code>$cfg['PmaAbsoluteUri']</code> ПАВІННА быць вызначаная ў вашым "
"канфігурацыйным файле!"
#: libraries/common.inc.php:647

2
po/be@latin.po
View File

@ -2994,7 +2994,7 @@ msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\""
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"Dyrektyva $cfg['PmaAbsoluteUri'] PAVINNA być vyznačanaja ŭ vašym "

4
po/bg.po
View File

@ -2757,10 +2757,10 @@ msgstr "Конфигурацията по подразбиране не може
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"На <tt>$cfg['PmaAbsoluteUri']</tt> ТРЯБВА да се зададе стойност в "
"На <code>$cfg['PmaAbsoluteUri']</code> ТРЯБВА да се зададе стойност в "
"конфигурационния файл!"
#: libraries/common.inc.php:647

4
po/bn.po
View File

@ -2893,10 +2893,10 @@ msgstr "\"%1$s\" হতে ডিফল্ট কনফিগারেশন ল
#: libraries/common.inc.php:617
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
msgstr ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"The <code>$cfg['PmaAbsoluteUri']</code> directive MUST be set in your "
"configuration file!"
#: libraries/common.inc.php:647

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