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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-08 10:07:48 +01:00
commit 2965986bd1
22 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_structure.php
View File

@ -28,7 +28,7 @@ if ((!empty($_POST['submit_mult']) && isset($_POST['selected_tbl']))
|| isset($_POST['mult_btn'])
) {
$action = 'db_structure.php';
$err_url = 'db_structure.php?'. PMA_URL_getCommon($db);
$err_url = 'db_structure.php?' . PMA_URL_getCommon($db);
// see bug #2794840; in this case, code path is:
// db_structure.php -> libraries/mult_submits.inc.php -> sql.php

2
db_tracking.php
View File

@ -218,7 +218,7 @@ if (isset($my_tables)) {
foreach ($my_tables as $key => $tablename) {
if (PMA_Tracker::getVersion($GLOBALS['db'], $tablename) == -1) {
$my_link = '<a href="tbl_tracking.php?' . $url_query
. '&amp;table=' . htmlspecialchars($tablename) .'">';
. '&amp;table=' . htmlspecialchars($tablename) . '">';
$my_link .= PMA_Util::getIcon('eye.png', __('Track table'));
$my_link .= '</a>';
?>

2
gis_data_editor.php
View File

@ -240,7 +240,7 @@ for ($a = 0; $a < $geom_count; $a++) {
echo '<label for="y">' . __("Y") . '</label>';
echo '<input type="text"'
. ' name="gis_data[' . $a . '][' . $type . '][' . $i . '][y]"'
. ' value="' . escape($gis_data[$a][$type][$i]['y']). '" />';
. ' value="' . escape($gis_data[$a][$type][$i]['y']) . '" />';
}
echo '<input type="submit"'
. ' name="gis_data[' . $a . '][' . $type . '][add_point]"'

2
import.php
View File

@ -151,7 +151,7 @@ if (! in_array(
$post_patterns = array(
'/^force_file_/',
'/^'. $format . '_/'
'/^' . $format . '_/'
);
foreach (array_keys($_POST) as $post_key) {
foreach ($post_patterns as $one_post_pattern) {

4
index.php
View File

@ -169,7 +169,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
echo ' <form method="post" action="index.php">' . "\n"
. PMA_URL_getHiddenInputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
. ' '. PMA_Util::getImage('s_asci.png') . " "
. ' ' . PMA_Util::getImage('s_asci.png') . " "
. __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_Util::showMySQLDocu('Charset-connection')
@ -223,7 +223,7 @@ echo '</ul>';
if ($server > 0) {
echo '<ul>';
PMA_printListItem(
PMA_Util::getImage('b_tblops.png')." " .__('More settings'),
PMA_Util::getImage('b_tblops.png') . " " .__('More settings'),
'li_user_preferences',
'prefs_manage.php?' . $common_url_query,
null,

4
libraries/DatabaseInterface.class.php
View File

@ -512,7 +512,7 @@ class PMA_DatabaseInterface
if ($table || (true === $tbl_is_group) || $tble_type) {
$sql = 'SHOW TABLE STATUS FROM '
. PMA_Util::backquote($each_database)
.' WHERE';
. ' WHERE';
$needAnd = false;
if ($table || (true === $tbl_is_group)) {
$sql .= " `Name` LIKE '"
@ -1934,7 +1934,7 @@ class PMA_DatabaseInterface
. $one_result['full_trigger_name'];
$one_result['create'] = 'CREATE TRIGGER '
. $one_result['full_trigger_name'] . ' '
. $trigger['ACTION_TIMING']. ' '
. $trigger['ACTION_TIMING'] . ' '
. $trigger['EVENT_MANIPULATION']
. ' ON ' . PMA_Util::backquote($trigger['EVENT_OBJECT_TABLE'])
. "\n" . ' FOR EACH ROW '

26
libraries/DisplayResults.class.php
View File

@ -778,7 +778,7 @@ class PMA_DisplayResults
)
. ')'
. ')'
.'">';
. '">';
$table_navigation_html .= PMA_URL_getHiddenInputs(
$this->__get('db'), $this->__get('table')
@ -3132,9 +3132,9 @@ class PMA_DisplayResults
} else {
// Consider only the case of creating link for column field
// sql query need to be pass as url param
$sql = 'SELECT `'.$column_value.'` FROM `'
. $row_info[$link_relations['link_param'][1]] .'`.`'
. $row_info[$link_relations['link_param'][2]] .'`';
$sql = 'SELECT `' . $column_value . '` FROM `'
. $row_info[$link_relations['link_param'][1]] . '`.`'
. $row_info[$link_relations['link_param'][2]] . '`';
$linking_url_params[$link_relations['link_param'][0]] = $sql;
}
@ -3295,7 +3295,7 @@ class PMA_DisplayResults
$support_html .= ' <th colspan="'
. $vertical_display['emptypre'] . '">'
. "\n".' &nbsp;</th>' . "\n";
. "\n" . ' &nbsp;</th>' . "\n";
} else if ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE) {
$support_html .= ' <th></th>' . "\n";
@ -3659,7 +3659,7 @@ class PMA_DisplayResults
if (! isset($column) || is_null($column)) {
$cell = $this->_buildNullDisplay(
'right '.$class, $condition_field, $meta, ''
'right ' . $class, $condition_field, $meta, ''
);
} elseif ($column != '') {
@ -3668,7 +3668,7 @@ class PMA_DisplayResults
$where_comparison = ' = ' . $column;
$cell = $this->_getRowData(
'right '.$class, $condition_field,
'right ' . $class, $condition_field,
$analyzed_sql, $meta, $map, $column,
$transformation_plugin, $default_function, $nowrap,
$where_comparison, $transform_options,
@ -3677,7 +3677,7 @@ class PMA_DisplayResults
} else {
$cell = $this->_buildEmptyDisplay(
'right '.$class, $condition_field, $meta, ''
'right ' . $class, $condition_field, $meta, ''
);
}
@ -5113,12 +5113,12 @@ class PMA_DisplayResults
$links_html .= "\n";
$links_html .= '<input type="hidden" name="sql_query"'
.' value="' . htmlspecialchars($this->__get('sql_query')) . '" />'
. ' value="' . htmlspecialchars($this->__get('sql_query')) . '" />'
. "\n";
if (! empty($url_query)) {
$links_html .= '<input type="hidden" name="url_query"'
.' value="' . $url_query . '" />' . "\n";
. ' value="' . $url_query . '" />' . "\n";
}
// fetch last row of the result set
@ -5140,7 +5140,7 @@ class PMA_DisplayResults
$GLOBALS['dbi']->dataSeek($dt_result, 0);
$links_html .= '<input type="hidden" name="clause_is_unique"'
.' value="' . $clause_is_unique . '" />' . "\n";
. ' value="' . $clause_is_unique . '" />' . "\n";
$links_html .= '</form>' . "\n";
@ -5487,7 +5487,7 @@ class PMA_DisplayResults
$size = strlen($content);
$display_size = PMA_Util::formatByteDown($size, 3, 1);
$result .= ' - '. $display_size[0] . ' ' . $display_size[1];
$result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
} else {
@ -5743,7 +5743,7 @@ class PMA_DisplayResults
);
$result .= '<input type="hidden" class="data_browse_link" value="'
. PMA_URL_getCommon($_url_params_for_show_data_row). '" />';
. PMA_URL_getCommon($_url_params_for_show_data_row) . '" />';
}

2
libraries/Footer.class.php
View File

@ -73,7 +73,7 @@ class PMA_Footer
$message .= sprintf(
__('Currently running Git revision %1$s from the %2$s branch.'),
'<a target="_blank" href="' . $repobase . $fullrevision . '">'
. $revision .'</a>',
. $revision . '</a>',
'<a target="_blank" href="' . $repobranchbase . $branch . '">'
. $branch . '</a>'
);

2
libraries/StorageEngine.class.php
View File

@ -148,7 +148,7 @@ class PMA_StorageEngine
continue;
}
$output .= ' <option value="' . htmlspecialchars($key). '"'
$output .= ' <option value="' . htmlspecialchars($key) . '"'
. (empty($details['Comment'])
? '' : ' title="' . htmlspecialchars($details['Comment']) . '"')
. (strtolower($key) == $selected

2
libraries/Table.class.php
View File

@ -1446,7 +1446,7 @@ class PMA_Table
*/
protected function getUiPrefsFromDb()
{
$pma_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) ."."
$pma_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) . "."
. PMA_Util::backquote($GLOBALS['cfg']['Server']['table_uiprefs']);
// Read from phpMyAdmin database

8
libraries/TableSearch.class.php
View File

@ -269,7 +269,7 @@ class PMA_TableSearch
$html_output = '';
if (is_array($foreignData['disp_row'])) {
$html_output .= '<select name="criteriaValues[' . $column_index . ']"'
. ' id="' . $column_id . $column_index .'">';
. ' id="' . $column_id . $column_index . '">';
$html_output .= PMA_foreignDropdown(
$foreignData['disp_row'], $foreignData['foreign_field'],
$foreignData['foreign_display'], '', $foreignMaxLimit
@ -280,7 +280,7 @@ class PMA_TableSearch
$html_output .= '<input type="text" id="' . $column_id
. $column_index . '"'
. ' name="criteriaValues[' . $column_index . ']" id="field_'
. md5($column_name) . '[' . $column_index .']" class="textfield"'
. md5($column_name) . '[' . $column_index . ']" class="textfield"'
. (isset($criteriaValues[$column_index])
&& is_string($criteriaValues[$column_index])
? (' value="' . $criteriaValues[$column_index] . '"')
@ -334,7 +334,7 @@ EOT;
|| (strncasecmp($column_type, 'set', 3) && $in_zoom_search_edit)
) {
$html_output .= '<select name="criteriaValues[' . ($column_index)
. ']" id="' . $column_id . $column_index .'">';
. ']" id="' . $column_id . $column_index . '">';
} else {
$html_output .= '<select name="criteriaValues[' . $column_index . ']"'
. ' id="' . $column_id . $column_index . '" multiple="multiple"'
@ -418,7 +418,7 @@ EOT;
}
$str .= '<input type="text" name="criteriaValues[' . $column_index . ']"'
.' size="40" class="' . $the_class . '" id="'
. ' size="40" class="' . $the_class . '" id="'
. $column_id . $column_index . '"'
. (isset($criteriaValues[$column_index])
&& is_string($criteriaValues[$column_index])

2
libraries/Tracker.class.php
View File

@ -594,7 +594,7 @@ class PMA_Tracker
" WHERE `db_name` = '" . PMA_Util::sqlAddSlashes($dbname) . "' ";
if (! empty($tablename)) {
$sql_query .= " AND `table_name` = '"
. PMA_Util::sqlAddSlashes($tablename) ."' ";
. PMA_Util::sqlAddSlashes($tablename) . "' ";
}
$sql_query .= " AND `version` = '" . PMA_Util::sqlAddSlashes($version)
. "' " . " ORDER BY `version` DESC LIMIT 1";

34
libraries/Util.class.php
View File

@ -666,7 +666,7 @@ class PMA_Util
. '</a>';
} // end if
$error_msg .= ' </p>' . "\n"
.'<p>' . "\n"
. '<p>' . "\n"
. $formatted_sql . "\n"
. '</p>' . "\n";
} // end if
@ -1739,17 +1739,17 @@ class PMA_Util
}
//Set the id for the tab, if set in the params
$id_string = ( empty($tab['id']) ? '' : ' id="'.$tab['id'].'" ' );
$id_string = ( empty($tab['id']) ? '' : ' id="' . $tab['id'] . '" ' );
$out = '<li' . ($tab['class'] == 'active' ? ' class="active"' : '') . '>';
if (! empty($tab['link'])) {
$out .= '<a class="tab' . htmlentities($tab['class']) . '"'
.$id_string
.' href="' . $tab['link'] . '" ' . $tab['attr'] . '>'
. $id_string
. ' href="' . $tab['link'] . '" ' . $tab['attr'] . '>'
. $tab['text'] . '</a>';
} else {
$out .= '<span class="tab' . htmlentities($tab['class']) . '"'
. $id_string. '>' . $tab['text'] . '</span>';
. $id_string . '>' . $tab['text'] . '</span>';
}
$out .= '</li>';
@ -1776,7 +1776,7 @@ class PMA_Util
$tab_navigation = '<div id="' . htmlentities($menu_id)
. 'container" class="menucontainer">'
.'<ul id="' . htmlentities($menu_id) . '" ' . $class . '>';
. '<ul id="' . htmlentities($menu_id) . '" ' . $class . '>';
foreach ($tabs as $tab) {
$tab_navigation .= self::getHtmlTab($tab, $url_params);
@ -1784,8 +1784,8 @@ class PMA_Util
$tab_navigation .=
'</ul>' . "\n"
.'<div class="clearfloat"></div>'
.'</div>' . "\n";
. '<div class="clearfloat"></div>'
. '</div>' . "\n";
return $tab_navigation;
}
@ -2275,8 +2275,8 @@ class PMA_Util
if ($GLOBALS['cfg']['ActionLinksMode'] == 'text') {
return ' <input type="submit" name="' . $button_name . '"'
.' value="' . htmlspecialchars($value) . '"'
.' title="' . htmlspecialchars($text) . '" />' . "\n";
. ' value="' . htmlspecialchars($value) . '"'
. ' title="' . htmlspecialchars($text) . '" />' . "\n";
}
/* Opera has trouble with <input type="image"> */
@ -2286,16 +2286,16 @@ class PMA_Util
. '" class="' . $button_class
. '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text)
. '" src="' . $GLOBALS['pmaThemeImage']. $image . '" />'
. '" src="' . $GLOBALS['pmaThemeImage'] . $image . '" />'
. ($GLOBALS['cfg']['ActionLinksMode'] == 'both'
? '&nbsp;' . htmlspecialchars($text)
: '') . "\n";
} else {
return '<button class="' . $button_class . '" type="submit"'
.' name="' . $button_name . '" value="' . htmlspecialchars($value)
. ' name="' . $button_name . '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text) . '">' . "\n"
. self::getIcon($image, $text)
.'</button>' . "\n";
. '</button>' . "\n";
}
} // end function
@ -2498,8 +2498,8 @@ class PMA_Util
. '</a>';
}
$list_navigator_html .= '<form action="' . basename($script).
'" method="post">';
$list_navigator_html .= '<form action="' . basename($script)
. '" method="post">';
$list_navigator_html .= PMA_URL_getHiddenInputs($_url_params);
$list_navigator_html .= self::pageselector(
@ -4158,13 +4158,13 @@ class PMA_Util
return null;
}
}
/**
* Returns information with regards to handling the http request
*
* @param array $context Data about the context for which
* to http request is sent
*
*
* @return array of updated context information
*/
public static function handleContext(array $context)

2
libraries/create_addfield.lib.php
View File

@ -167,7 +167,7 @@ function PMA_buildIndexStatements($indexed_fields, $index_type,
$fields[] = PMA_Util::backquote($_REQUEST['field_name'][$field_nr]);
}
$statement[] = PMA_getStatementPrefix($is_create_tbl)
.' '.$index_type.' (' . implode(', ', $fields) . ') ';
. ' ' . $index_type . ' (' . implode(', ', $fields) . ') ';
unset($fields);
return $statement;

32
libraries/error_report.lib.php
View File

@ -273,34 +273,34 @@ function PMA_getErrorReportForm()
{
$html = "";
$html .= '<form action="error_report.php" method="post" name="report_frm"'
.' id="report_frm" class="ajax">'
.'<fieldset style="padding-top:0px">';
. ' id="report_frm" class="ajax">'
. '<fieldset style="padding-top:0px">';
$html .= '<p>' . __(
'phpMyAdmin has encountered an error. We have collected data about'
.' this error as well as information about relevant configuration'
.' settings to send to the phpMyAdmin team to help us in'
.' debugging the problem.'
) .'</p>';
. ' this error as well as information about relevant configuration'
. ' settings to send to the phpMyAdmin team to help us in'
. ' debugging the problem.'
) . '</p>';
$html .= '<div class="label"><label><p>'
. __('You may examine the data in the error report:')
.'</p></label></div>'
.'<pre class="report-data">'
.PMA_getReportData()
.'</pre>';
. '</p></label></div>'
. '<pre class="report-data">'
. PMA_getReportData()
. '</pre>';
$html .= '<div class="label"><label><p>'
. __('Please explain the steps that lead to the error:')
.'</p></label></div>'
.'<textarea class="report-description" name="description"'
.'id="report_description"></textarea>';
. '</p></label></div>'
. '<textarea class="report-description" name="description"'
. 'id="report_description"></textarea>';
$html .= '<input type="checkbox" name="always_send"'
.' id="always_send_checkbox"/>'
.'<label for="always_send_checkbox">'
. ' id="always_send_checkbox"/>'
. '<label for="always_send_checkbox">'
. __('Automatically send report next time')
.'</label>';
. '</label>';
$html .= '</fieldset>';

4
libraries/import.lib.php
View File

@ -200,7 +200,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false,
$a_num_rows = (int)@$GLOBALS['dbi']->numRows($result);
$a_aff_rows = (int)@$GLOBALS['dbi']->affectedRows();
if ($a_num_rows > 0) {
$msg .= __('Rows'). ': ' . $a_num_rows;
$msg .= __('Rows') . ': ' . $a_num_rows;
$last_query_with_results = $import_run_buffer['sql'];
} elseif ($a_aff_rows > 0) {
$message = PMA_Message::getMessageForAffectedRows(
@ -711,7 +711,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type,
if ($size[M] >= $last_cumulative_size) {
return $size[FULL];
} else {
return ($last_cumulative_size.",".$size[D]);
return ($last_cumulative_size . "," . $size[D]);
}
} elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
/**

4
libraries/sql.lib.php
View File

@ -367,7 +367,7 @@ function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_valu
. '</span>'
. '<a href="browse_foreigners.php'
. PMA_URL_getCommon($_url_params) . '"'
. ' target="_blank" class="browse_foreign" ' .'>'
. ' target="_blank" class="browse_foreign" ' . '>'
. __('Browse foreign values')
. '</a>';
} else {
@ -1684,7 +1684,7 @@ function PMA_sendAjaxResponseForNoResultsReturned($message, $analyzed_sql,
$createViewHTML = $displayResultsObject->getCreateViewQueryResultOp(
$analyzed_sql
);
$response->addHTML($createViewHTML.'<br />');
$response->addHTML($createViewHTML . '<br />');
}
$response->addJSON(isset($extra_data) ? $extra_data : array());

52
libraries/sql_query_form.lib.php
View File

@ -94,22 +94,22 @@ function PMA_getHtmlForSqlQueryForm(
if ($is_querywindow) {
$html .= '<input type="hidden" name="focus_querywindow"'
.' value="true" />' . "\n";
. ' value="true" />' . "\n";
if ($display_tab != 'sql' && $display_tab != 'full') {
$html .= '<input type="hidden" name="sql_query"'
.' value="" />' . "\n";
. ' value="" />' . "\n";
$html .= '<input type="hidden" name="show_query"'
.' value="1" />' . "\n";
. ' value="1" />' . "\n";
}
}
$html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
. "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n"
.'<input type="hidden" name="pos" value="0" />' . "\n"
.'<input type="hidden" name="goto" value="'
.htmlspecialchars($goto) . '" />' . "\n"
.'<input type="hidden" name="message_to_show" value="'
. '<input type="hidden" name="pos" value="0" />' . "\n"
. '<input type="hidden" name="goto" value="'
. htmlspecialchars($goto) . '" />' . "\n"
. '<input type="hidden" name="message_to_show" value="'
. __('Your SQL query has been executed successfully') . '" />'
. "\n" .'<input type="hidden" name="prev_sql_query" value="'
. "\n" . '<input type="hidden" name="prev_sql_query" value="'
. htmlspecialchars($query) . '" />' . "\n";
// display querybox
@ -168,7 +168,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
// enable locking if inside query window
if ($is_querywindow) {
$locking = ' onkeypress="document.sqlform.elements[\'LockFromUpdate\'].'
.'checked = true;"';
. 'checked = true;"';
$height = $GLOBALS['cfg']['TextareaRows'] * 1.25;
} else {
$locking = '';
@ -224,7 +224,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
$tmp_db_link .= 'target="_parent" '
. 'onclick="window.opener.location.href = \''
. $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . PMA_URL_getCommon($db).'\';return false;"';
. '?' . PMA_URL_getCommon($db) . '\';return false;"';
}
$tmp_db_link .= '>'
. htmlspecialchars($db) . '</a>';
@ -305,7 +305,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
. ' onclick="insertValueQuery()" />';
}
$html .= '</div>' . "\n"
.'</div>' . "\n";
. '</div>' . "\n";
}
$html .= '<div class="clearfloat"></div>' . "\n";
@ -336,7 +336,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
$html .= '<div class="clearfloat"></div>' . "\n";
$html .= '</fieldset>' . "\n"
.'</div>' . "\n";
. '</div>' . "\n";
$html .= '<fieldset id="queryboxfooter" class="tblFooters">' . "\n";
$html .= '<div class="formelement">' . "\n";
@ -351,7 +351,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
$html .= '</div>' . "\n";
$html .= '<div class="formelement">' . "\n";
$html .= '<label for="id_sql_delimiter">[ ' . __('Delimiter')
.'</label>' . "\n";
. '</label>' . "\n";
$html .= '<input type="text" name="sql_delimiter" tabindex="131" size="3" '
. 'value="' . $delimiter . '" '
. 'id="id_sql_delimiter" /> ]';
@ -407,7 +407,7 @@ function PMA_getHtmlForSqlQueryFormBookmark()
$html .= '<option value="">&nbsp;</option>' . "\n";
foreach ($bookmark_list as $key => $value) {
$html .= '<option value="' . htmlspecialchars($key) . '">'
.htmlspecialchars($value) . '</option>' . "\n";
. htmlspecialchars($value) . '</option>' . "\n";
}
// &nbsp; is required for correct display with styles/line height
$html .= '</select>&nbsp;' . "\n";
@ -416,21 +416,21 @@ function PMA_getHtmlForSqlQueryFormBookmark()
$html .= __('Variable');
$html .= PMA_Util::showDocu('faq', 'faqbookmark');
$html .= '<input type="text" name="bookmark_variable" class="textfield"'
.' size="10" />' . "\n";
. ' size="10" />' . "\n";
$html .= '</div>' . "\n";
$html .= '<div class="formelement">' . "\n";
$html .= '<input type="radio" name="action_bookmark" value="0"'
.' id="radio_bookmark_exe" checked="checked" />'
.'<label for="radio_bookmark_exe">' . __('Submit')
.'</label>' . "\n";
. ' id="radio_bookmark_exe" checked="checked" />'
. '<label for="radio_bookmark_exe">' . __('Submit')
. '</label>' . "\n";
$html .= '<input type="radio" name="action_bookmark" value="1"'
.' id="radio_bookmark_view" />'
.'<label for="radio_bookmark_view">' . __('View only')
.'</label>' . "\n";
. ' id="radio_bookmark_view" />'
. '<label for="radio_bookmark_view">' . __('View only')
. '</label>' . "\n";
$html .= '<input type="radio" name="action_bookmark" value="2"'
.' id="radio_bookmark_del" />'
.'<label for="radio_bookmark_del">' . __('Delete')
.'</label>' . "\n";
. ' id="radio_bookmark_del" />'
. '<label for="radio_bookmark_del">' . __('Delete')
. '</label>' . "\n";
$html .= '</div>' . "\n";
$html .= '<div class="clearfloat"></div>' . "\n";
$html .= '</fieldset>' . "\n";
@ -488,7 +488,7 @@ function PMA_getHtmlForSqlQueryFormUpload()
);
} elseif (!empty($files)) {
$html .= '<div class="formelement">';
$html .= '<strong>' . __('web server upload directory:') .'</strong>' . "\n";
$html .= '<strong>' . __('web server upload directory:') . '</strong>' . "\n";
$html .= '<select size="1" name="sql_localfile">' . "\n";
$html .= '<option value="" selected="selected"></option>' . "\n";
$html .= $files;
@ -507,7 +507,7 @@ function PMA_getHtmlForSqlQueryFormUpload()
'charset_of_file', null, 'utf8', false
);
$html .= '<input type="submit" name="SQL" value="' . __('Go')
.'" />' . "\n";
. '" />' . "\n";
$html .= '<div class="clearfloat"></div>' . "\n";
$html .= '</fieldset>';

2
libraries/sqlparser.lib.php
View File

@ -407,7 +407,7 @@ function PMA_SQP_parse($sql)
}
} else {
$debugstr = __('Unclosed quote')
. ' @ ' . $startquotepos. "\n"
. ' @ ' . $startquotepos . "\n"
. 'STR: ' . htmlspecialchars($quotetype);
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;

40
libraries/structure.lib.php
View File

@ -181,7 +181,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
if ($server_slave_status) {
$html_output .= '<th>' . __('Replication') . '</th>' . "\n";
}
$html_output .= '<th colspan="'. ($db_is_system_schema ? 3 : 6) . '">'
$html_output .= '<th colspan="' . ($db_is_system_schema ? 3 : 6) . '">'
. __('Sum')
. '</th>';
$html_output .= '<th class="value tbl_rows">'
@ -200,7 +200,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
__('%s is the default storage engine on this MySQL server.'),
$default_engine
)
. '">' .$default_engine . '</dfn></th>' . "\n";
. '">' . $default_engine . '</dfn></th>' . "\n";
// we got a case where $db_collation was empty
$html_output .= '<th>' . "\n";
@ -273,12 +273,12 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
) {
$html_output = '<div class="clearfloat">';
$html_output .= '<img class="selectallarrow" '
. 'src="' .$pmaThemeImage .'arrow_'.$text_dir.'.png' . '"'
. 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png' . '"'
. 'width="38" height="22" alt="' . __('With selected:') . '" />';
$html_output .= '<input type="checkbox" id="tablesForm_checkall" '
. 'class="checkall_box" title="' . __('Check All') .'" />';
$html_output .= '<label for="tablesForm_checkall">' .__('Check All')
. 'class="checkall_box" title="' . __('Check All') . '" />';
$html_output .= '<label for="tablesForm_checkall">' . __('Check All')
. '</label>';
if ($overhead_check != '') {
@ -454,12 +454,12 @@ function PMA_getHtmlForStructureTableRow(
$html_output = '<tr class="' . ($odd_row ? 'odd' : 'even');
$odd_row = ! $odd_row;
$html_output .= ($table_is_view ? ' is_view' : '')
.'" id="row_tbl_' . $curr . '">';
. '" id="row_tbl_' . $curr . '">';
$html_output .= '<td class="center">'
. '<input type="checkbox" name="selected_tbl[]" class="checkall" '
. 'value="' . htmlspecialchars($current_table['TABLE_NAME']) . '" '
. 'id="checkbox_tbl_' . $curr .'" /></td>';
. 'id="checkbox_tbl_' . $curr . '" /></td>';
$html_output .= '<th>'
. $browse_table_label
@ -751,27 +751,27 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false)
}
$html_output = '<table class="data">' . "\n"
.'<thead>' . "\n"
.'<tr><th></th>' . "\n"
.'<th>'
. '<thead>' . "\n"
. '<tr><th></th>' . "\n"
. '<th>'
. PMA_sortableTableHeader(__('Table'), 'table')
. '</th>' . "\n";
if ($replication) {
$html_output .= '<th>' . "\n"
.' ' . __('Replication') . "\n"
.'</th>';
. ' ' . __('Replication') . "\n"
. '</th>';
}
$html_output .= '<th colspan="' . $action_colspan . '">' . "\n"
.' ' . __('Action') . "\n"
.'</th>'
. ' ' . __('Action') . "\n"
. '</th>'
// larger values are more interesting so default sort order is DESC
.'<th>' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC')
. '<th>' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC')
. PMA_Util::showHint(
PMA_sanitize(
__('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc].')
)
) . "\n"
.'</th>' . "\n";
. '</th>' . "\n";
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
$html_output .= '<th>' . PMA_sortableTableHeader(__('Type'), 'type')
. '</th>' . "\n";
@ -1193,7 +1193,7 @@ function PMA_getHtmlForTableStructureHeader(
$html_output .= '<th></th>'
. '<th>#</th>'
. '<th>' . __('Name') . '</th>'
. '<th>' . __('Type'). '</th>'
. '<th>' . __('Type') . '</th>'
. '<th>' . __('Collation') . '</th>'
. '<th>' . __('Attributes') . '</th>'
. '<th>' . __('Null') . '</th>'
@ -1266,7 +1266,7 @@ function PMA_getHtmlTableStructureRow($row, $rownum,
. '</th>';
$html_output .= '<td' . $type_nowrap . '>'
.'<bdo dir="ltr" lang="en">'
. '<bdo dir="ltr" lang="en">'
. $extracted_columnspec['displayed_type'] . $type_mime
. '</bdo></td>';
@ -1835,7 +1835,7 @@ function PMA_getHtmlForActionRowInStructureTable($type, $tbl_storage_engine,
$class, $hasField, $hasLinkClass, $url_query, $primary, $syntax,
$message, $action, $titles, $row, $isPrimary
) {
$html_output = '<li class="'. $class .'">';
$html_output = '<li class="' . $class . '">';
if ($type == 'text'
|| $type == 'blob'
@ -2442,7 +2442,7 @@ function PMA_updateColumns($db, $table)
$response->addJSON(
'message',
PMA_Message::rawError(
__('Query error') . ':<br />'.$GLOBALS['dbi']->getError()
__('Query error') . ':<br />' . $GLOBALS['dbi']->getError()
)
);
$regenerate = true;

4
libraries/tbl_columns_definition_form.lib.php
View File

@ -588,7 +588,7 @@ function PMA_getHtmlForColumnType($columnNumber, $ci, $ci_offset, $type_upper)
{
$select_id = 'field_' . $columnNumber . '_' . ($ci - $ci_offset);
$html = '<select class="column_type" name="field_type[' .
$columnNumber . ']"' .' id="' . $select_id . '">';
$columnNumber . ']"' . ' id="' . $select_id . '">';
$html .= PMA_Util::getSupportedDatatypes(true, $type_upper);
$html .= ' </select>';
@ -749,7 +749,7 @@ function PMA_getHtmlForMoveColumn($columnNumber, $ci, $ci_offset, $move_columns,
. (($current_index == $mi || $current_index == $mi + 1)
? ' disabled="disabled"'
: '')
.'>'
. '>'
. sprintf(
__('after %s'),
PMA_Util::backquote(

8
libraries/tbl_printview.lib.php
View File

@ -27,7 +27,7 @@ function PMA_getHtmlForTablesInfo($the_tables)
$tbl_list .= (empty($tbl_list) ? '' : ', ')
. PMA_Util::backquote($table);
}
$html .= '<strong>'. __('Showing tables:') . ' '
$html .= '<strong>' . __('Showing tables:') . ' '
. htmlspecialchars($tbl_list) . '</strong>' . "\n";
$html .= '<hr />' . "\n";
} // end if
@ -107,7 +107,7 @@ function PMA_getHtmlForPrintViewColumns(
$html .= ' ' . $field_name . "\n";
}
$html .= '</td>';
$html .= '<td>' . $type. '<bdo dir="ltr"></bdo></td>';
$html .= '<td>' . $type . '<bdo dir="ltr"></bdo></td>';
$html .= '<td>';
$html .= (($row['Null'] == '' || $row['Null'] == 'NO')
? __('No')
@ -224,7 +224,7 @@ function PMA_getHtmlForRowStatistics(
if (isset($showtable['Auto_increment'])) {
$html .= "\n";
$html .= '<tr>';
$html .= '<td>' . __('Next autoindex'). ' </td>';
$html .= '<td>' . __('Next autoindex') . ' </td>';
$html .= '<td class="right">';
$html .= PMA_Util::formatNumber(
$showtable['Auto_increment'], 0
@ -309,7 +309,7 @@ function PMA_getHtmlForSpaceUsage(
$html .= '<tr>';
$html .= '<td style="padding-right: 10px">' . __('Index') . '</td>';
$html .= '<td class="right">' . $index_size . '</td>';
$html .= '<td>' . $index_unit. '</td>';
$html .= '<td>' . $index_unit . '</td>';
$html .= '</tr>';
}
if (isset($free_size)) {