Replacing HTML "script" element deprecated attribute "language".

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10648 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/page_header.php b/functions/page_header.php
index d3385bb4069006252bc0c74dea033538d2659cce..25c1ff30a1c0c300de8d6dbccde2c914382211c4 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -191,9 +191,9 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
     }
 
     if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
-        $sJsBlock = '<script src="'. $sTplDir. 'js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        $sJsBlock = '<script src="'. $sTplDir. 'js/default.js" type="text/javascript"></script>' ."\n";
         if ($sHeaderJs) {
-            $sJsBlock .= "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+            $sJsBlock .= "\n<script type=\"text/javascript\">" .
                         "\n<!--\n" .
                         $sHeaderJs . "\n\n// -->\n</script>\n";
         }
@@ -265,13 +265,13 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
      */
     if($javascript_on) {
         if ($sHeaderJs) {
-            $sJsBlock = "\n<script language=\"JavaScript\" type=\"text/javascript\">" .
+            $sJsBlock = "\n<script type=\"text/javascript\">" .
                         "\n<!--\n" .
                         $sHeaderJs . "\n\n// -->\n</script>\n";
         } else {
         $sJsBlock = '';
         }
-        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript" language="JavaScript"></script>' ."\n";
+        $sJsBlock .= "\n" . '<script src="'. SM_PATH .'templates/default/js/default.js" type="text/javascript"></script>' ."\n";
         displayHtmlHeader (_("Compose"), $sJsBlock);
     } else {
         /* javascript off */

diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index 67d4f1a33af6acc71bf7c94ef733617a3fe6b67e..bed4f6189508bcc567ec278bfcfc25e6ab51eabc 100644 (file)
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -22,7 +22,7 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/forms.php');
 
 displayHtmlHeader( _("Message Details"),
-             "<script language=\"javascript\" type=\"text/javascript\">\n".
+             "<script type=\"text/javascript\">\n".
              "<!--\n".
              "function printPopup() {\n".
                 "parent.frames[1].focus();\n".

diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 7e9ccf74f11b53b4c821091bf4f877ab641adbdc..9aac54b7ed62de6b0d677096eb311abae6a56c35 100644 (file)
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -46,7 +46,7 @@ function show_message_details() {
     $result = '';
     /* Output the link. */
     if ($javascript_on) {
-        $result = '<script type="text/javascript" language="javascript">' . "\n" .
+        $result = '<script type="text/javascript">' . "\n" .
                 '<!--' . "\n" .
                 "  function MessageSource() {\n" .
                 '    window.open("../plugins/message_details/message_details_main.php' .

diff --git a/plugins/newmail/functions.php b/plugins/newmail/functions.php
index 482f7197b9ef3543b9b3cdf43cf1f88342c82500..9f60c21c133d012a095a9734e2a0eaf8c770439e 100644 (file)
--- a/plugins/newmail/functions.php
+++ b/plugins/newmail/functions.php
@@ -233,7 +233,7 @@ function newmail_plugin_function() {
         // will play the sound as follows:
 
         if ($newmail_changetitle) {
-            echo "<script language=\"javascript\" type=\"text/javascript\">\n" .
+            echo "<script type=\"text/javascript\">\n" .
                 "function ChangeTitleLoad() {\n";
             echo 'window.parent.document.title = "' .
                 sprintf(ngettext("%s New Message","%s New Messages",$totalNew), $totalNew) .
@@ -255,7 +255,7 @@ function newmail_plugin_function() {
             // Idea by:  Nic Wolfe (Nic@TimelapseProductions.com)
             // Web URL:  http://fineline.xs.mw
             // More code from Tyler Akins
-            echo "<script language=\"JavaScript\">\n".
+            echo "<script type=\"text/javascript\">\n".
                 "<!--\n".
                 "function PopupScriptLoad() {\n".
                 'window.open("'.sqm_baseuri().'plugins/newmail/newmail.php?numnew='.$totalNew.

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index a6d669918523186bf45263bbc1c2fa1403b85fd3..d60b8c8f0d8f4df340b36951090c963aa9930922 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -42,7 +42,7 @@ $numnew = (int)$numnew;
                       ) ,
                   '', '', 'width="100%" cellpadding="2" cellspacing="2" border="0"' ) .
    '</div>' .
-   "<script language=javascript>\n".
+   "<script type=\"text/javascript\">\n".
    "<!--\n".
    "document.nm.bt.focus();\n".
    "-->\n".

diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php
index 3d5a03be93599c262e135d583f149ffa106e5311..d3a21deeefa8548797f390105b70900acbe2a66b 100644 (file)
--- a/plugins/spamcop/functions.php
+++ b/plugins/spamcop/functions.php
@@ -93,7 +93,7 @@ function spamcop_show_link_function() {
     // Javascript is used only in web based reporting
     // don't insert javascript if javascript is disabled
     if ($spamcop_method == 'web_form' && $javascript_on) {
-?><script language="javascript" type="text/javascript">
+?><script type="text/javascript">
 document.write('<a href="../plugins/spamcop/spamcop.php?passed_id=<?php echo urlencode($passed_id); ?>&amp;js_web=1&amp;mailbox=<?php echo urlencode($mailbox); ?>&amp;passed_ent_id=<?php echo urlencode($passed_ent_id); ?>" target="_blank">');
 document.write("<?php echo _("Report as Spam"); ?>");
 document.write("</a>");

diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index bbee82183e38d182ee67de0a3d94b53eb641015f..c8dec2c800d071902415c205a228e4e637f8c77b 100644 (file)
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -872,7 +872,7 @@ function sqspell_handle_crypt_panic($lang=false) {
   /**
    * Add some string vars so they can be i18n'd.
    */
-  $msg .= "<script type='text/javascript'><!--\n"
+  $msg .= "<script type=\"text/javascript\"><!--\n"
     . "var ui_choice = \"" . _("You must make a choice") ."\";\n"
     . "var ui_candel = \"" . _("You can either delete your dictionary or type in the old password. Not both.") . "\";\n"
     . "var ui_willdel = \"" . _("This will delete your personal dictionary file. Proceed?") . "\";\n"

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 33d9109343aa033ee9bd3e6fbb602135e3ed4fb0..5a4529e8887bddf88bc13c4ff17a0dd3d12b43a8 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -36,7 +36,7 @@ include_once(SM_PATH . 'functions/addressbook.php');
  */
 function insert_javascript() {
     ?>
-    <script language="Javascript"><!--
+    <script type="text/javascript"><!--
 
     function to_and_close($addr) {
         to_address($addr);

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 31b6da9fa7923bfb4aab2250a19cdc3b9f1ed031..e4dcce4b9a21076c9377e845fad09b69a559f608 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -79,7 +79,7 @@ function addr_display_result($res, $includesource = true) {
 
     if ($javascript_on) {
         print
-            '<script language="JavaScript" type="text/javascript">' .
+            '<script type="text/javascript">' .
             "\n<!-- \n" .
             "function CheckAll(ch) {\n" .
             "   for (var i = 0; i < document.addrbook.elements.length; i++) {\n" .

diff --git a/src/compose.php b/src/compose.php
index d15cb2a575483f2b71f426c06a8cd02018781ffd..c2ed4e2254a47dc927ce1412610b63d5b345b584 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1052,7 +1052,7 @@ function showInputForm ($session, $values=false) {
     }
 
     if ($use_javascript_addr_book) {
-        echo "\n". '<script language="JavaScript">'."\n<!--\n" .
+        echo "\n". '<script type="text/javascript">'."\n<!--\n" .
             'function open_abook() { ' . "\n" .
             '  var nwin = window.open("addrbook_popup.php","abookpopup",' .
             '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
@@ -1379,7 +1379,7 @@ function showComposeButtonRow() {
         '      <td>' . "\n" .
         '         <input type="submit" name="sigappend" value="' . _("Signature") . '" />' . "\n";
     if ($use_javascript_addr_book) {
-        echo "         <script language=\"JavaScript\"><!--\n document.write(\"".
+        echo "         <script type=\"text/javascript\"><!--\n document.write(\"".
             "            <input type=button value=\\\""._("Addresses").
             "\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
             "            // --></script><noscript>\n".
@@ -1717,4 +1717,4 @@ function deliverMessage($composeMessage, $draft=false) {
     return $success;
 }
 
-?>
+?>
\ No newline at end of file

diff --git a/src/left_main.php b/src/left_main.php
index 79e41ede31a7b4ba724527171d4dc99809b08ceb..58b9e349c94387fc5ab023d43c7109b1b6fd7e49 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -407,7 +407,7 @@ if (empty($advanced_tree)) {
 
 if ($advanced_tree) {
 $xtra .= <<<HEREDOC
-<script language="Javascript" type="text/javascript">
+<script type="text/javascript">
 <!--
     function preload() {
       if (document.images) {

diff --git a/src/login.php b/src/login.php
index c611d3e29acf5728d52ad5352327c06e0eeb9e88..2aa2fe23a1ca2b2fc8a6e5c5a3e92fd3964b578c 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -92,7 +92,7 @@ $loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($
 
 /* Output the javascript onload function. */
 
-$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
+$header = "<script type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    var textElements = 0;\n".

diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php
index cc7a924f8d4c9589c0146f2f1c52ada7bb18ac37..d068b8a8c983fa18f6caf1959aae2e63fb95bbdd 100644 (file)
--- a/src/printer_friendly_top.php
+++ b/src/printer_friendly_top.php
@@ -22,7 +22,7 @@ define('SM_PATH','../');
 include_once(SM_PATH . 'include/validate.php');
 
 displayHtmlHeader( _("Printer Friendly"),
-             "<script language=\"javascript\" type=\"text/javascript\">\n".
+             "<script type=\"text/javascript\">\n".
              "<!--\n".
              "function printPopup() {\n".
                 "parent.frames[1].focus();\n".

diff --git a/src/read_body.php b/src/read_body.php
index 2e45408826e51ca3e0d1e05d3565da258c4c655a..bd9ce69bbf9e516966e994db4508f6c127a0f5fd 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -99,7 +99,7 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
     $result = '';
     /* Output the link. */
     if ($javascript_on) {
-        $result = '<script language="javascript" type="text/javascript">' . "\n" .
+        $result = '<script type="text/javascript">' . "\n" .
                   '<!--' . "\n" .
                   "  function printFormat() {\n" .
                   '    window.open("../src/printer_friendly_main.php' .
@@ -386,7 +386,7 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
                           $passed_ent_id)) {
                         $mdn_url = $PHP_SELF . '&sendreceipt=1';
                         if ($FirstTimeSee && $javascript_on) {
-                            $script  = '<script language="JavaScript" type="text/javascript">' . "\n";
+                            $script  = '<script type="text/javascript">' . "\n";
                             $script .= '<!--'. "\n";
                             $script .= 'if(window.confirm("' .
                                        _("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") .
@@ -1033,4 +1033,4 @@ sqimap_logout($imapConnection);
 $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
 $oTemplate->display('footer.tpl');
-?>
+?>
\ No newline at end of file

diff --git a/templates/default/paginator.tpl b/templates/default/paginator.tpl
index f463573a380c22c7884c4519a7830dffe89ae38c..a0c5af2452736cc625aeb24435af366e5cbfd779 100644 (file)
--- a/templates/default/paginator.tpl
+++ b/templates/default/paginator.tpl
@@ -24,7 +24,7 @@ if ($javascript_on && $compact_paginator &&!isset($bScriptAdded)) {
 ?>
 
 <!-- start of compact paginator javascript -->
-<script language="JavaScript">
+<script type="text/javascript">
     function SubmitOnSelect(select, URL)
     {
         URL += select.options[select.selectedIndex].value;

diff --git a/themes/darkness.php b/themes/darkness.php
index 705c0184e961348a6255b86342a950b691632896..cfc8fa471907349e20390a8ff9f428f661576280 100755 (executable)
--- a/themes/darkness.php
+++ b/themes/darkness.php
@@ -49,7 +49,7 @@ function Darkness_HeaderPlugin() {
          'blendTrans(Duration=2.0)" />' . "\n";
    }
 
-?><script language="javascript">
+?><script type="text/javascript">
 darkness_color = 0;
 darkness_dir = +1;
 darkness_hex = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9',