[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13122-g21b5b87
Michal Čihař
nijel at users.sourceforge.net
Fri Aug 5 10:32:59 CEST 2011
The branch, master has been updated
via 21b5b87c9225097fd2b7cfe22d8171a264070bc1 (commit)
from 4833db7d64236ae44d240d1b49841b00d650775a (commit)
- Log -----------------------------------------------------------------
commit 21b5b87c9225097fd2b7cfe22d8171a264070bc1
Author: Michal Čihař <mcihar at suse.cz>
Date: Fri Aug 5 10:29:04 2011 +0200
Escape only parts which need it, not translated string
-----------------------------------------------------------------------
Summary of changes:
libraries/export/htmlword.php | 14 +++++++-------
libraries/export/odt.php | 22 +++++++++++-----------
libraries/export/texytext.php | 14 +++++++-------
libraries/import.lib.php | 4 ++--
libraries/sql_query_form.lib.php | 2 +-
server_synchronize.php | 2 +-
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 603729b..31303cc 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -248,15 +248,15 @@ if (isset($plugin_list)) {
}
$schema_insert = '<tr class="print-category">';
- $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>';
- $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
- $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
- $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
+ $schema_insert .= '<th class="print">' . __('Column') . '</th>';
+ $schema_insert .= '<td class="print"><b>' . __('Type') . '</b></td>';
+ $schema_insert .= '<td class="print"><b>' . __('Null') . '</b></td>';
+ $schema_insert .= '<td class="print"><b>' . __('Default') . '</b></td>';
if ($do_relation && $have_rel) {
- $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
+ $schema_insert .= '<td class="print"><b>' . __('Links to') . '</b></td>';
}
if ($do_comments) {
- $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
+ $schema_insert .= '<td class="print"><b>' . __('Comments') . '</b></td>';
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
@@ -298,7 +298,7 @@ if (isset($plugin_list)) {
}
$schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
- $schema_insert .= '<td class="print">' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
+ $schema_insert .= '<td class="print">' . (($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
$field_name = $column['Field'];
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 2d17452..a73bb85 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -106,7 +106,7 @@ if (isset($plugin_list)) {
* @access public
*/
function PMA_exportDBHeader($db) {
- $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
+ $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . __('Database') . ' ' . htmlspecialchars($db) . '</text:h>';
return true;
}
@@ -158,7 +158,7 @@ if (isset($plugin_list)) {
$field_flags[$j] = PMA_DBI_field_flags($result, $j);
}
- $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
+ $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</text:h>';
$GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
$GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
@@ -232,7 +232,7 @@ if (isset($plugin_list)) {
global $cfgRelation;
/* Heading */
- $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
+ $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</text:h>';
/**
* Get the unique keys in the table
@@ -285,31 +285,31 @@ if (isset($plugin_list)) {
/* Header */
$GLOBALS['odt_buffer'] .= '<table:table-row>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>'
+ . '<text:p>' . __('Column') . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
+ . '<text:p>' . __('Type') . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
+ . '<text:p>' . __('Null') . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
+ . '<text:p>' . __('Default') . '</text:p>'
. '</table:table-cell>';
if ($do_relation && $have_rel) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
+ . '<text:p>' . __('Links to') . '</text:p>'
. '</table:table-cell>';
}
if ($do_comments) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
+ . '<text:p>' . __('Comments') . '</text:p>'
. '</table:table-cell>';
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
+ . '<text:p>' . __('MIME type') . '</text:p>'
. '</table:table-cell>';
$mime_map = PMA_getMIME($db, $table, true);
}
@@ -342,7 +342,7 @@ if (isset($plugin_list)) {
$column['Default'] = $column['Default'];
}
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
- . '<text:p>' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
+ . '<text:p>' . (($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index c686c24..73353e1 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -227,15 +227,15 @@ if (isset($plugin_list)) {
}
$text_output = "|------\n";
- $text_output .= '|' . htmlspecialchars(__('Column'));
- $text_output .= '|' . htmlspecialchars(__('Type'));
- $text_output .= '|' . htmlspecialchars(__('Null'));
- $text_output .= '|' . htmlspecialchars(__('Default'));
+ $text_output .= '|' . __('Column');
+ $text_output .= '|' . __('Type');
+ $text_output .= '|' . __('Null');
+ $text_output .= '|' . __('Default');
if ($do_relation && $have_rel) {
- $text_output .= '|' . htmlspecialchars(__('Links to'));
+ $text_output .= '|' . __('Links to');
}
if ($do_comments) {
- $text_output .= '|' . htmlspecialchars(__('Comments'));
+ $text_output .= '|' . __('Comments');
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
@@ -277,7 +277,7 @@ if (isset($plugin_list)) {
}
$text_output .= '|' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post;
$text_output .= '|' . htmlspecialchars($type);
- $text_output .= '|' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
+ $text_output .= '|' . (($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
$text_output .= '|' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '');
$field_name = $column['Field'];
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 54c9fc6..0d16263 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -1067,8 +1067,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
$message = '<br /><br />';
$message .= '<strong>' . __('The following structures have either been created or altered. Here you can:') . '</strong><br />';
$message .= '<ul><li>' . __("View a structure's contents by clicking on its name") . '</li>';
- $message .= '<li>' . htmlspecialchars(__('Change any of its settings by clicking the corresponding "Options" link')) . '</li>';
- $message .= '<li>' . htmlspecialchars(__('Edit structure by following the "Structure" link')) . '</li>';
+ $message .= '<li>' . __('Change any of its settings by clicking the corresponding "Options" link') . '</li>';
+ $message .= '<li>' . __('Edit structure by following the "Structure" link') . '</li>';
$message .= sprintf('<br /><li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __('Options') . '</a>)</li>',
$db_url,
__('Go to database') . ': ' . htmlspecialchars(PMA_backquote($db_name)),
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index e38cac2..9172027 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -110,7 +110,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
.'<input type="hidden" name="goto" value="'
.htmlspecialchars($goto) . '" />' . "\n"
.'<input type="hidden" name="message_to_show" value="'
- . htmlspecialchars(__('Your SQL query has been executed successfully')) . '" />' . "\n"
+ . __('Your SQL query has been executed successfully') . '" />' . "\n"
.'<input type="hidden" name="prev_sql_query" value="'
. htmlspecialchars($query) . '" />' . "\n";
diff --git a/server_synchronize.php b/server_synchronize.php
index 4b4322c..3e57f44 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1109,7 +1109,7 @@ if (isset($_REQUEST['synchronize_db'])) {
$value .= '||||';
$value .= $tmp_server['only_db'];
echo '<option value="' . $value . '" >'
- . htmlspecialchars(sprintf(__('Configuration: %s'), $label)) . '</option>';
+ . sprintf(__('Configuration: %s'), htmlspecialchars($label)) . '</option>';
} // end foreach
?>
</select>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list