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

Merge from branch

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-26 14:43:18 +00:00
parent 6c5fd827c0
commit caffe11457
5 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* ## created 2.2.7 branch into the CVS tree ##
* lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen.
* lang/brazilian_portuguese.inc.php3: updated thanks to Renato Lins.
* sql.php3; tbl_replace.php3: patch #547030 - file_exists $goto thanks to
Melvyn Sopacua <nyvlem at users.sourceforge.net>.
2002-04-26 Marc Delisle <lem9@users.sourceforge.net>
* tbl_qbe.php3: automatic joints from Relation table, thanks
to Mike Beck (mike.beck at ibmiller.de)

10
lang/brazilian_portuguese.inc.php3
View File

@@ -1,6 +1,10 @@
<?php
/* $Id$ */
/**
* Translated by Renato Lins <thbest at information4u.com>
*/
$charset = 'iso-8859-1';
$text_dir = 'ltr';
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
@@ -51,6 +55,7 @@ $strAttr = 'Atributos';
$strBack = 'Voltar';
$strBinary = ' Bin<69>rio ';
$strBinaryDoNotEdit = ' Bin<69>rio - n<>o edite ';
$strBookmarkDeleted = 'O bookmark foi removido.';
$strBookmarkLabel = 'Nome';
$strBookmarkQuery = 'Procura de SQL salva';
$strBookmarkThis = 'Salvar essa procura de SQL';
@@ -63,6 +68,7 @@ $strCantRenameIdxToPrimary = 'N
$strCardinality = 'Cardinalidade';
$strCarriage = 'Caracter de retorno: \\r';
$strChange = 'Muda';
$strChangePassword = 'Mude a senha';
$strCheckAll = 'Marcar All';
$strCheckDbPriv = 'Verifica Privil<69>gios do Banco de Dados';
$strCheckTable = 'Verifica tabela';
@@ -222,6 +228,7 @@ $strPasswordEmpty = 'A senhas est
$strPasswordNotSame = 'As senhas n<>o s<>o a mesma!';
$strPHPVersion = 'Vers<72>o do PHP';
$strPmaDocumentation = 'Documenta<74><61>o do phpMyAdmin ';
$strPmaUriError = 'A diretiva <tt>$cfg[\'PmaAbsoluteUri\']</tt> Deve ser setada';
$strPos1 = 'In<49>cio';
$strPrevious = 'Anterior';
$strPrimary = 'Prim<69>ria';
@@ -345,8 +352,5 @@ $strYes = 'Sim';
$strZip = '"compactado com zip"';
// To translate
$strBookmarkDeleted = 'The bookmark has been deleted.';
$strChangePassword = 'Change password'; //to translate
$strPmaUriError = 'The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!';
$strLinksTo = 'Links to'; //to translate
?>

21
lang/norwegian.inc.php3
View File

@@ -1,6 +1,10 @@
<?php
/* $Id$ */
/**
* Translated by Sven-Erik Andersen <sven_erik at andersen.as>
*/
$charset = 'iso-8859-1';
$text_dir = 'ltr';
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
@@ -57,7 +61,7 @@ $strBookmarkQuery = 'Lagret SQL-sp
$strBookmarkThis = 'Lagre denne SQL-sp<73>rringen';
$strBookmarkView = 'Bare se';
$strBrowse = 'Se p<>';
$strBzip = '"bzipped"';
$strBzip = 'Komprimert (bz2)';
$strCantLoadMySQL = 'kan ikke starte MySQL modulen,<br />vennligst kontroller PHP konfigureringen.';
$strCantRenameIdxToPrimary = 'Kan ikke endre indeks til PRIMARY!';
@@ -65,7 +69,7 @@ $strCardinality = 'Kardinalitet';
$strCarriage = 'Linjeskift (Mac): \\r';
$strChange = 'Endre';
$strChangePassword = 'Endre passord';
$strCheckAll = 'Kontroller alle';
$strCheckAll = 'Merk alle';
$strCheckDbPriv = 'Kontroller database privilegier';
$strCheckTable = 'Kontroller tabell';
$strColumn = 'Kolonne';
@@ -116,6 +120,7 @@ $strEnd = 'Slutt';
$strEnglishPrivileges = ' OBS: MySQL privilegie navn er p<> engelsk ';
$strError = 'Feil';
$strExtra = 'Ekstra';
$strExtendedInserts = 'Utvidete innlegg';
$strField = 'Felt';
$strFieldHasBeenDropped = 'Feltet %s har blitt slettet';
@@ -134,7 +139,7 @@ $strFunction = 'Funksjon';
$strGenTime = 'Generert den';
$strGo = 'Utf<74>r';
$strGrants = 'Rettigheter';
$strGzip = '"gzipped"';
$strGzip = 'Komprimert (gz)';
$strHasBeenAltered = 'er endret.';
$strHasBeenCreated = 'er opprettet.';
@@ -231,11 +236,11 @@ $strPrimaryKey = 'Prim
$strPrimaryKeyHasBeenDropped = 'Prim<69>r-n<>kkelen har blitt slettet';
$strPrimaryKeyName = 'Navnet til prim&aelig;rn&oslash;kkelen m&aring; v&aelig;re... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>m&aring;</b> v&aelig;re navnet til og <b>bare til</b> en prim&aelig;rn&oslash;kkel!)';
$strPrintView = 'Forh<EFBFBD>ndsvisning';
$strPrintView = 'Utskriftsvennlig forh<EFBFBD>ndsvisning';
$strPrivileges = 'Privilegier';
$strProperties = 'Egenskaper';
$strQBE = 'Sp<53>rring ved eksempel';
$strQBE = 'Sp<53>rring ved eksempel (Query by Example)';
$strQBEDel = 'Slett';
$strQBEIns = 'Sett inn';
$strQueryOnDb = 'SQL-sp<73>rring i database <b>%s</b>:';
@@ -275,7 +280,7 @@ $strSelectADb = 'Vennligst velg en database';
$strSelectAll = 'Velg alle';
$strSelectFields = 'Velg felt (minst ett):';
$strSelectNumRows = 'i sp<73>rring';
$strSend = 'Last ned og lagre som fil';
$strSend = 'Last ned som fil';
$strServerChoice = 'Server valg';
$strServerVersion = 'Server versjon';
$strSetEnumVal = 'Hvis felttypen er "enum" eller "set", skriv inn verdien med dette formatet: \'a\',\'b\',\'c\'...<br />Hvis du skulle trenge <20> ha en skr<6B>strek ("\") eller en enkel apostrof ("\'") blant disse verdiene, skriv en skr<6B>strek foran (eks. \'\\\\xyz\' eller \'a\\\'b\').';
@@ -319,7 +324,7 @@ $strTheTerminator = 'Tegn som angir slutt p
$strTotal = 'totalt';
$strType = 'Type';
$strUncheckAll = 'Fjern avmerking';
$strUncheckAll = 'Fjern merking';
$strUnique = 'Unik';
$strUnselectAll = 'Fjern alle valgte';
$strUpdatePrivMessage = 'Du har oppdatert privilegiene til %s.';
@@ -344,7 +349,7 @@ $strWrongUser = 'Ugyldig brukernavn/passord. Ingen tilgang.';
$strYes = 'Ja';
$strZip = '"komprimert (zip)"';
$strZip = 'Komprimert (zip)';
// To translate
$strLinksTo = 'Links to'; //to translate

