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 15:17:32 +01:00
commit 7ee2a34c38
9 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
error_report.php
View File

@ -31,7 +31,7 @@ if (isset($_REQUEST['send_error_report'])
PMA_Message::error(
__(
'An error has been detected and an error report has been '
.'automatically submitted based on your settings.'
. 'automatically submitted based on your settings.'
)
. '<br />'
. __('You may want to refresh the page.')

2
gis_data_editor.php
View File

@ -383,7 +383,7 @@ for ($a = 0; $a < $geom_count; $a++) {
echo '<br/>';
echo '<input type="submit"'
. ' name="gis_data[' . $a . '][' . $type . '][' . $k . '][add_line]"'
. ' class="add addLine" value="' . __('Add an inner ring'). '" />';
. ' class="add addLine" value="' . __('Add an inner ring') . '" />';
echo '<br/>';
}
echo '<br/>';

2
import_status.php
View File

@ -85,7 +85,7 @@ if (isset($_GET["message"]) && $_GET["message"]) {
echo '<fieldset class="tblFooters">' . "\n";
echo ' [ <a href="' . $_SESSION['Import_message']['go_back_url']
. '">' . __('Back') . '</a> ]' . "\n";
echo '</fieldset>'."\n";
echo '</fieldset>' . "\n";
} else {
PMA_importAjaxStatus($_GET["id"]);

6
index.php
View File

@ -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,
@ -633,10 +633,10 @@ function PMA_printListItem($name, $listId = null, $url = null,
echo ' target="' . $target . '"';
}
if (null != $a_id) {
echo ' id="' . $a_id .'"';
echo ' id="' . $a_id . '"';
}
if (null != $a_class) {
echo ' class="' . $a_class .'"';
echo ' class="' . $a_class . '"';
}
echo '>';
}

44
pmd_general.php
View File

@ -257,10 +257,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input type="checkbox" value="select_all_'
.htmlspecialchars($t_n_url).'" style="margin: 0px;" ';
echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" ';
echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url) .'\',\''
.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>';
. htmlspecialchars($t_n_url) . '" style="margin: 0px;" ';
echo 'id="select_all_' . htmlspecialchars($t_n_url) . '" title="select all" ';
echo 'onclick="Select_all(\'' . htmlspecialchars($t_n_url) . '\',\''
. htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]) . '\')"></td>';
}
?>
<td class="small_tab" onmouseover="this.className='small_tab2';"
@ -292,11 +292,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<?php
if (isset($_REQUEST['query'])) {
echo '<td class="tab_zag" onmouseover="Table_onover(\''
.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'
.htmlspecialchars($t_n_url).'_2"';
. htmlspecialchars($t_n_url) . '\',0,1)" id="id_zag_'
. htmlspecialchars($t_n_url) . '_2"';
echo 'onmousedown="cur_click=document.getElementById(\''
.htmlspecialchars($t_n_url).'\');"';
echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">';
. htmlspecialchars($t_n_url) . '\');"';
echo 'onmouseout="Table_onover(\'' . htmlspecialchars($t_n_url) . '\',1,1)">';
}
?>
</tr>
@ -331,34 +331,34 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
onmouseout="this.className = old_class;"
onmousedown="Click_field('<?php
echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]."','"
.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])."',";
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])."',";
if (!PMA_Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
echo (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0);
} else {
// if foreign keys are supported, it's not necessary that the
// index is a primary key
echo (isset($tables_all_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0);
echo (isset($tables_all_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0);
}
?>)">
<?php
if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input value="'.htmlspecialchars($t_n_url)
.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"';
echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'
.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
echo 'style="margin: 0px;" title="select_'
.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
echo '<input value="' . htmlspecialchars($t_n_url)
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '"';
echo 'type="checkbox" id="select_' . htmlspecialchars($t_n_url) . '._'
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '" ';
echo 'style="margin: 0px;" title="select_'
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '" ';
echo 'onclick="store_column(\''
.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''
.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''
.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>';
. urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]) . '\',\''
. htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]) . '\',\''
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '\')"></td>';
}?>
<td width="10px" colspan="3"
id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>">
id="<?php echo $t_n_url . "." . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>">
<div class="nowrap">
<?php
if (isset($tables_pk_or_unique_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]])) {
if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) {
?>
<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/FieldKey_small.png"
alt="*" />
@ -399,7 +399,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
echo 'onmouseout="this.className=\'small_tab_pref\';"';
echo 'onclick="Click_option(\'pmd_optionse\',\''
. urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '\',\''
. $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >';
. $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i] . '\')" >';
echo '<img src="'
. $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png')
. '" title="options" alt="" /></td> ';

6
pmd_pdf.php
View File

@ -75,14 +75,14 @@ if (isset($_POST['mode'])) {
if ('import' == $_POST['mode']) {
PMA_queryAsControlUser(
'UPDATE ' . $pma_table . ',' . $pmd_table .
' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * '. $scale_q . ',
' . $pmd_table . '.`y`= ' . $pma_table . '.`y` * '. $scale_q .'
' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * ' . $scale_q . ',
' . $pmd_table . '.`y`= ' . $pma_table . '.`y` * ' . $scale_q . '
WHERE
' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name`
AND
' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name`
AND
' . $pmd_table . '.`db_name`=\''. PMA_Util::sqlAddSlashes($db) . '\'
' . $pmd_table . '.`db_name`=\'' . PMA_Util::sqlAddSlashes($db) . '\'
AND pdf_page_number = ' . $pdf_page_number_q . ';',
true, PMA_DatabaseInterface::QUERY_STORE
);

14
pmd_relation_new.php
View File

@ -121,13 +121,13 @@ function PMD_Return_new($b,$ret)
global $db,$T1,$F1,$T2,$F2;
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
die('<root act="relation_new" return="'.$ret.'" b="'.$b.
'" DB1="'.urlencode($db).
'" T1="'.urlencode($T1).
'" F1="'.urlencode($F1).
'" DB2="'.urlencode($db).
'" T2="'.urlencode($T2).
'" F2="'.urlencode($F2).
die('<root act="relation_new" return="' . $ret . '" b="' . $b .
'" DB1="' . urlencode($db) .
'" T1="' . urlencode($T1) .
'" F1="' . urlencode($F1) .
'" DB2="' . urlencode($db) .
'" T2="' . urlencode($T2) .
'" F2="' . urlencode($F2) .
'"></root>');
}
?>

2
pmd_relation_upd.php
View File

@ -53,7 +53,7 @@ if ($try_to_delete_internal_relation) {
PMA_queryAsControlUser(
'DELETE FROM '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
. $cfg['Server']['relation'].' WHERE '
. $cfg['Server']['relation'] . ' WHERE '
. 'master_db = \'' . PMA_Util::sqlAddSlashes($DB2) . '\''
. ' AND master_table = \'' . PMA_Util::sqlAddSlashes($T2) . '\''
. ' AND master_field = \'' . PMA_Util::sqlAddSlashes($F2) . '\''

6
user_password.php
View File

@ -234,9 +234,9 @@ function PMA_changePassDisplayPage($message, $sql_query, $_url_params)
echo PMA_Util::getMessage(
$message, $sql_query, 'success'
);
echo '<a href="index.php'.PMA_URL_getCommon($_url_params)
.' target="_parent">'. "\n"
.'<strong>'.__('Back').'</strong></a>';
echo '<a href="index.php' . PMA_URL_getCommon($_url_params)
. ' target="_parent">' . "\n"
. '<strong>' . __('Back') . '</strong></a>';
exit;
}
?>