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

fixed bug #1409893 - links in navigation frame opens new window

Browse Source
This commit is contained in:
Sebastian Mendel
2006-02-13 13:21:18 +00:00
parent 43f74a9c2a
commit f4b8fae9cf
2 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -7,7 +7,9 @@ $Source$
2006-02-13 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-02-13 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: * libraries/common.lib.php:
- fixed bug #1416848 'Insert new row from Browse page' - fixed bug #1416848 'Insert new row from Browse page'
* libraries/common.lib.php:
- fixed bug #1409893 - links in navigation frame opens new window
2006-02-12 Marc Delisle <lem9@users.sourceforge.net> 2006-02-12 Marc Delisle <lem9@users.sourceforge.net>
* lang/english and hebrew: bug #1429769, typo * lang/english and hebrew: bug #1429769, typo

117
libraries/footer.inc.php
View File

@@ -10,62 +10,63 @@
* *
*/ */
require_once('./libraries/relation.lib.php'); // for PMA_setHistory() require_once './libraries/relation.lib.php'; // for PMA_setHistory()
/** /**
* Query window * updates javascript variables in index.php for coorect working with querywindow
* and navigation frame refreshing
*/ */
?>
// If query window is open, update with latest selected db/table.
?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
<?php <?php
if ( ! isset( $GLOBALS['no_history'] ) && isset( $GLOBALS['db'] ) && strlen($GLOBALS['db']) && empty( $GLOBALS['error_message'] ) ) { if (! isset($GLOBALS['no_history']) && isset($GLOBALS['db'])
$table = isset( $GLOBALS['table'] ) ? $GLOBALS['table'] : ''; && strlen($GLOBALS['db']) && empty($GLOBALS['error_message'])) {
// updates current settings $table = isset($GLOBALS['table']) ? $GLOBALS['table'] : ''; ?>
?> // updates current settings
window.parent.setAll( '<?php echo $GLOBALS['lang']; ?>', '<?php echo $GLOBALS['collation_connection']; ?>', '<?php echo $GLOBALS['server']; ?>', '<?php echo $GLOBALS['db']; ?>', '<?php echo $table; ?>' ); window.parent.setAll('<?php echo $GLOBALS['lang']; ?>', '<?php echo $GLOBALS['collation_connection']; ?>', '<?php echo $GLOBALS['server']; ?>', '<?php echo $GLOBALS['db']; ?>', '<?php echo $table; ?>');
<?php <?php } ?>
}
if ( ! empty( $GLOBALS['reload'] ) ) {
?>
window.parent.refreshLeft();
<?php
}
if ( ! isset( $GLOBALS['no_history'] ) && empty( $GLOBALS['error_message'] ) ) { <?php if (! empty($GLOBALS['reload'])) { ?>
if ( isset( $GLOBALS['LockFromUpdate'] ) && $GLOBALS['LockFromUpdate'] == '1' && isset( $GLOBALS['sql_query'] ) ) { // refresh navigation frame content
// When the button 'LockFromUpdate' was selected in the querywindow, window.parent.refreshLeft();
// it does not submit it's contents to <?php } ?>
// itself. So we create a SQL-history entry here.
if ($GLOBALS['cfg']['QueryHistoryDB'] && $GLOBALS['cfgRelation']['historywork']) { <?php
PMA_setHistory( ( isset( $GLOBALS['db'] ) ? $GLOBALS['db'] : '' ), if (! isset($GLOBALS['no_history']) && empty($GLOBALS['error_message'])) {
( isset( $GLOBALS['table'] ) ? $GLOBALS['table'] : '' ), if (isset($GLOBALS['LockFromUpdate']) && $GLOBALS['LockFromUpdate'] == '1'
$GLOBALS['cfg']['Server']['user'], && isset($GLOBALS['sql_query'])) {
$GLOBALS['sql_query'] ); // When the button 'LockFromUpdate' was selected in the querywindow,
} // it does not submit it's contents to
// itself. So we create a SQL-history entry here.
if ($GLOBALS['cfg']['QueryHistoryDB'] && $GLOBALS['cfgRelation']['historywork']) {
PMA_setHistory((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''),
(isset($GLOBALS['table']) ? $GLOBALS['table'] : ''),
$GLOBALS['cfg']['Server']['user'],
$GLOBALS['sql_query']);
} }
?>
window.parent.reload_querywindow(
"<?php echo isset( $GLOBALS['db'] ) ? addslashes( $GLOBALS['db'] ) : '' ?>",
"<?php echo isset( $GLOBALS['table'] ) ? addslashes( $GLOBALS['table'] ) : '' ?>",
"<?php echo isset( $GLOBALS['sql_query'] ) ? urlencode( $GLOBALS['sql_query'] ) : ''; ?>" );
<?php
}
if ( ! empty( $GLOBALS['focus_querywindow'] ) ) {
?>
if ( parent.querywindow && !parent.querywindow.closed && parent.querywindow.location) {
self.focus();
}
<?php
} }
?> ?>
// set current db, table and sql query in the querywindow
window.parent.reload_querywindow(
"<?php echo isset($GLOBALS['db']) ? addslashes($GLOBALS['db']) : '' ?>",
"<?php echo isset($GLOBALS['table']) ? addslashes($GLOBALS['table']) : '' ?>",
"<?php echo isset($GLOBALS['sql_query']) ? urlencode($GLOBALS['sql_query']) : ''; ?>");
<?php } ?>
<?php if (! empty($GLOBALS['focus_querywindow'])) { ?>
// set focus to the querywindow
if (parent.querywindow && !parent.querywindow.closed && parent.querywindow.location) {
self.focus();
}
<?php } ?>
// reset content frame name, as querywindow needs to set a unique name
// before submitting form data, and navigation frame needs the original name
window.parent.frames[1].name = 'frame_content';
//]]> //]]>
</script> </script>
<?php <?php
// Link to itself to replicate windows including frameset // Link to itself to replicate windows including frameset
if (!isset($GLOBALS['checked_special'])) { if (!isset($GLOBALS['checked_special'])) {
@@ -86,26 +87,26 @@ if (isset($_SERVER['SCRIPT_NAME']) && empty($_POST) && !$GLOBALS['checked_specia
/** /**
* Close database connections * Close database connections
*/ */
if ( isset( $GLOBALS['controllink'] ) && $GLOBALS['controllink'] ) { if (isset($GLOBALS['controllink']) && $GLOBALS['controllink']) {
@PMA_DBI_close( $GLOBALS['controllink'] ); @PMA_DBI_close($GLOBALS['controllink']);
} }
if ( isset( $GLOBALS['userlink'] ) && $GLOBALS['userlink'] ) { if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
@PMA_DBI_close( $GLOBALS['userlink'] ); @PMA_DBI_close($GLOBALS['userlink']);
} }
// Include possible custom footers // Include possible custom footers
require_once('./libraries/footer_custom.inc.php'); require_once './libraries/footer_custom.inc.php';
/** /**
* Generates profiling data if requested * Generates profiling data if requested
*/ */
if ( ! empty( $GLOBALS['cfg']['DBG']['enable'] ) if (! empty($GLOBALS['cfg']['DBG']['enable'])
&& ! empty( $GLOBALS['cfg']['DBG']['profile']['enable'] ) ) { && ! empty($GLOBALS['cfg']['DBG']['profile']['enable'])) {
//run the basic setup code first //run the basic setup code first
require_once('./libraries/dbg/setup.php'); require_once './libraries/dbg/setup.php';
//if the setup ran fine, then do the profiling //if the setup ran fine, then do the profiling
if ( ! empty( $GLOBALS['DBG'] ) ) { if (! empty($GLOBALS['DBG'])) {
require_once('./libraries/dbg/profiling.php'); require_once './libraries/dbg/profiling.php';
dbg_dump_profiling_results(); dbg_dump_profiling_results();
} }
} }
@@ -117,9 +118,9 @@ if ( ! empty( $GLOBALS['cfg']['DBG']['enable'] )
/** /**
* Sends bufferized data * Sends bufferized data
*/ */
if ( ! empty( $GLOBALS['cfg']['OBGzip'] ) if (! empty($GLOBALS['cfg']['OBGzip'])
&& ! empty( $GLOBALS['ob_mode'] ) ) { && ! empty($GLOBALS['ob_mode'])) {
PMA_outBufferPost( $GLOBALS['ob_mode'] ); PMA_outBufferPost($GLOBALS['ob_mode']);
} }
/** /**