Merge pull request #7 from mynetx/master

Various
This commit is contained in:
Marc Delisle 2012-03-18 12:09:23 -07:00
commit a196cbd85f
185 changed files with 1605 additions and 1380 deletions

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.

File diff suppressed because it is too large Load Diff

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[

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>

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';
?>

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'];
}
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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';
?>

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>

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>

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>

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
?>

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'])) {

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';
?>

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();
?>

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

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" />

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)
});
}());
}());

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
@ -3060,9 +3060,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 +3118,7 @@ var toggleButton = function ($obj) {
*/
$(window).load(function () {
$('.toggleAjax').each(function () {
$(this)
.show()
.find('.toggleButton')
$(this).show();
toggleButton($(this));
});
});
@ -3626,3 +3624,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");
});

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);
}

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) {

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) {

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();

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))

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() == '#') {

View File

@ -325,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";
@ -381,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";

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) {

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>

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'));

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']);

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']))
. '">'

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);
}

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";
@ -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,
@ -3866,7 +3866,7 @@ function PMA_analyzeLimitClause($limit_clause)
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>';
}
?>

View File

@ -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";
}
}

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');

View File

@ -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
@ -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>';
}

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 {

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[ */

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);

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

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" />

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";

View File

@ -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');
@ -170,7 +170,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
*/
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) {
@ -190,8 +190,8 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes
*/
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";
}

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>'

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();");
}

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"'

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();

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">

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);

View File

