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

Bug #720680

Browse Source
This commit is contained in:
Garvin Hicking
2003-04-14 10:55:02 +00:00
parent 9cb587c953
commit e78fefe1fc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -26,6 +26,7 @@ $Source$
* libraries/common.lib.php3: Fixed SHOW TABLE STATUS LIKE ... FROM ... * libraries/common.lib.php3: Fixed SHOW TABLE STATUS LIKE ... FROM ...
usage. (Bug #720846) usage. (Bug #720846)
* footer.inc.php3: Needed \n for some cases. * footer.inc.php3: Needed \n for some cases.
* tbl_query_box.php3: Only display file import when a DB is selected.
2003-04-13 Marc Delisle <lem9@users.sourceforge.net> 2003-04-13 Marc Delisle <lem9@users.sourceforge.net>
* lang/french: update * lang/french: update

14
tbl_query_box.php3
View File

@@ -131,7 +131,7 @@ if (!isset($is_inside_querywindow) ||
// loic1: displays import dump feature only if file upload available // loic1: displays import dump feature only if file upload available
if ($is_upload && (!isset($is_inside_querywindow) || if ($is_upload && (!isset($is_inside_querywindow) ||
(isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')))) { (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full'))) && isset($db) && $db != '') {
echo ' ' . ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'full') || !isset($is_inside_querywindow) ? '<i>' . $strOr . '</i>' : '') . ' ' . $strLocationTextfile . '&nbsp;:<br />' . "\n"; echo ' ' . ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'full') || !isset($is_inside_querywindow) ? '<i>' . $strOr . '</i>' : '') . ' ' . $strLocationTextfile . '&nbsp;:<br />' . "\n";
?> ?>
<div style="margin-bottom: 5px"> <div style="margin-bottom: 5px">
@@ -180,10 +180,16 @@ if ($is_upload && (!isset($is_inside_querywindow) ||
} // end if } // end if
echo "\n"; echo "\n";
if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'files' && (!isset($db) || $db == '')) {
?>
<b><?php echo $strNoDatabasesSelected; ?></b>
<?php
}
// web-server upload directory // web-server upload directory
// (TODO: display the charset selection, even if is_upload == FALSE) // (TODO: display the charset selection, even if is_upload == FALSE)
if ($cfg['UploadDir'] != '' && !isset($is_inside_querywindow) || if ($cfg['UploadDir'] != '' && !isset($is_inside_querywindow) ||
($cfg['UploadDir'] != '' && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full'))) { ($cfg['UploadDir'] != '' && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') {
if ($handle = @opendir($cfg['UploadDir'])) { if ($handle = @opendir($cfg['UploadDir'])) {
$is_first = 0; $is_first = 0;
@@ -245,14 +251,14 @@ if (!isset($is_inside_querywindow) ||
} }
} }
if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'sql' || $querydisplay_tab == 'full' || ($querydisplay_tab == 'history' && $bookmark_go)))) { if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'sql' || $querydisplay_tab == 'full' || ($querydisplay_tab == 'history' && $bookmark_go))) && isset($db) && $db != '') {
?> ?>
<input type="submit" name="SQL" value="<?php echo $strGo; ?>" /> <input type="submit" name="SQL" value="<?php echo $strGo; ?>" />
<?php <?php
} }
if (!isset($is_inside_querywindow) || if (!isset($is_inside_querywindow) ||
(isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full'))) { (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') {
// loic1: displays import dump feature only if file upload available // loic1: displays import dump feature only if file upload available
$ldi_target = 'ldi_table.php3?' . $url_query; $ldi_target = 'ldi_table.php3?' . $url_query;