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

Use same script tag, use CDATA for scripts (RFE #995065).

Browse Source
This commit is contained in:
Michal Čihař
2005-12-04 23:14:41 +00:00
parent d7c81e9c44
commit 75a16f45f8
15 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-12-05 Michal Čihař <michal@cihar.com>
* many files: Use same script tag, use CDATA for scripts (RFE #995065).
2005-12-04 Marc Delisle <lem9@users.sourceforge.net> 2005-12-04 Marc Delisle <lem9@users.sourceforge.net>
* lang/catalan update, thanks to Xavier Navarro (xavin). * lang/catalan update, thanks to Xavier Navarro (xavin).
* server_privileges.php: do not use UNION DISTINCT, as it's not allowed * server_privileges.php: do not use UNION DISTINCT, as it's not allowed

8
calendar.php
View File

@@ -6,13 +6,13 @@ require_once('./libraries/header_http.inc.php');
$page_title = $strCalendar; $page_title = $strCalendar;
require('./libraries/header_meta_style.inc.php'); require('./libraries/header_meta_style.inc.php');
?> ?>
<script type="text/javascript" src="./js/tbl_change.js"></script> <script type="text/javascript" language="javascript" src="./js/tbl_change.js"></script>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
var month_names = new Array("<?php echo implode('","', $month); ?>"); var month_names = new Array("<?php echo implode('","', $month); ?>");
var day_names = new Array("<?php echo implode('","', $day_of_week); ?>"); var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
var submit_text = "<?php echo $strGo; ?>"; var submit_text = "<?php echo $strGo; ?>";
//--> //]]>
</script> </script>
</head> </head>
<body onload="initCalendar();"> <body onload="initCalendar();">

6
db_printview.php
View File

@@ -287,8 +287,8 @@ else {
*/ */
echo "\n"; echo "\n";
?> ?>
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
function printPage() function printPage()
{ {
// Do print the page // Do print the page
@@ -296,7 +296,7 @@ function printPage()
window.print(); window.print();
} }
} }
//--> //]]>
</script> </script>
<?php <?php
echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n"; echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";

7
export.php
View File

@@ -580,8 +580,9 @@ else {
. ' </form>' . "\n"; . ' </form>' . "\n";
echo '</div>' . "\n"; echo '</div>' . "\n";
echo "\n"; echo "\n";
?><script language="JavaScript" type="text/javascript"> ?>
<!-- <script type="text/javascript" language="javascript">
//<![CDATA[
var bodyWidth=null; var bodyHeight=null; var bodyWidth=null; var bodyHeight=null;
if (document.getElementById('textSQLDUMP')) { if (document.getElementById('textSQLDUMP')) {
bodyWidth = self.innerWidth; bodyWidth = self.innerWidth;
@@ -598,7 +599,7 @@ else {
document.getElementById('textSQLDUMP').style.width=(bodyWidth-50) + 'px'; document.getElementById('textSQLDUMP').style.width=(bodyWidth-50) + 'px';
document.getElementById('textSQLDUMP').style.height=(bodyHeight-100) + 'px'; document.getElementById('textSQLDUMP').style.height=(bodyHeight-100) + 'px';
} }
//--> //]]>
</script> </script>
<?php <?php
require_once('./libraries/footer.inc.php'); require_once('./libraries/footer.inc.php');

13
libraries/common.lib.php
View File

@@ -869,11 +869,16 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
echo '<meta http-equiv="Pragma" content="no-cache">' . "\n"; echo '<meta http-equiv="Pragma" content="no-cache">' . "\n";
echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n"; echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n";
echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n"; echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
echo '<script language="JavaScript">' . "\n"; echo '<script type="text/javascript" language="javascript">' . "\n";
echo '//<![CDATA[' . "\n";
echo 'setTimeout ("window.location = unescape(\'"' . $uri . '"\')",2000); </script>' . "\n"; echo 'setTimeout ("window.location = unescape(\'"' . $uri . '"\')",2000); </script>' . "\n";
echo '//]]>' . "\n";
echo '</head>' . "\n"; echo '</head>' . "\n";
echo '<body> <script language="JavaScript">' . "\n"; echo '<body>' . "\n";
echo '<script type="text/javascript" language="javascript">' . "\n";
echo '//<![CDATA[' . "\n";
echo 'document.write (\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n"; echo 'document.write (\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
echo '//]]>' . "\n";
echo '</script></body></html>' . "\n"; echo '</script></body></html>' . "\n";
} else { } else {
@@ -1199,7 +1204,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
echo "\n"; echo "\n";
$reload_url = './left.php?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&'); $reload_url = './left.php?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&');
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
if (typeof(window.parent) != 'undefined' if (typeof(window.parent) != 'undefined'
&& typeof(window.parent.frames[0]) != 'undefined') { && typeof(window.parent.frames[0]) != 'undefined') {
@@ -1241,7 +1246,7 @@ if (typeof(window.parent) != 'undefined'
$uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'], false ); $uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'], false );
echo "\n"; echo "\n";
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFormat($tooltip, false); ?>' ); window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFormat($tooltip, false); ?>' );
//]]> //]]>

12
libraries/display_export.lib.php
View File

@@ -58,8 +58,8 @@ if (isset($sql_query)) {
} }
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
function hide_them_all() { function hide_them_all() {
document.getElementById("csv_options").style.display = 'none'; document.getElementById("csv_options").style.display = 'none';
document.getElementById("excel_options").style.display = 'none'; document.getElementById("excel_options").style.display = 'none';
@@ -114,7 +114,7 @@ function show_checked_option() {
} }
} }
} }
//--> //]]>
</script> </script>
<fieldset id="fieldsetexport"> <fieldset id="fieldsetexport">
@@ -748,10 +748,10 @@ function show_checked_option() {
<input type="hidden" name="xml_data" value="xml_data" /> <input type="hidden" name="xml_data" value="xml_data" />
</fieldset> </fieldset>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
show_checked_option(); show_checked_option();
//--> //]]>
</script> </script>
<?php if ( ! empty( $table ) && ! isset( $num_tables ) ) { ?> <?php if ( ! empty( $table ) && ! isset( $num_tables ) ) { ?>

4
libraries/display_import.lib.php
View File

@@ -71,7 +71,7 @@ if ($import_type == 'server') {
echo ' <input type="hidden" name="import_type" value="' . $import_type . '" />'; echo ' <input type="hidden" name="import_type" value="' . $import_type . '" />';
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
function hide_them_all() { function hide_them_all() {
<?php <?php
@@ -289,7 +289,7 @@ echo "\n";
<input type="submit" value="<?php echo $strGo; ?>" id="buttonGo" /> <input type="submit" value="<?php echo $strGo; ?>" id="buttonGo" />
</fieldset> </fieldset>
</form> </form>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
init_options(); init_options();
//]]> //]]>

2
libraries/footer.inc.php
View File

@@ -18,7 +18,7 @@ require_once('./libraries/relation.lib.php'); // for PMA_setHistory()
// If query window is open, update with latest selected db/table. // If query window is open, update with latest selected db/table.
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
<?php <?php
if ( ! isset( $GLOBALS['no_history'] ) && ! empty( $GLOBALS['db'] ) && empty( $GLOBALS['error_message'] ) ) { if ( ! isset( $GLOBALS['no_history'] ) && ! empty( $GLOBALS['db'] ) && empty( $GLOBALS['error_message'] ) ) {

2
libraries/sql_query_form.lib.php
View File

@@ -343,7 +343,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
echo '<div class="formelement">' . "\n"; echo '<div class="formelement">' . "\n";
if ( $is_querywindow ) { if ( $is_querywindow ) {
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo $GLOBALS['strQueryWindowLock']; ?></label> '); document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo $GLOBALS['strQueryWindowLock']; ?></label> ');
//]]> //]]>

14
pdf_pages.php
View File

@@ -303,7 +303,7 @@ if ($cfg['WYSIWYG-PDF']) {
$with_field_names = TRUE; $with_field_names = TRUE;
} }
?> ?>
<script type="text/javascript" src="./js/dom-drag.js"></script> <script type="text/javascript" language="javascript" src="./js/dom-drag.js"></script>
<form method="post" action="pdf_pages.php" name="dragdrop"> <form method="post" action="pdf_pages.php" name="dragdrop">
<input type="button" name="dragdrop" value="<?php echo $strToggleScratchboard; ?>" onclick="ToggleDragDrop('pdflayout');" /> <input type="button" name="dragdrop" value="<?php echo $strToggleScratchboard; ?>" onclick="ToggleDragDrop('pdflayout');" />
<input type="button" name="dragdropreset" value="<?php echo $strReset; ?>" onclick="resetDrag();" /> <input type="button" name="dragdropreset" value="<?php echo $strReset; ?>" onclick="resetDrag();" />
@@ -344,8 +344,8 @@ foreach ($array_sh_page AS $key => $temp_sh_page) {
} }
?> ?>
</div> </div>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
function init() { function init() {
refreshLayout(); refreshLayout();
myid = getElement('pdflayout'); myid = getElement('pdflayout');
@@ -355,7 +355,7 @@ function init() {
function resetDrag() { function resetDrag() {
<?php echo $reset_draginit; ?> <?php echo $reset_draginit; ?>
} }
// --> //]]>
</script> </script>
<?php <?php
} // end if WYSIWYG-PDF } // end if WYSIWYG-PDF
@@ -517,10 +517,10 @@ function resetDrag() {
<?php <?php
if ((isset($showwysiwyg) && $showwysiwyg == '1')) { if ((isset($showwysiwyg) && $showwysiwyg == '1')) {
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
ToggleDragDrop('pdflayout'); ToggleDragDrop('pdflayout');
// --> //]]>
</script> </script>
<?php <?php
} }

6
scripts/setup.php
View File

@@ -1161,8 +1161,8 @@ switch ($action) {
echo htmlspecialchars(get_cfg_string($configuration)); echo htmlspecialchars(get_cfg_string($configuration));
echo '</textarea></form>' . "\n"; echo '</textarea></form>' . "\n";
?> ?>
<script language="javascript" type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
var bodyWidth=null; var bodyHeight=null; var bodyWidth=null; var bodyHeight=null;
if (document.getElementById('textconfig')) { if (document.getElementById('textconfig')) {
bodyWidth = self.innerWidth; bodyWidth = self.innerWidth;
@@ -1179,7 +1179,7 @@ switch ($action) {
document.getElementById('textconfig').style.width=(bodyWidth-50) + 'px'; document.getElementById('textconfig').style.width=(bodyWidth-50) + 'px';
document.getElementById('textconfig').style.height=(bodyHeight-100) + 'px'; document.getElementById('textconfig').style.height=(bodyHeight-100) + 'px';
} }
//--> //]]>
</script> </script>
<?php <?php
break; break;

12
tbl_change.php
View File

@@ -176,10 +176,10 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
<!-- Set on key handler for moving using by Ctrl+arrows --> <!-- Set on key handler for moving using by Ctrl+arrows -->
<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script> <script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
var switch_movement = 0; var switch_movement = 0;
document.onkeydown = onKeyDownArrowsHandler; document.onkeydown = onKeyDownArrowsHandler;
// --> //]]>
</script> </script>
<?php } ?> <?php } ?>
@@ -583,7 +583,9 @@ foreach ($loop_array AS $vrowcount => $vrow) {
<input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo urlencode($field); ?>]" value="" id="field_<?php echo ($idindex); ?>_1" /> <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo urlencode($field); ?>]" value="" id="field_<?php echo ($idindex); ?>_1" />
<input type="text" name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" /> <input type="text" name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" />
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[
document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field) . $browse_foreigners_uri; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>'); document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field) . $browse_foreigners_uri; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
//]]>
</script> </script>
</td> </td>
<?php <?php
@@ -851,10 +853,10 @@ foreach ($loop_array AS $vrowcount => $vrow) {
} }
if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') { if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
?> ?>
<script type="text/javascript"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>'); document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>');
//--> //]]>
</script> </script>
<?php <?php
} }

6
tbl_printview.php
View File

@@ -543,8 +543,8 @@ foreach ($the_tables AS $key => $table) {
*/ */
echo "\n"; echo "\n";
?> ?>
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript">
<!-- //<![CDATA[
function printPage() function printPage()
{ {
// Do print the page // Do print the page
@@ -552,7 +552,7 @@ function printPage()
window.print(); window.print();
} }
} }
//--> //]]>
</script> </script>
<?php <?php
echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n"; echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";

2
tbl_select.php
View File

@@ -92,7 +92,7 @@ if (!isset($param) || $param[0] == '') {
//$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE); //$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
$foreigners = PMA_getForeigners($db, $table); $foreigners = PMA_getForeigners($db, $table);
?> ?>
<script language="JavaScript" type="text/javascript"> <script type="text/javascript" language="javascript">
// <![CDATA[ // <![CDATA[
function PMA_tbl_select_operator(f, index, multiple) { function PMA_tbl_select_operator(f, index, multiple) {
switch (f.elements["func[" + index + "]"].options[f.elements["func[" + index + "]"].selectedIndex].value) { switch (f.elements["func[" + index + "]"].options[f.elements["func[" + index + "]"].selectedIndex].value) {

2
themes.php
View File

@@ -12,7 +12,7 @@ require_once('./libraries/header_http.inc.php');
$page_title = 'phpMyAdmin - ' . $strTheme; $page_title = 'phpMyAdmin - ' . $strTheme;
require('./libraries/header_meta_style.inc.php'); require('./libraries/header_meta_style.inc.php');
?> ?>
<script language="JavaScript" type="text/javascript"> <script type="text/javascript" language="javascript">
// <![CDATA[ // <![CDATA[
function takeThis(what){ function takeThis(what){
if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) {