MDL-19804 upgraded calls to print_table, print_single_button, print_user_picture...

diff --git a/mod/chat/chatd.php b/mod/chat/chatd.php
index db6e851ef2cfd929759ddf2e950671d2586faeb0..c64ce54957dc8dc792b8aaf6cbed6f20d15817b4 100755 (executable)
--- a/mod/chat/chatd.php
+++ b/mod/chat/chatd.php
@@ -281,7 +281,7 @@ EOD;
             $popuppar = '\'/user/view.php?id='.$userinfo['user']->id.'&course='.$userinfo['courseid'].'\',\'user'.$userinfo['chatuser']->id.'\',\'\'';
             echo '<tr><td width="35">';
             echo '<a target="_new" onclick="return openpopup('.$popuppar.');" href="'.$CFG->wwwroot.'/user/view.php?id='.$userinfo['chatuser']->id.'&amp;course='.$userinfo['courseid'].'">';
-            print_user_picture($userinfo['user']->id, 0, $userinfo['user']->picture, false, false, false);
+            echo $OUTPUT->user_picture(moodle_user_picture::make($userinfo['user'], 0));
             echo "</a></td><td valign=\"center\">";
             echo "<p><font size=\"1\">";
             echo fullname($userinfo['user'])."<br />";

diff --git a/mod/chat/gui_ajax/common.php b/mod/chat/gui_ajax/common.php
index 32afe33eceee2482cb4c52789b0409eab269ebf1..f9ac61428c66391a237657014e36fdb8124e7c41 100755 (executable)
--- a/mod/chat/gui_ajax/common.php
+++ b/mod/chat/gui_ajax/common.php
@@ -5,12 +5,12 @@ function microtime_float(){
 }
 
 function format_user_list($data, $course) {
-    global $CFG, $DB, $COURSE;
+    global $CFG, $DB, $COURSE, $OUTPUT;
     $users = array();
     foreach($data as $v){
         $user['name'] = fullname($v);
         $user['url'] = $CFG->wwwroot.'/user/view.php?id='.$v->id.'&course='.$course->id;
-        $user['picture'] = print_user_picture($v->id, $COURSE->id, $v->picture, false, true, false);
+        $user['picture'] = $OUTPUT->user_picture(moodle_user_picture::make($v, $COURSE->id));
         $user['id'] = $v->id;
         $users[] = $user;
     }

diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php
index aacf0a921f9c078cdb4b81406e2d69354af257f4..65a18cf65eb17f42ec0f4cde0a8d788a72499751 100644 (file)
--- a/mod/chat/gui_basic/index.php
+++ b/mod/chat/gui_basic/index.php
@@ -101,7 +101,9 @@
     echo '<div id="participants"><ul>';
     foreach($chatusers as $chu) {
         echo '<li>';
-        print_user_picture($chu->id, $course->id, $chu->picture, 24, false, false, '', false);
+        $userpic = moodle_user_picture::make($chu->id, $course->id);
+        $userpic->size = 24;
+        echo $OUTPUT->user_picture($userpic)
         echo '<div class="userinfo">';
         echo fullname($chu).' ';
         if ($idle = time() - $chu->lastmessageping) {

diff --git a/mod/chat/gui_header_js/users.php b/mod/chat/gui_header_js/users.php
index 118b49f87a695ed9f059f73a426a06e170b05f6d..c12191047bc8460cc1d3d071a11a503d55a0b5c9 100644 (file)
--- a/mod/chat/gui_header_js/users.php
+++ b/mod/chat/gui_header_js/users.php
@@ -88,7 +88,7 @@
         $idle = $min.':'.$sec;
         echo '<tr><td width="35">';
         echo "<a target=\"_blank\" onClick=\"return openpopup('/user/view.php?id=$chatuser->id&amp;course=$courseid','user$chatuser->id','');\" href=\"$CFG->wwwroot/user/view.php?id=$chatuser->id&amp;course=$courseid\">";
-        print_user_picture($chatuser->id, 0, $chatuser->picture, false, false, false);
+        echo $OUTPUT->user_picture(moodle_user_picture::make($chatuser, 0));
         echo '</a></td><td valign="center">';
         echo '<p><font size="1">';
         echo fullname($chatuser).'<br />';

diff --git a/mod/chat/index.php b/mod/chat/index.php
index 025318f7fdfe5695ec1b5074007eafca624aaa19..15f6111532f26b840e60c087c8727d7e83e1bb79 100644 (file)
--- a/mod/chat/index.php
+++ b/mod/chat/index.php
@@ -42,6 +42,8 @@
     $strweek  = get_string('week');
     $strtopic = get_string('topic');
 
+    $table = new html_table();
+
     if ($course->format == 'weeks') {
         $table->head  = array ($strweek, $strname);
         $table->align = array ('center', 'left');
@@ -81,7 +83,7 @@
 
     echo '<br />';
 
-    print_table($table);
+    echo $OUTPUT->table($table);
 
 /// Finish the page
 

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 95114c5608224a9ce1da4d0ff0888f1bd228b445..d528e8039c8959f6157c24ee65b787a029ab26e3 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -758,7 +758,7 @@ function chat_update_chat_times($chatid=0) {
  * @return bool|string Returns HTML or false
  */
 function chat_format_message_manually($message, $courseid, $sender, $currentuser, $chat_lastrow=NULL) {
-    global $CFG, $USER;
+    global $CFG, $USER, $OUTPUT;
 
     $output = new object();
     $output->beep = false;       // by default
@@ -777,7 +777,7 @@ function chat_format_message_manually($message, $courseid, $sender, $currentuser
     $USER->timezone = $tz;
     $message->strtime = userdate($message->timestamp, get_string('strftimemessage', 'chat'), $tz);
 
-    $message->picture = print_user_picture($sender->id, $courseid, $sender->picture, false, true, false);
+    $message->picture = $OUTPUT->user_picture(moodle_user_picture::make($sender, $courseid));
     if ($courseid) {
         $message->picture = "<a onclick=\"window.open('$CFG->wwwroot/user/view.php?id=$sender->id&amp;course=$courseid')\" href=\"$CFG->wwwroot/user/view.php?id=$sender->id&amp;course=$courseid\">$message->picture</a>";
     }

diff --git a/mod/chat/report.php b/mod/chat/report.php
index 74abee007735bc2a46f5cb7af181af1615f7ae5c..f67ea8d5d6e52443d2bb6791beee3103d2b15b9b 100644 (file)
--- a/mod/chat/report.php
+++ b/mod/chat/report.php
@@ -59,8 +59,8 @@
         }
 
         if ($deletesession and has_capability('mod/chat:deletelog', $context)) {
-            notice_yesno(get_string('deletesessionsure', 'chat'),
-                         "report.php?id=$cm->id&deletesession=1&confirmdelete=1&start=$start&end=$end&sesskey=".sesskey(),
+            echo $OUTPUT->confirm(get_string('deletesessionsure', 'chat'),
+                         "report.php?id=$cm->id&deletesession=1&confirmdelete=1&start=$start&end=$end",
                          "report.php?id=$cm->id");
         }
 
@@ -189,7 +189,7 @@
                 arsort($sessionusers);
                 foreach ($sessionusers as $sessionuser => $usermessagecount) {
                     if ($user = $DB->get_record('user', array('id'=>$sessionuser))) {
-                        print_user_picture($user, $course->id, $user->picture);
+                        $OUTPUT->user_picture(moodle_user_picture::make($user, $course->id));
                         echo ' '.fullname($user, true); // XXX TODO  use capability instead of true
                         echo "&nbsp;($usermessagecount)<br />";
                     }

diff --git a/mod/chat/view.php b/mod/chat/view.php
index 1c403c873d4b0b2bff21547f2b7626c94353687c..8179351ec1fd97d74542ce2780510728b1bf7935 100644 (file)
--- a/mod/chat/view.php
+++ b/mod/chat/view.php
@@ -49,7 +49,7 @@
         print_header_simple(format_string($chat->name), '', $navigation,
                       '', '', true, '', navmenu($course, $cm));
 
-        notice_yesno(get_string('noguests', 'chat').'<br /><br />'.get_string('liketologin'),
+        echo $OUTPUT->confirm(get_string('noguests', 'chat').'<br /><br />'.get_string('liketologin'),
                 get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
 
         echo $OUTPUT->footer();
@@ -172,7 +172,7 @@
             $lastping = $timenow - $chatuser->lastmessageping;
             echo '<tr><td class="chatuserimage">';
             echo "<a href=\"$CFG->wwwroot/user/view.php?id=$chatuser->id&amp;course=$chat->course\">";
-            print_user_picture($chatuser, $COURSE->id, $chatuser->picture, false, false, false);
+            echo $OUTPUT->user_picture(moodle_user_picture::make($chatuser, $COURSE->id));
             echo '</a></td><td class="chatuserdetails">';
             echo '<p>';
             echo fullname($chatuser).'<br />';