MDL-19804 Upgraded calls to helpbutton, print_simple_box* and notify

diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
index 6db2e979a69f9279bfd3c1aad337d022bbd12019..451732157253c492cd16c0bf72c91fd411a0077b 100644 (file)
--- a/mod/chat/gui_header_js/chatinput.php
+++ b/mod/chat/gui_header_js/chatinput.php
@@ -39,7 +39,7 @@
     <form action="../empty.php" method="post" target="empty" id="inputForm"
           onsubmit="return empty_field_and_submit()" style="margin:0">
         <input type="text" id="input_chat_message" name="chat_message" size="50" value="" />
-        <?php helpbutton('chatting', get_string('helpchatting', 'chat'), 'chat', true, false); ?><br />
+        <?php echo $OUTPUT->help_icon(moodle_help_icon::make('chatting', get_string('helpchatting', 'chat'), 'chat', true)); ?><br />
         <input type="checkbox" id="auto" size="50" value="" checked='true' /><label for="auto"><?php echo get_string('autoscroll', 'chat');?></label>
     </form>
 

diff --git a/mod/chat/gui_sockets/chatinput.php b/mod/chat/gui_sockets/chatinput.php
index 3efadb980f0c8febf0236f287c1576c467f5c785..e54697a3010926ba978e30eae47e75cd18f67713 100644 (file)
--- a/mod/chat/gui_sockets/chatinput.php
+++ b/mod/chat/gui_sockets/chatinput.php
@@ -26,7 +26,7 @@
     <form action="../empty.php" method="get" target="empty" id="inputform"
           onsubmit="return empty_field_and_submit();">
         <input type="text" name="chat_message" size="60" value="" />
-        <?php helpbutton("chatting", get_string("helpchatting", "chat"), "chat", true, false); ?>
+        <?php echo $OUTPUT->help_icon(moodle_help_icon::make("chatting", get_string("helpchatting", "chat"), "chat", true)); ?>
     </form>
     
     <form action="<?php echo "http://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform">

diff --git a/mod/chat/report.php b/mod/chat/report.php
index 8861fdad7a122a037ae29506316bc029c4fd84b7..74abee007735bc2a46f5cb7af181af1615f7ae5c 100644 (file)
--- a/mod/chat/report.php
+++ b/mod/chat/report.php
@@ -70,7 +70,7 @@
         } else {
             echo '<p class="boxaligncenter">'.userdate($start).' --> '. userdate($end).'</p>';
 
-            print_simple_box_start('center');
+            echo $OUTPUT->box_start('center');
             foreach ($messages as $message) {  // We are walking FORWARDS through messages
                 $formatmessage = chat_format_message($message, $course->id, $USER);
                 if (isset($formatmessage->html)) {
@@ -90,11 +90,11 @@
                     $button->set_callback_options('chat_portfolio_caller', $buttonoptions, '/mod/chat/lib.php');
                     $button->render();
                 }
-            print_simple_box_end();
+            echo $OUTPUT->box_end();
         }
 
         if (!$deletesession or !has_capability('mod/chat:deletelog', $context)) {
-            print_continue("report.php?id=$cm->id");
+            echo $OUTPUT->continue_button("report.php?id=$cm->id");
         }
 
         echo $OUTPUT->footer();
@@ -134,7 +134,7 @@
         $DB->delete_records_select('chat_messages', "chatid = :chatid AND timestamp >= :start AND
                                                      timestamp <= :end $groupselect", $params);
         $strdeleted  = get_string('deleted');
-        notify("$strdeleted: ".userdate($start).' --> '. userdate($end));
+        echo $OUTPUT->notification("$strdeleted: ".userdate($start).' --> '. userdate($end));
         unset($deletesession);
     }
 
@@ -184,7 +184,7 @@
 
                 echo '<p align="center">'.userdate($sessionstart).' --> '. userdate($sessionend).'</p>';
 
-                print_simple_box_start('center');
+                echo $OUTPUT->box_start();
 
                 arsort($sessionusers);
                 foreach ($sessionusers as $sessionuser => $usermessagecount) {
@@ -214,7 +214,7 @@
                     echo "<br /><a href=\"report.php?id=$cm->id&amp;start=$sessionstart&amp;end=$sessionend&amp;deletesession=1\">$strdeletesession</a>";
                 }
                 echo '</p>';
-                print_simple_box_end();
+                echo $OUTPUT->box_end();
             }
 
             $sessionend = $message->timestamp;