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

Removed link for the problem with http auth. logout if this mode isn't used

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-12-10 16:49:02 +00:00
parent e684733bbf
commit 14d21f10a4
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -11,6 +11,11 @@ $Source$
* libraries/auth: * libraries/auth:
- basic.auth.lib.php3, line 107: fixed an horrible parse error; - basic.auth.lib.php3, line 107: fixed an horrible parse error;
- cookie.auth.lib.php3: beautified a bit the display. - cookie.auth.lib.php3: beautified a bit the display.
* db_details.php3, line 461; tbl_properties.php3, line 694;
libraries/common.lib.php3, lines 821 & 823: patch from Cal Henderson
to be taken right to the edit box after clicking on a "Modify" link.
* main.php3: the link to the logout problem with http authentication mode
was also displayed with cookie authentication mode.
2001-12-09 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-12-09 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* read_dump.php3; libraries/build_dump.lib.php3: sending the "fake" header * read_dump.php3; libraries/build_dump.lib.php3: sending the "fake" header

4
libraries/common.lib.php3
View File

@@ -818,9 +818,9 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
$edit_target = ''; $edit_target = '';
} }
if ($edit_target == 'tbl_properties.php3') { if ($edit_target == 'tbl_properties.php3') {
$edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y">' . $GLOBALS['strEdit'] . '</a>'; $edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
} else if ($edit_target != '') { } else if ($edit_target != '') {
$edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y">' . $GLOBALS['strEdit'] . '</a>'; $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
} }
} }
if (!empty($edit_target)) { if (!empty($edit_target)) {

6
main.php3
View File

@@ -327,14 +327,16 @@ if ($server > 0) {
// Logout for advanced authentication // Logout for advanced authentication
if ($cfgServer['auth_type'] != 'basic') { if ($cfgServer['auth_type'] != 'basic') {
$http_logout = ($cfgServer['auth_type'] == 'http')
? "\n" . ' <a href="' . $cfgPmaAbsoluteUri . 'Documentation.html#login_bug" target="documentation">(*)</a>'
: '';
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td> <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
<td> <td>
<a href="index.php3?<?php echo $common_url_query; ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent"> <a href="index.php3?<?php echo $common_url_query; ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent">
<b><?php echo $strLogout; ?></b></a>&nbsp; <b><?php echo $strLogout; ?></b></a>&nbsp;<?php echo $http_logout . "\n"; ?>
<a href="<?php echo $cfgPmaAbsoluteUri; ?>Documentation.html#login_bug" target="documentation">(*)</a>
</td> </td>
</tr> </tr>
<?php <?php