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

Show error header on error to make clear that something bad has happened.

Browse Source
This commit is contained in:
Michal Čihař
2005-08-04 13:52:51 +00:00
parent 5ba1524fd5
commit d9977e23ae
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-08-04 Michal Čihař <michal@cihar.com>
* libraries/common.lib.php, export.php: Show error header on error to make
clear that something bad has happened.
2005-08-04 Marc Delisle <lem9@users.sourceforge.net> 2005-08-04 Marc Delisle <lem9@users.sourceforge.net>
* queryframe.php: patch #1250899: * queryframe.php: patch #1250899:
- unified spaces between icons - unified spaces between icons

5
export.php
View File

@@ -84,6 +84,7 @@ function PMA_exportOutputHandler($line)
$write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer); $write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer);
if (!$write_result || ($write_result != strlen($dump_buffer))) { if (!$write_result || ($write_result != strlen($dump_buffer))) {
$GLOBALS['message'] = sprintf($GLOBALS['strNoSpace'], htmlspecialchars($save_filename)); $GLOBALS['message'] = sprintf($GLOBALS['strNoSpace'], htmlspecialchars($save_filename));
$GLOBALS['show_error_header'] = TRUE;
return FALSE; return FALSE;
} }
} else { } else {
@@ -105,6 +106,7 @@ function PMA_exportOutputHandler($line)
$write_result = @fwrite($GLOBALS['file_handle'], $line); $write_result = @fwrite($GLOBALS['file_handle'], $line);
if (!$write_result || ($write_result != strlen($line))) { if (!$write_result || ($write_result != strlen($line))) {
$GLOBALS['message'] = sprintf($GLOBALS['strNoSpace'], htmlspecialchars($save_filename)); $GLOBALS['message'] = sprintf($GLOBALS['strNoSpace'], htmlspecialchars($save_filename));
$GLOBALS['show_error_header'] = TRUE;
return FALSE; return FALSE;
} }
$time_now = time(); $time_now = time();
@@ -270,12 +272,15 @@ if ($save_on_server) {
unset($message); unset($message);
if (file_exists($save_filename) && empty($onserverover)) { if (file_exists($save_filename) && empty($onserverover)) {
$message = sprintf($strFileAlreadyExists, htmlspecialchars($save_filename)); $message = sprintf($strFileAlreadyExists, htmlspecialchars($save_filename));
$GLOBALS['show_error_header'] = TRUE;
} else { } else {
if (is_file($save_filename) && !is_writable($save_filename)) { if (is_file($save_filename) && !is_writable($save_filename)) {
$message = sprintf($strNoPermission, htmlspecialchars($save_filename)); $message = sprintf($strNoPermission, htmlspecialchars($save_filename));
$GLOBALS['show_error_header'] = TRUE;
} else { } else {
if (!$file_handle = @fopen($save_filename, 'w')) { if (!$file_handle = @fopen($save_filename, 'w')) {
$message = sprintf($strNoPermission, htmlspecialchars($save_filename)); $message = sprintf($strNoPermission, htmlspecialchars($save_filename));
$GLOBALS['show_error_header'] = TRUE;
} }
} }
} }

3
libraries/common.lib.php
View File

@@ -1711,6 +1711,9 @@ if (typeof(document.getElementById) != 'undefined'
<br /> <br />
<div align="<?php echo $GLOBALS['cell_align_left']; ?>"> <div align="<?php echo $GLOBALS['cell_align_left']; ?>">
<table border="<?php echo $cfg['Border']; ?>" cellpadding="5" cellspacing="1"> <table border="<?php echo $cfg['Border']; ?>" cellpadding="5" cellspacing="1">
<?php if (isset($GLOBALS['show_error_header']) && $GLOBALS['show_error_header']) { ?>
<tr><th class="tblHeadError"><div class="errorhead"><?php echo $GLOBALS['strError']; ?></div></th></tr>
<?php } ?>
<tr> <tr>
<th<?php echo ($GLOBALS['theme'] != 'original') ? ' class="tblHeaders"' : ' bgcolor="' . $cfg['ThBgcolor'] . '"'; ?>> <th<?php echo ($GLOBALS['theme'] != 'original') ? ' class="tblHeaders"' : ' bgcolor="' . $cfg['ThBgcolor'] . '"'; ?>>
<b><?php echo $message; ?></b> <b><?php echo $message; ?></b>