Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2005-12-05 02:14:41 +0300
committerMichal Čihař <michal@cihar.com>2005-12-05 02:14:41 +0300
commit75a16f45f864aa2bf8630070493faebc1f6f8bf3 (patch)
tree2a9456cff1f3e95e40cec9d45dd573c24436b6c4
parentd7c81e9c44bc2e7c83befea1fd3b3ca303278b29 (diff)
Use same script tag, use CDATA for scripts (RFE #995065).
Diffstat
-rwxr-xr-xChangeLog3
-rw-r--r--calendar.php8
-rw-r--r--db_printview.php6
-rw-r--r--export.php7
-rw-r--r--libraries/common.lib.php13
-rw-r--r--libraries/display_export.lib.php12
-rw-r--r--libraries/display_import.lib.php4
-rw-r--r--libraries/footer.inc.php2
-rw-r--r--libraries/sql_query_form.lib.php2
-rw-r--r--pdf_pages.php14
-rw-r--r--scripts/setup.php6
-rw-r--r--tbl_change.php12
-rw-r--r--tbl_printview.php6
-rw-r--r--tbl_select.php2
-rw-r--r--themes.php2
15 files changed, 55 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index f29149551b..4849aa0345 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$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>
* lang/catalan update, thanks to Xavier Navarro (xavin).
* server_privileges.php: do not use UNION DISTINCT, as it's not allowed
diff --git a/calendar.php b/calendar.php
index e24ca43afa..4c8b1a71d7 100644
--- a/calendar.php
+++ b/calendar.php
@@ -6,13 +6,13 @@ require_once('./libraries/header_http.inc.php');
$page_title = $strCalendar;
require('./libraries/header_meta_style.inc.php');
?>
-<script type="text/javascript" src="./js/tbl_change.js"></script>
-<script type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript" src="./js/tbl_change.js"></script>
+<script type="text/javascript" language="javascript">
+//<![CDATA[
var month_names = new Array("<?php echo implode('","', $month); ?>");
var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
var submit_text = "<?php echo $strGo; ?>";
-//-->
+//]]>
</script>
</head>
<body onload="initCalendar();">
diff --git a/db_printview.php b/db_printview.php
index c64bcb4611..09ac084bdc 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -287,8 +287,8 @@ else {
*/
echo "\n";
?>
-<script type="text/javascript" language="javascript1.2">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
function printPage()
{
// Do print the page
@@ -296,7 +296,7 @@ function printPage()
window.print();
}
}
-//-->
+//]]>
</script>
<?php
echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";
diff --git a/export.php b/export.php
index bf4a8252ec..7790a7fb14 100644
--- a/export.php
+++ b/export.php
@@ -580,8 +580,9 @@ else {
. ' </form>' . "\n";
echo '</div>' . "\n";
echo "\n";
-?><script language="JavaScript" type="text/javascript">
-<!--
+?>
+<script type="text/javascript" language="javascript">
+//<![CDATA[
var bodyWidth=null; var bodyHeight=null;
if (document.getElementById('textSQLDUMP')) {
bodyWidth = self.innerWidth;
@@ -598,7 +599,7 @@ else {
document.getElementById('textSQLDUMP').style.width=(bodyWidth-50) + 'px';
document.getElementById('textSQLDUMP').style.height=(bodyHeight-100) + 'px';
}
-//-->
+//]]>
</script>
<?php
require_once('./libraries/footer.inc.php');
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index df979944c1..c2a42563bb 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -869,11 +869,16 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
echo '<meta http-equiv="Pragma" 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 '<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 '//]]>' . "\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 '//]]>' . "\n";
echo '</script></body></html>' . "\n";
} else {
@@ -1199,7 +1204,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
echo "\n";
$reload_url = './left.php?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&');
?>
-<script type="text/javascript">
+<script type="text/javascript" language="javascript">
//<![CDATA[
if (typeof(window.parent) != '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 );
echo "\n";
?>
-<script type="text/javascript">
+<script type="text/javascript" language="javascript">
//<![CDATA[
window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFormat($tooltip, false); ?>' );
//]]>
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 8db8f9993f..8000c90235 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -58,8 +58,8 @@ if (isset($sql_query)) {
}
?>
-<script type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
function hide_them_all() {
document.getElementById("csv_options").style.display = 'none';
document.getElementById("excel_options").style.display = 'none';
@@ -114,7 +114,7 @@ function show_checked_option() {
}
}
}
-//-->
+//]]>
</script>
<fieldset id="fieldsetexport">
@@ -748,10 +748,10 @@ function show_checked_option() {
<input type="hidden" name="xml_data" value="xml_data" />
</fieldset>
-<script type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
show_checked_option();
-//-->
+//]]>
</script>
<?php if ( ! empty( $table ) && ! isset( $num_tables ) ) { ?>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index d7ef22acf4..3f159024b4 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -71,7 +71,7 @@ if ($import_type == 'server') {
echo ' <input type="hidden" name="import_type" value="' . $import_type . '" />';
?>
- <script type="text/javascript">
+ <script type="text/javascript" language="javascript">
//<![CDATA[
function hide_them_all() {
<?php
@@ -289,7 +289,7 @@ echo "\n";
<input type="submit" value="<?php echo $strGo; ?>" id="buttonGo" />
</fieldset>
</form>
-<script type="text/javascript">
+<script type="text/javascript" language="javascript">
//<![CDATA[
init_options();
//]]>
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 6c71ac189f..c0d0839565 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -18,7 +18,7 @@ require_once('./libraries/relation.lib.php'); // for PMA_setHistory()
// If query window is open, update with latest selected db/table.
?>
-<script type="text/javascript">
+<script type="text/javascript" language="javascript">
//<![CDATA[
<?php
if ( ! isset( $GLOBALS['no_history'] ) && ! empty( $GLOBALS['db'] ) && empty( $GLOBALS['error_message'] ) ) {
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 4983e0070e..64d6849c10 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -343,7 +343,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
echo '<div class="formelement">' . "\n";
if ( $is_querywindow ) {
?>
- <script type="text/javascript">
+ <script type="text/javascript" language="javascript">
//<![CDATA[
document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo $GLOBALS['strQueryWindowLock']; ?></label> ');
//]]>
diff --git a/pdf_pages.php b/pdf_pages.php
index d9b8814d82..fb77982df4 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -303,7 +303,7 @@ if ($cfg['WYSIWYG-PDF']) {
$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">
<input type="button" name="dragdrop" value="<?php echo $strToggleScratchboard; ?>" onclick="ToggleDragDrop('pdflayout');" />
<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>
-<script type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
function init() {
refreshLayout();
myid = getElement('pdflayout');
@@ -355,7 +355,7 @@ function init() {
function resetDrag() {
<?php echo $reset_draginit; ?>
}
-// -->
+//]]>
</script>
<?php
} // end if WYSIWYG-PDF
@@ -517,10 +517,10 @@ function resetDrag() {
<?php
if ((isset($showwysiwyg) && $showwysiwyg == '1')) {
?>
-<script type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
ToggleDragDrop('pdflayout');
-// -->
+//]]>
</script>
<?php
}
diff --git a/scripts/setup.php b/scripts/setup.php
index 4536846c33..245dbdfa13 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -1161,8 +1161,8 @@ switch ($action) {
echo htmlspecialchars(get_cfg_string($configuration));
echo '</textarea></form>' . "\n";
?>
-<script language="javascript" type="text/javascript">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
var bodyWidth=null; var bodyHeight=null;
if (document.getElementById('textconfig')) {
bodyWidth = self.innerWidth;
@@ -1179,7 +1179,7 @@ switch ($action) {
document.getElementById('textconfig').style.width=(bodyWidth-50) + 'px';
document.getElementById('textconfig').style.height=(bodyHeight-100) + 'px';
}
-//-->
+//]]>
</script>
<?php
break;
diff --git a/tbl_change.php b/tbl_change.php
index 3bdd12223f..af090fb71d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -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 -->
<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript">
-<!--
+//<![CDATA[
var switch_movement = 0;
document.onkeydown = onKeyDownArrowsHandler;
-// -->
+//]]>
</script>
<?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="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">
+ //<![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>');
+ //]]>
</script>
</td>
<?php
@@ -851,10 +853,10 @@ foreach ($loop_array AS $vrowcount => $vrow) {
}
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>');
- //-->
+ //]]>
</script>
<?php
}
diff --git a/tbl_printview.php b/tbl_printview.php
index 0a8ec7e473..411135047f 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -543,8 +543,8 @@ foreach ($the_tables AS $key => $table) {
*/
echo "\n";
?>
-<script type="text/javascript" language="javascript1.2">
-<!--
+<script type="text/javascript" language="javascript">
+//<![CDATA[
function printPage()
{
// Do print the page
@@ -552,7 +552,7 @@ function printPage()
window.print();
}
}
-//-->
+//]]>
</script>
<?php
echo '<br /><br />&nbsp;<input type="button" class="print_ignore" style="width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()" />' . "\n";
diff --git a/tbl_select.php b/tbl_select.php
index 08d64cd885..7cf09b7976 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -92,7 +92,7 @@ if (!isset($param) || $param[0] == '') {
//$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
$foreigners = PMA_getForeigners($db, $table);
?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript" language="javascript">
// <![CDATA[
function PMA_tbl_select_operator(f, index, multiple) {
switch (f.elements["func[" + index + "]"].options[f.elements["func[" + index + "]"].selectedIndex].value) {
diff --git a/themes.php b/themes.php
index a34a1ec103..7b083ce0d0 100644
--- a/themes.php
+++ b/themes.php
@@ -12,7 +12,7 @@ require_once('./libraries/header_http.inc.php');
$page_title = 'phpMyAdmin - ' . $strTheme;
require('./libraries/header_meta_style.inc.php');
?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript" language="javascript">
// <![CDATA[
function takeThis(what){
if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 01:53:25 +0300