15
sql.php3
View File

@@ -12,8 +12,19 @@ require('./libraries/common.lib.php3');
/**
* Defines the url to return to in case of error in a sql statement
*/
// Security checkings
if (!empty($goto)) {
$is_gotofile = ereg_replace('^([^?]+).*$', '\\1', $goto);
if (!@file_exists('./' . $is_gotofile)) {
unset($goto);
} else {
$is_gotofile = ($is_gotofile == $goto);
}
} // end if (security checkings)
if (empty($goto)) {
$goto = (empty($table)) ? 'db_details.php3' : 'tbl_properties.php3';
$is_gotofile = TRUE;
}
if (!isset($err_url)) {
$err_url = $goto
@@ -110,7 +121,7 @@ if (isset($btnDrop) && $btnDrop == $strNo) {
if (!empty($back)) {
$goto = $back;
}
if (@file_exists('./' . $goto)) {
if ($is_gotofile) {
if ($goto == 'db_details.php3' && !empty($table)) {
unset($table);
}
@@ -319,7 +330,7 @@ else {
$message = $strEmptyResultSet;
}
if (@file_exists('./' . $goto)) {
if ($is_gotofile) {
$goto = ereg_replace('\.\.*', '.', $goto);
// Checks for a valid target script
if (isset($table) && $table == '') {

17
tbl_replace.php3
View File

@@ -16,6 +16,7 @@ require('./libraries/common.lib.php3');
if (isset($sql_query)) {
$sql_query = urldecode($sql_query);
}
$is_gotofile = FALSE;
if (isset($after_insert) && $after_insert == 'new_insert') {
$goto = 'tbl_change.php3'
. '?lang=' . $lang
@@ -39,7 +40,17 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
. '&disp_direction=' . $disp_direction
. '&repeat_cells=' . $repeat_cells
. '&sql_query=' . urlencode($sql_query);
} else if (!empty($goto)) {
// Security checkings
$is_gotofile = ereg_replace('^([^?]+).*$', '\\1', $goto);
if (!@file_exists('./' . $is_gotofile)) {
$goto = (empty($table)) ? 'db_details.php3' : 'tbl_properties.php3';
$is_gotofile = TRUE;
} else {
$is_gotofile = ($is_gotofile == $goto);
}
}
// Defines the url to return in case of failure of the query
if (isset($err_url)) {
$err_url = urldecode($err_url);
@@ -47,11 +58,13 @@ if (isset($err_url)) {
$err_url = str_replace('&', '&amp;', $goto)
. (empty($primary_key) ? '' : '&amp;primary_key=' . $primary_key);
}
// Resets tables defined in the configuration file
reset($fields);
if (isset($funcs)) {
reset($funcs);
}
// Misc
if (get_magic_quotes_gpc()) {
$submit_type = stripslashes($submit_type);
@@ -140,7 +153,7 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
// No change -> move back to the calling script
else {
$message = $strNoModification;
if (@file_exists('./' . $goto)) {
if ($is_gotofile) {
$js_to_run = 'functions.js';
include('./header.inc.php3');
include('./' . ereg_replace('\.\.*', '.', $goto));
@@ -240,7 +253,7 @@ if (!$result) {
} else {
$message = $strModifications;
}
if (@file_exists('./' . $goto)) {
if ($is_gotofile) {
if ($goto == 'db_details.php3' && !empty($table)) {
unset($table);
}