From c7225fe291e579aa8f1fe2d54e310125673403a1 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 3 Jan 2007 20:35:09 +0000
Subject: [PATCH] MDL-8062 chat, login page and messaging - removed name
 attribute from some <form>s and fixed focus; changed set_focus() JS to accept
 element ID == the $focus parameter in print_header() + other minor Strict
 XHTML fixes

---
 lib/javascript.php           | 10 ++++++----
 login/index.php              |  4 ++--
 login/index_form.html        | 20 ++++++++++++--------
 message/discussion.php       | 20 +++++++-------------
 mod/chat/gui_basic/index.php | 12 ++++++------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/javascript.php b/lib/javascript.php
index 40a9547996..bff9eea606 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -73,12 +73,14 @@ function inserttext(text) {
 }
 <?php if (!empty($focus)) {
     if(($pos = strpos($focus, '.')) !== false) {
+        //old style focus using form name - no allowed inXHTML Strict
         $topelement = substr($focus, 0, $pos);
+        echo "function setfocus() { if(document.$topelement) document.$focus.focus(); }\n";
+    } else {
+        //focus element with given id
+        echo "function setfocus() { if(el = document.getElementById('$focus')) el.focus(); }\n";
     }
-    else {
-        $topelement = $focus;
-    }
-    echo "function setfocus() { if(document.$topelement) document.$focus.focus(); }\n"; } ?>
+} ?>
 
 //]]>
 </script>
diff --git a/login/index.php b/login/index.php
index 70ec4c9e80..d4cd256401 100644
--- a/login/index.php
+++ b/login/index.php
@@ -256,9 +256,9 @@
     }
     
     if (!empty($frm->username)) {
-        $focus = "login.password";
+        $focus = "password";
     } else {
-        $focus = "login.username";
+        $focus = "username";
     }
     
     if (isset($CFG->auth_instructions)) {
diff --git a/login/index_form.html b/login/index_form.html
index 8ba140e388..e7fefb0b72 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -22,7 +22,7 @@
         }
         ?><br /><?php formerr($errormsg) ?>
       </p>
-      <form action="index.php" method="post" name="login" id="login">
+      <form action="index.php" method="post" id="login">
         <table border="0" align="center">
         <tr>
           <td width="80%">
@@ -32,7 +32,7 @@
                   <label for="username"><?php print_string("username") ?></label>
                 </td>
                 <td class="c1">
-                  <input type="text" name="username" id="username" size="15" value="<?php p($frm->username) ?>" alt="<?php print_string("username") ?>" /> 
+                  <input type="text" name="username" id="username" size="15" value="<?php p($frm->username) ?>" /> 
                 </td>
               </tr>
               <tr class="password"> 
@@ -40,7 +40,7 @@
                   <label for="password"><?php print_string("password") ?></label>
                 </td>
                 <td class="c1">
-                  <input type="password" name="password" id="password" size="15" value="" alt="<?php print_string("password") ?>" />
+                  <input type="password" name="password" id="password" size="15" value="" />
                 </td>
               </tr>
             </table>
@@ -56,11 +56,13 @@
 <?php if ($CFG->guestloginbutton) {  ?>
       <hr width="80%" />
       <p><?php print_string("someallowguest") ?>:</p>
-        <form action="index.php" method="post" name="guestlogin">
+        <form action="index.php" method="post" id="guestlogin">
+         <div>
           <input type="hidden" name="username" value="guest" />
           <input type="hidden" name="password" value="guest" />
           <input type="hidden" name="testcookies" value="1" />
           <input type="submit" value="<?php print_string("loginguest") ?>" />
+         </div>
         </form>
 <?php } ?>
 
@@ -70,9 +72,11 @@
 ?>
       <hr width="80%" />
       <p><?php print_string("forgotten") ?></p> 
-        <form action="forgot_password.php" method="post" name="changepassword">
+        <form action="forgot_password.php" method="post" id="changepassword">
+         <div>
           <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>" />
           <input type="submit" value="<?php p($changebuttonname) ?>" />
+         </div>
         </form>
     </td>
 
@@ -83,8 +87,8 @@
                  print_string("loginsteps", "", "signup.php");
 ?>
                  <div align="center">
-                   <form action="signup.php" method="get" name="signup">
-                   <input type="submit" value="<?php print_string("startsignup") ?>" />
+                   <form action="signup.php" method="get" id="signup">
+                   <div><input type="submit" value="<?php print_string("startsignup") ?>" /></div>
                    </form>
                  </div>
 <?php            break;
