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

Another try at the frameset generation.

Browse Source
This commit is contained in:
Garvin Hicking
2003-05-20 21:45:46 +00:00
parent 5491324fb8
commit 7fc46ed02a
2 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-05-20 Garvin Hicking <me@supergarv.de>
* index.php3: New rewrite of how the frameset is created
(Patch item #738226 plus some <noframes> corrections).
This fixes compatibility problems, even though it's not
valid XHTML 1.0, because the <script>/<noscript> tags are
not allowed in there.
2003-05-20 Marc Delisle <lem9@users.sourceforge.net> 2003-05-20 Marc Delisle <lem9@users.sourceforge.net>
* lang/korean update, thanks to WooSuhan * lang/korean update, thanks to WooSuhan
* lang/estonian update, thanks to finsoft@sourceforge.net. * lang/estonian update, thanks to finsoft@sourceforge.net.

73
index.php3
View File

@@ -63,45 +63,45 @@ $phpmain_hash_js = time();
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=right" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=right" />
</head> </head>
<frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*">
<?php if ($cfg['QueryFrame']) { ?>
<frameset rows="*, 50" framespacing="0" frameborder="0" border="0">
<?php <?php
if ($cfg['QueryFrameJS']) {?> if ($cfg['QueryFrame']) {
<script type="text/javascript">
<!-- if ($cfg['QueryFrameJS']) {
document.writeln('<frame src="left.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash . $phpmain_hash_js; ?>" name="nav" frameborder="0" />'); echo '<script type="text/javascript">' . "\n";
document.writeln('<frame src="queryframe.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash . $phpmain_hash_js; ?>" name="queryframe" frameborder="0" />'); echo '<!--' . "\n";
//--> echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" framespacing="0" frameborder="0" border="0">\');' . "\n";
</script> echo ' document.writeln(\' <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">\');' . "\n";
echo ' document.writeln(\' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" />\');' . "\n";
echo ' document.writeln(\' <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" />\');' . "\n";
echo ' document.writeln(\' </frameset>\');' . "\n";
echo ' document.writeln(\' <frame src="' . (empty($db) ? 'main.php3' : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" />\');' . "\n";
echo ' document.writeln(\' <noframes>\');' . "\n";
echo ' document.writeln(\' <body bgcolor="#FFFFFF">\');' . "\n";
echo ' document.writeln(\' <p>' . str_replace("'", "\'", $strNoFrames) . '</p>\');' . "\n";
echo ' document.writeln(\' </body>\');' . "\n";
echo ' document.writeln(\' </noframes>\');' . "\n";
echo ' document.writeln(\'</frameset>\');' . "\n";
echo '//-->' . "\n";
echo '</script>' . "\n";
echo "\n";
echo '<noscript>' . "\n";
}
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*">' . "\n";
echo ' <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">' . "\n";
echo ' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
echo ' <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" />' . "\n";
echo ' </frameset>' . "\n";
echo ' <frame src="' . (empty($db) ? 'main.php3' : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" />' . "\n";
<noscript>
<?php } ?>
<frame src="left.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash; ?>" name="nav" frameborder="0" />
<frame src="queryframe.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash; ?>" name="queryframe" frameborder="0" />
<?php if ($cfg['QueryFrameJS']) { ?>
</noscript>
<?php } ?>
</frameset>
<?php
} else { } else {
?>
<frame src="left.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash; ?>" name="nav" frameborder="0" /> echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*">' . "\n";
<?php echo ' <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
echo ' <frame src="' . (empty($db)) ? 'main.php3' : $cfg['DefaultTabDatabase'] . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n";
} }
if ($cfg['QueryFrameJS']) {
?> ?>
<script type="text/javascript">
<!--
document.writeln('<frame src="<?php echo (empty($db)) ? 'main.php3' : $cfg['DefaultTabDatabase']; ?>?<?php echo $url_query; ?>" name="phpmain<?php echo $phpmain_hash . $phpmain_hash_js; ?>" frameborder="0" />');
//-->
</script>
<noscript>
<?php } ?>
<frame src="<?php echo (empty($db)) ? 'main.php3' : $cfg['DefaultTabDatabase']; ?>?<?php echo $url_query; ?>" name="phpmain<?php echo $phpmain_hash; ?>" frameborder="1" />
<?php if ($cfg['QueryFrameJS']) { ?>
</noscript>
<?php } ?>
<noframes> <noframes>
<body bgcolor="#FFFFFF"> <body bgcolor="#FFFFFF">
@@ -109,5 +109,10 @@ if ($cfg['QueryFrameJS']) {
</body> </body>
</noframes> </noframes>
</frameset> </frameset>
<?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
echo '</noscript>' . "\n";
}
?>
</html> </html>