diff --git a/ChangeLog b/ChangeLog index e5648d123..2a7662ed4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-05-20 Garvin Hicking + * index.php3: New rewrite of how the frameset is created + (Patch item #738226 plus some 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> * lang/korean update, thanks to WooSuhan * lang/estonian update, thanks to finsoft@sourceforge.net. diff --git a/index.php3 b/index.php3 index 4e30919c1..834d6dae2 100755 --- a/index.php3 +++ b/index.php3 @@ -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" /> </head> -<frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*"> -<?php if ($cfg['QueryFrame']) { ?> - <frameset rows="*, 50" framespacing="0" frameborder="0" border="0"> <?php - if ($cfg['QueryFrameJS']) {?> - <script type="text/javascript"> - <!-- - document.writeln('<frame src="left.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash . $phpmain_hash_js; ?>" name="nav" frameborder="0" />'); - document.writeln('<frame src="queryframe.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash . $phpmain_hash_js; ?>" name="queryframe" frameborder="0" />'); - //--> - </script> +if ($cfg['QueryFrame']) { + + if ($cfg['QueryFrameJS']) { + echo '<script type="text/javascript">' . "\n"; + echo '<!--' . "\n"; + echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" framespacing="0" frameborder="0" border="0">\');' . "\n"; + 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(\' \');' . "\n"; + echo ' document.writeln(\'\');' . "\n"; + echo '//-->' . "\n"; + echo '' . "\n"; + echo "\n"; + echo '