@@ -99,7 +103,7 @@
                  if (!empty($CFG->auth_user_create) and function_exists('auth_user_create') ){
 ?>
                  <div align="center">
-                    <form action="signup.php" method="get" name="signup">
+                    <form action="signup.php" method="get" id="signup">
                     <input type="submit" value="<?php print_string("startsignup") ?>" />
                     </form>
                  </div>
diff --git a/message/discussion.php b/message/discussion.php
index 3c7bc06257..d64a36f170 100644
--- a/message/discussion.php
+++ b/message/discussion.php
@@ -120,7 +120,7 @@
     $userfullname = fullname($user);
     $mefullname   = fullname($USER);
 
-    print_header(get_string('discussion', 'message').': '.fullname($user));
+    print_header(get_string('discussion', 'message').': '.fullname($user), '', '', 'edit-message');
     echo '<div class="message-discussion-noframes">';
     echo '<div id="userinfo">';
     echo print_user_picture($user->id, SITEID, $user->picture, 48, true, true, 'userwindow');
@@ -155,12 +155,7 @@
     echo '</div>'; // class="userinfo"
 
     echo '<div id="send">';
-    echo '<form name="editing" method="post" action="discussion.php">';
-    echo '<input type="hidden" name="id" value="'.$user->id.'" />';
-    echo '<input type="hidden" name="start" value="'.$start.'" />';
-    echo '<input type="hidden" name="noframesjs" value="'.$noframesjs.'" />';
-    echo '<input type="hidden" name="last" value="'.time().'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<form id="editing" method="post" action="discussion.php">';
 
     $usehtmleditor = (can_use_html_editor() && get_user_preferences('message_usehtmleditor', 0));
     echo '<h1><label for="edit-message">'.get_string('sendmessage', 'message').'</label></h1>';
@@ -174,6 +169,11 @@
         echo '<input type="hidden" name="format" value="'.FORMAT_MOODLE.'" />';
     }
     echo '</div><div>';
+    echo '<input type="hidden" name="id" value="'.$user->id.'" />';
+    echo '<input type="hidden" name="start" value="'.$start.'" />';
+    echo '<input type="hidden" name="noframesjs" value="'.$noframesjs.'" />';
+    echo '<input type="hidden" name="last" value="'.time().'" />';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     echo '<input type="submit" value="'.get_string('sendmessage', 'message').'" />&nbsp;';
     echo '<input type="submit" name="refresh" value="'.get_string('refresh').'" />';
     echo '<input type="checkbox" name="newonly" id="newonly" '.($newonly?'checked="checked" ':'').'/><label for="newonly">'.get_string('newonlymsg', 'message').'</label>';
@@ -207,8 +207,6 @@
             }
 
             $printmessage = format_text($message->message, $message->format, $options, 0);
-            $printmessage = str_replace("\r", ' ', $printmessage);
-            $printmessage = str_replace("\n", ' ', $printmessage);
             $printmessage = '<div class="message other"><span class="author">'.$fullname.'</span> '.
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
@@ -227,8 +225,6 @@
             $time = userdate($message->timecreated, get_string('strftimedaytime'));
 
             $printmessage = format_text($message->message, $message->format, $options, 0);
-            $printmessage = str_replace("\r", ' ', $printmessage);
-            $printmessage = str_replace("\n", ' ', $printmessage);
             $printmessage = '<div class="message other"><span class="author">'.$mefullname.'</span> '.
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
@@ -247,8 +243,6 @@
             $time = userdate($message->timecreated, get_string('strftimedaytime'));
 
             $printmessage = format_text($message->message, $message->format, $options, 0);
-            $printmessage = str_replace("\r", ' ', $printmessage);
-            $printmessage = str_replace("\n", ' ', $printmessage);
             $printmessage = '<div class="message other"><span class="author">'.$userfullname.'</span> '.
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php
index e72aaacfbc..89210c8e60 100644
--- a/mod/chat/gui_basic/index.php
+++ b/mod/chat/gui_basic/index.php
@@ -95,7 +95,7 @@
     }
 
 
-    print_header("$strchat: $course->shortname: ".format_string($chat->name,true)."$groupname");
+    print_header("$strchat: $course->shortname: ".format_string($chat->name,true)."$groupname", '', '', 'message');
 
     echo '<div id="mod-chat-gui_basic">';
     echo '<h1>'.get_string('participants').'</h1>';
@@ -115,17 +115,17 @@
     }
     echo '</ul></div>';
     echo '<div id="send">';
-    echo '<form name="editing" method="post" action="index.php">';
-    echo '<input type="hidden" name="id" value="'.$id.'" />';
-    echo '<input type="hidden" name="groupid" value="'.$groupid.'" />';
-    echo '<input type="hidden" name="last" value="'.time().'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<form id="editing" method="post" action="index.php">';
 
     $usehtmleditor = can_use_html_editor();
     echo '<h1><label for="message">'.get_string('sendmessage', 'message').'</label></h1>';
     echo '<div>';
     echo '<input type="text" id="message" name="message" value="'.s($refreshedmessage, true).'" size="60" />';
     echo '</div><div>';
+    echo '<input type="hidden" name="id" value="'.$id.'" />';
+    echo '<input type="hidden" name="groupid" value="'.$groupid.'" />';
+    echo '<input type="hidden" name="last" value="'.time().'" />';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     echo '<input type="submit" value="'.get_string('submit').'" />&nbsp;';
     echo '<input type="submit" name="refresh" value="'.get_string('refresh').'" />';
     echo '<input type="checkbox" name="newonly" id="newonly" '.($newonly?'checked="checked" ':'').'/><label for="newonly">'.get_string('newonlymsg', 'message').'</label>';
-- 
2.39.5