@ -12,7 +12,7 @@
/**
* Gets core libraries and defines some variables
*/
require './libraries/common.inc.php';
require 'libraries/common.inc.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';
?>

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

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';
/**

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

View File

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

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"

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>

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);

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;

View File

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

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

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

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

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

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 "

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

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

View File

@ -2787,10 +2787,10 @@ msgstr "N'eus ket bet gallet kargañ ar c'hefluniadur dre ziouer adalek %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 ""
"RET eo d'an arventenn <tt>$cfg['PmaAbsoluteUri']</tt> bezañ resisaet er "
"RET eo d'an arventenn <code>$cfg['PmaAbsoluteUri']</code> bezañ resisaet er "
"restr kefluniañ!"
#: libraries/common.inc.php:647

View File

@ -2909,10 +2909,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> direktiva MORA biti podješena u "
"<code>$cfg['PmaAbsoluteUri']</code> direktiva MORA biti podješena u "
"konfiguracionoj datoteci!"
#: libraries/common.inc.php:647

View File

@ -2738,10 +2738,10 @@ msgstr "No es pot carregar la configuració per defecte des de: %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 ""
"La directiva <tt>$cfg['PmaAbsoluteUri']</tt> HA d'estar establerta a l'arxiu "
"La directiva <code>$cfg['PmaAbsoluteUri']</code> HA d'estar establerta a l'arxiu "
"de configuració!"
#: libraries/common.inc.php:647

View File

@ -2748,10 +2748,10 @@ msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %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 ""
"Parametr <tt>$cfg['PmaAbsoluteUri']</tt> MUSÍ být nastaven v konfiguračním "
"Parametr <code>$cfg['PmaAbsoluteUri']</code> MUSÍ být nastaven v konfiguračním "
"souboru!"
#: libraries/common.inc.php:647

View File

@ -2905,7 +2905,7 @@ 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 ""

View File

@ -2802,10 +2802,10 @@ msgstr "Kunne ikke indlæse standardkonfiguration fra: %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 ""
"<tt>$cfg['PmaAbsoluteUri']</tt> direktivet SKAL være sat i din "
"<code>$cfg['PmaAbsoluteUri']</code> direktivet SKAL være sat i din "
"konfigurationsfil!"
#: libraries/common.inc.php:647

View File

@ -856,7 +856,7 @@ msgstr ""
msgid "The web server does not have permission to save the file %s."
msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
# Schema is not the right word for it, because a dump contains also data, and
# Schema is not the right word for it, because a dump contains also data, and
# NOT just the scheme.
#: export.php:654
#, php-format
@ -919,8 +919,8 @@ msgstr "LineString"
msgid "Outer Ring"
msgstr "Ankreis"
# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
#
# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
#
# Ja
#: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:320
msgid "Inner Ring"
@ -2795,10 +2795,10 @@ msgstr "Fehler beim Laden der Standard-Konfiguration von: %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 ""
"Das <tt>$cfg['PmaAbsoluteUri']</tt> Verzeichnis MUSS in Ihrer "
"Das <code>$cfg['PmaAbsoluteUri']</code> Verzeichnis MUSS in Ihrer "
"Konfigurationsdatei angegeben werden!"
#: libraries/common.inc.php:647
@ -3285,7 +3285,7 @@ msgstr "Zeile unter Mauscursor hervorheben"
msgid "Highlight pointer"
msgstr "Cursor hervorheben"
# Maybe the wikipedia link should point to the german version of the article
# Maybe the wikipedia link should point to the german version of the article
# (http://de.wikipedia.org/wiki/Bzip2 )
#: libraries/config/messages.inc.php:30
msgid ""
@ -5362,7 +5362,7 @@ msgstr "Aktiviere die Prüfung auf Aktualisierungen auf der Hauptseite"
msgid "Version check"
msgstr "Versionsüberprüfung"
# Maybe wikipedia links should point to $lang.wikipedia.org, eg
# Maybe wikipedia links should point to $lang.wikipedia.org, eg
# http://de.wikipedia.org/wiki/ZIP-Dateiformat
#: libraries/config/messages.inc.php:524
msgid ""

View File

@ -2779,10 +2779,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

View File

@ -2746,10 +2746,10 @@ msgstr "Could not load default configuration from: %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

View File

@ -1362,7 +1362,7 @@ msgstr "PB"
msgid "EiB"
msgstr "EB"
# singular: tabla
# singular: tabla
# plural: tablas
#: js/messages.php:128
#, php-format
@ -2787,10 +2787,10 @@ msgstr "No se pudo cargar la configuración predeterminada desde: %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 ""
"¡El contenido de <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar definido en el "
"¡El contenido de <code>$cfg['PmaAbsoluteUri']</code> DEBE estar definido en el "
"archivo de configuración config.inc.php!"
#: libraries/common.inc.php:647
@ -12844,7 +12844,7 @@ msgstr ""
msgid "Percentage of used open files limit"
msgstr "Porcentaje de uso del límite de archivos de abiertos"
# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto
# traducirlo
#: po/advisory_rules.php:186
msgid ""

View File

@ -2748,10 +2748,10 @@ msgstr "Ei saanud laadida vaikimisi seadistuse faili kohast: %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 ""
"<tt>$cfg['PmaAbsoluteUri']</tt> väärtus PEAB sinu seadistusfailis olema "
"<code>$cfg['PmaAbsoluteUri']</code> väärtus PEAB sinu seadistusfailis olema "
"määratud!"
#: libraries/common.inc.php:647

View File

@ -2857,10 +2857,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> direktibak zure konfigurazio fitxategian "
"<code>$cfg['PmaAbsoluteUri']</code> direktibak zure konfigurazio fitxategian "
"zehaztuta behar du egon!"
#: libraries/common.inc.php:647

View File

@ -2873,7 +2873,7 @@ 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 ""

View File

@ -2840,9 +2840,9 @@ msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%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 "<tt>$cfg['PmaAbsoluteUri']</tt> täytyy määritellä asetustiedostossa!"
msgstr "<code>$cfg['PmaAbsoluteUri']</code> täytyy määritellä asetustiedostossa!"
#: libraries/common.inc.php:647
#, php-format

View File

@ -2775,10 +2775,10 @@ msgstr "Chargement de la configuration par défaut impossible depuis %1$s"
# OK
#: 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 ""
"Le paramètre <tt>$cfg['PmaAbsoluteUri']</tt> DOIT être renseigné dans votre "
"Le paramètre <code>$cfg['PmaAbsoluteUri']</code> DOIT être renseigné dans votre "
"fichier de configuration !"
#: libraries/common.inc.php:647

View File

@ -2986,10 +2986,10 @@ msgstr "Non se puido cargar a configuración desde: \"%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 ""
"A directiva <tt>$cfg['PmaAbsoluteUri']</tt> DEBE estar asignada no seu "
"A directiva <code>$cfg['PmaAbsoluteUri']</code> DEBE estar asignada no seu "
"ficheiro de configuración."
#: libraries/common.inc.php:647

View File

@ -2913,7 +2913,7 @@ 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 ""

View File

@ -2862,10 +2862,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 ""
"<tt>$cfg['PmaAbsoluteUri']</tt> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
"<code>$cfg['PmaAbsoluteUri']</code> निर्देश आपकी विन्यास फाइल मैं सेट होना आवश्यक है"
#: libraries/common.inc.php:647
#, php-format

View File

@ -2975,10 +2975,10 @@ msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%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 ""
"Direktiva <tt>$cfg['PmaAbsoluteUri']</tt> MORA BITI postavljena u vašoj "
"Direktiva <code>$cfg['PmaAbsoluteUri']</code> MORA BITI postavljena u vašoj "
"konfiguracijskoj datoteci!"
#: libraries/common.inc.php:647

View File

@ -2766,10 +2766,10 @@ msgstr "Nem lehetett betölteni az alapértelmezett konfigurációt innen: %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 ""
"A <tt>$cfg['PmaAbsoluteUri']</tt> utasítás értékét a konfigurációs fájlban "
"A <code>$cfg['PmaAbsoluteUri']</code> utasítás értékét a konfigurációs fájlban "
"KELL megadni!"
#: libraries/common.inc.php:647

View File

@ -2759,10 +2759,10 @@ msgstr "Tidak dapat memuat konfigurasi default dari: %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 ""
"Directif <tt>$cfg['PmaAbsoluteUri']</tt> WAJIB diset dalam berkas "
"Directif <code>$cfg['PmaAbsoluteUri']</code> WAJIB diset dalam berkas "
"konfigurasi!"
#: libraries/common.inc.php:647

View File

@ -2779,10 +2779,10 @@ msgstr "Non posso caricare la configurazione predefinita da: %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 ""
"La direttiva <tt>$cfg['PmaAbsoluteUri']</tt> DEVE essere impostata nel file "
"La direttiva <code>$cfg['PmaAbsoluteUri']</code> DEVE essere impostata nel file "
"di configurazione!"
#: libraries/common.inc.php:647

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