From 9a2a2a90de243e7bc4936c34b1f97cf228cbd87c Mon Sep 17 00:00:00 2001 From: ioguix Date: Mon, 18 Feb 2008 22:20:26 +0000 Subject: [PATCH] fix #1482098 Logout /Security/ Issue --- classes/Misc.php | 13 ++++++------- lang/english.php | 3 ++- lang/french.php | 14 ++++++-------- lang/recoded/english.php | 3 ++- lang/recoded/french.php | 14 ++++++-------- servers.php | 5 ++++- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/classes/Misc.php b/classes/Misc.php index 5011c53e..b6eebf31 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -2,7 +2,7 @@ /** * Class to hold various commonly used functions * - * $Id: Misc.php,v 1.169 2008/02/13 23:03:05 ioguix Exp $ + * $Id: Misc.php,v 1.170 2008/02/18 22:20:26 ioguix Exp $ */ class Misc { @@ -1102,17 +1102,16 @@ $sql_window_id = htmlspecialchars('sqledit:'.$_REQUEST['server']); $history_url = "history.php?{$this->href}&action=pophistory"; $history_window_id = htmlspecialchars('history:'.$_REQUEST['server']); + $logout_shared = isset($_SESSION['sharedUsername']) ? + ' onclick="return confirm(\''. $lang['strconfdropcred']. '\')"': + ''; echo ""; - echo "\n"; - + echo "\t
  • {$lang['strlogout']}
    • \n"; + echo "\n"; echo ""; } /* diff --git a/lang/english.php b/lang/english.php index 35d3487e..510ddb99 100755 --- a/lang/english.php +++ b/lang/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.228 2007/12/19 18:34:44 soranzo Exp $ + * $Id: english.php,v 1.229 2008/02/18 22:20:26 ioguix Exp $ */ // Language and character set @@ -133,6 +133,7 @@ $lang['strfile'] = 'File'; $lang['strfileimported'] = 'File imported.'; $lang['strtrycred'] = 'Use these credentials for all servers'; + $lang['strconfdropcred'] = 'For security reason, disconnecting will destroy your shared login information. Are you sure you want to disconnect ?'; $lang['stractionsonmultiplelines'] = 'Actions on multiple lines'; $lang['strselectall'] = 'Select all'; $lang['strunselectall'] = 'Unselect all'; diff --git a/lang/french.php b/lang/french.php index e44d8da5..8af64060 100644 --- a/lang/french.php +++ b/lang/french.php @@ -4,7 +4,7 @@ * French Language file for phpPgAdmin. * @maintainer Pascal PEYRE [pascal.peyre@cir.fr] * - * $Id: french.php,v 1.33 2007/12/19 11:08:14 ioguix Exp $ + * $Id: french.php,v 1.34 2008/02/18 22:20:26 ioguix Exp $ */ // Language and character set @@ -113,8 +113,6 @@ $lang['strseparator'] = ' :'; $lang['strexpand'] = 'Étendre'; $lang['strcollapse'] = 'Réduire'; - $lang['strexplain'] = 'Explain'; - $lang['strexplainanalyze'] = 'Explain Analyze'; $lang['strfind'] = 'Rechercher'; $lang['stroptions'] = 'Options'; $lang['strrefresh'] = 'Rafraichir'; @@ -135,6 +133,7 @@ $lang['strfile'] = 'Fichier'; $lang['strfileimported'] = 'Fichier importé.'; $lang['strtrycred'] = 'Utilisez ces identifiants pour tous les serveurs'; + $lang['strconfdropcred'] = 'Par mesure de sécurité, la déconnexion détruira vos identifiants partagés pour tous les serveurs. Êtes-vous sûr de vouloir vous déconnecter ?'; $lang['stractionsonmultiplelines'] = 'Actions sur plusieurs lignes'; $lang['strselectall'] = 'Sélectionner tout'; $lang['strunselectall'] = 'Desélectionner tout'; @@ -394,6 +393,7 @@ $lang['strlocale'] = 'Locale'; $lang['strerrordupfields'] = 'Erreur en cas de champs dupliqués'; $lang['strviewaltered'] = 'Vue modifiée.'; $lang['strviewalteredbad'] = 'Échec lors de la modification de la vue.'; +$lang['strspecifyviewtodrop'] = 'You must specify at least one view to drop.'; // Sequences $lang['strsequence'] = 'Séquence'; @@ -428,6 +428,7 @@ $lang['strlocale'] = 'Locale'; $lang['strnextval'] = 'Incrémenter la valeur'; $lang['strsequencenextval'] = 'Séquence incrémentée.'; $lang['strsequencenextvalbad'] = 'Échec lors de l\'incrémentation de la valeur.'; +$lang['strspecifysequencetodrop'] = 'You must specify at least one sequence to drop.'; // Indexes $lang['strindex'] = 'Index'; @@ -542,6 +543,7 @@ $lang['strlocale'] = 'Locale'; $lang['strfunctioncosting'] = 'Coût de la function'; $lang['strresultrows'] = 'Lignes de résultat'; $lang['strexecutioncost'] = 'Coût d\'exécution'; +$lang['strspecifyfunctiontodrop'] = 'You must specify at least one function to drop.'; // Triggers $lang['strtrigger'] = 'Trigger'; @@ -588,7 +590,6 @@ $lang['strlocale'] = 'Locale'; $lang['strdelimiter'] = 'Délimiteur'; $lang['strstorage'] = 'Stockage'; $lang['strfield'] = 'Champ'; - $lang['strvalue'] = 'Valeur'; $lang['strnumfields'] = 'Nombre de champs'; $lang['strnumvalues'] = 'Nombre de valeurs'; $lang['strtypeneedsname'] = 'Vous devez indiquer un nom pour votre type.'; @@ -622,6 +623,7 @@ $lang['strlocale'] = 'Locale'; $lang['strschemaaltered'] = 'Schema modifié.'; $lang['strschemaalteredbad'] = 'Échec lors de la modification du schéma.'; $lang['strsearchpath'] = 'Chemin de recherche du schéma'; +$lang['strspecifyschematodrop'] = 'You must specify at least one schema to drop.'; // Reports $lang['strreport'] = 'Rapport'; @@ -970,11 +972,7 @@ $lang['strftsmappingaltered'] = 'FTS mapping altered.'; $lang['strftsmappingalteredbad'] = 'FTS mapping alter failed.'; $lang['strftsmappingadded'] = 'FTS mapping added.'; $lang['strftsmappingaddedbad'] = 'FTS mapping add failed.'; -$lang['strftsmappingdropped'] = 'FTS mapping dropped.'; -$lang['strftsmappingdroppedbad'] = 'FTS mapping drop failed.'; $lang['strftstabconfigs'] = 'Configurations'; $lang['strftstabdicts'] = 'Dictionaires'; $lang['strftstabparsers'] = 'Analyseurs syntaxique'; - - ?> diff --git a/lang/recoded/english.php b/lang/recoded/english.php index 7e987c6c..dd9a8b0d 100644 --- a/lang/recoded/english.php +++ b/lang/recoded/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.179 2007/12/19 18:34:44 soranzo Exp $ + * $Id: english.php,v 1.180 2008/02/18 22:20:26 ioguix Exp $ */ // Language and character set @@ -133,6 +133,7 @@ $lang['strfile'] = 'File'; $lang['strfileimported'] = 'File imported.'; $lang['strtrycred'] = 'Use these credentials for all servers'; + $lang['strconfdropcred'] = 'For security reason, disconnecting will destroy your shared login information. Are you sure you want to disconnect ?'; $lang['stractionsonmultiplelines'] = 'Actions on multiple lines'; $lang['strselectall'] = 'Select all'; $lang['strunselectall'] = 'Unselect all'; diff --git a/lang/recoded/french.php b/lang/recoded/french.php index 139e4062..63c48d05 100644 --- a/lang/recoded/french.php +++ b/lang/recoded/french.php @@ -4,7 +4,7 @@ * French Language file for phpPgAdmin. * @maintainer Pascal PEYRE [pascal.peyre@cir.fr] * - * $Id: french.php,v 1.33 2007/12/19 11:08:14 ioguix Exp $ + * $Id: french.php,v 1.34 2008/02/18 22:20:26 ioguix Exp $ */ // Language and character set @@ -113,8 +113,6 @@ $lang['strseparator'] = ' :'; $lang['strexpand'] = 'Étendre'; $lang['strcollapse'] = 'Réduire'; - $lang['strexplain'] = 'Explain'; - $lang['strexplainanalyze'] = 'Explain Analyze'; $lang['strfind'] = 'Rechercher'; $lang['stroptions'] = 'Options'; $lang['strrefresh'] = 'Rafraichir'; @@ -135,6 +133,7 @@ $lang['strfile'] = 'Fichier'; $lang['strfileimported'] = 'Fichier importé.'; $lang['strtrycred'] = 'Utilisez ces identifiants pour tous les serveurs'; + $lang['strconfdropcred'] = 'Par mesure de sécurité, la déconnexion détruira vos identifiants partagés pour tous les serveurs. Êtes-vous sûr de vouloir vous déconnecter ?'; $lang['stractionsonmultiplelines'] = 'Actions sur plusieurs lignes'; $lang['strselectall'] = 'Sélectionner tout'; $lang['strunselectall'] = 'Desélectionner tout'; @@ -394,6 +393,7 @@ $lang['strlocale'] = 'Locale'; $lang['strerrordupfields'] = 'Erreur en cas de champs dupliqués'; $lang['strviewaltered'] = 'Vue modifiée.'; $lang['strviewalteredbad'] = 'Échec lors de la modification de la vue.'; +$lang['strspecifyviewtodrop'] = 'You must specify at least one view to drop.'; // Sequences $lang['strsequence'] = 'Séquence'; @@ -428,6 +428,7 @@ $lang['strlocale'] = 'Locale'; $lang['strnextval'] = 'Incrémenter la valeur'; $lang['strsequencenextval'] = 'Séquence incrémentée.'; $lang['strsequencenextvalbad'] = 'Échec lors de l\'incrémentation de la valeur.'; +$lang['strspecifysequencetodrop'] = 'You must specify at least one sequence to drop.'; // Indexes $lang['strindex'] = 'Index'; @@ -542,6 +543,7 @@ $lang['strlocale'] = 'Locale'; $lang['strfunctioncosting'] = 'Coût de la function'; $lang['strresultrows'] = 'Lignes de résultat'; $lang['strexecutioncost'] = 'Coût d\'exécution'; +$lang['strspecifyfunctiontodrop'] = 'You must specify at least one function to drop.'; // Triggers $lang['strtrigger'] = 'Trigger'; @@ -588,7 +590,6 @@ $lang['strlocale'] = 'Locale'; $lang['strdelimiter'] = 'Délimiteur'; $lang['strstorage'] = 'Stockage'; $lang['strfield'] = 'Champ'; - $lang['strvalue'] = 'Valeur'; $lang['strnumfields'] = 'Nombre de champs'; $lang['strnumvalues'] = 'Nombre de valeurs'; $lang['strtypeneedsname'] = 'Vous devez indiquer un nom pour votre type.'; @@ -622,6 +623,7 @@ $lang['strlocale'] = 'Locale'; $lang['strschemaaltered'] = 'Schema modifié.'; $lang['strschemaalteredbad'] = 'Échec lors de la modification du schéma.'; $lang['strsearchpath'] = 'Chemin de recherche du schéma'; +$lang['strspecifyschematodrop'] = 'You must specify at least one schema to drop.'; // Reports $lang['strreport'] = 'Rapport'; @@ -970,11 +972,7 @@ $lang['strftsmappingaltered'] = 'FTS mapping altered.'; $lang['strftsmappingalteredbad'] = 'FTS mapping alter failed.'; $lang['strftsmappingadded'] = 'FTS mapping added.'; $lang['strftsmappingaddedbad'] = 'FTS mapping add failed.'; -$lang['strftsmappingdropped'] = 'FTS mapping dropped.'; -$lang['strftsmappingdroppedbad'] = 'FTS mapping drop failed.'; $lang['strftstabconfigs'] = 'Configurations'; $lang['strftstabdicts'] = 'Dictionaires'; $lang['strftstabparsers'] = 'Analyseurs syntaxique'; - - ?> diff --git a/servers.php b/servers.php index e0c9ce1f..7aba2592 100644 --- a/servers.php +++ b/servers.php @@ -3,7 +3,7 @@ /** * Manage servers * - * $Id: servers.php,v 1.11 2007/08/31 18:30:11 ioguix Exp $ + * $Id: servers.php,v 1.12 2008/02/18 22:20:26 ioguix Exp $ */ // Include application functions @@ -18,6 +18,9 @@ $server_info = $misc->getServerInfo($_REQUEST['logoutServer']); $misc->setServerInfo(null, null, $_REQUEST['logoutServer']); + + unset($_SESSION['sharedUsername'], $_SESSION['sharedPassword']); + doDefault(sprintf($lang['strlogoutmsg'], $server_info['desc'])); $_reload_browser = true; -- 2.39.5