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

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 688cba3c42642f81212ba66f99b5a8ad052a9512..7bd440c0d2986950798dfea10f8690c31c21994e 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -151,8 +151,8 @@
         case "removepages":
             if($form->proceed) {
               if(!$confirm && $form->pagestodelete) {
-                notice_yesno(get_string("removepagecheck", "wiki")."<br />".join(", ", $form->pagestodelete),
-                  $link."&amp;confirm=".urlencode(join(" ",$form->pagestodelete)), $link);
+                echo $OUTPUT->confirm(get_string("removepagecheck", "wiki")."<br />".join(", ", $form->pagestodelete),
+                  $link."&confirm=".urlencode(join(" ",$form->pagestodelete)), $link);
                 echo $OUTPUT->footer();
                 exit;
               }
@@ -172,8 +172,7 @@
                   foreach($form->pagestostrip as $pagetostrip) {
                     $pagestostrip[]=htmlspecialchars(urldecode($pagetostrip));
                   }
-                  notice_yesno(get_string("strippagecheck", "wiki")."<br />".join(", ", $pagestostrip),
-                      $link.$confirm, $link);
+                  echo $OUTPUT->confirm(get_string("strippagecheck", "wiki")."<br />".join(", ", $pagestostrip), $link.$confirm, $link);
                   echo $OUTPUT->footer();
                   exit;
                 }
@@ -184,8 +183,7 @@
             if($form->proceed) {
               if(!$confirm && $form->pagetocheck) {
                 $confirm="&amp;confirm=".$form->pagetocheck;
-                notice_yesno(get_string("checklinkscheck", "wiki").$form->pagetocheck,
-                    $link.$confirm, $link);
+                echo $OUTPUT->confirm(get_string("checklinkscheck", "wiki").$form->pagetocheck, $link.$confirm, $link);
                 echo $OUTPUT->footer();
                 exit;
               }
@@ -204,8 +202,7 @@
                            "&confirm[deleteversions]=".urlencode($form->deleteversions);
                   $revertedpages=wiki_admin_revert("", $form->authorfieldpattern, $form->changesfield, $form->howtooperate, $form->deleteversions);
                   if($revertedpages) {
-                    notice_yesno(get_string("revertpagescheck", "wiki")."<br />".$revertedpages,
-                      $link.$confirm, $link);
+                    echo $OUTPUT->confirm(get_string("revertpagescheck", "wiki")."<br />".$revertedpages, $link.$confirm, $link);
                     echo $OUTPUT->footer();
                     exit;
                   } else {

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index b50e7ba1b43c300ddc8c1cedd433c45f30274bfb..651fd3c620b32f762b80d369e998286b2180b318 100644 (file)
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -874,7 +874,7 @@ function ewiki_script($asid="", $id=false, $params="", $bin=0, $html=1, $script=
    if (strlen($params)) {
       $url .= (strpos($url,"?")!==false ? "&":"?") . $params;
    }
-\r   #-- fin
+   #-- fin
    if ($html) {
       //Don't replace & if it's part of encoded character (bug 2209)
       $url = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/","&", $url);
@@ -1157,7 +1157,7 @@ function ewiki_page_search($id, &$data, $action) {
 function ewiki_page_info($id, &$data, $action) {
 
    global $ewiki_plugins, $ewiki_config, $ewiki_links;
-   global $CFG, $COURSE, $DB;  // MOODLE HACK
+   global $CFG, $COURSE, $DB, $OUTPUT;  // MOODLE HACK
 
    $pnum = optional_param(EWIKI_UP_PAGENUM, 0);
    $pend = optional_param(EWIKI_UP_PAGEEND, 0);
@@ -1281,8 +1281,10 @@ function ewiki_page_info($id, &$data, $action) {
                  if (!isset($COURSE->id)) {
                      $COURSE->id = SITEID;
                  }
-                 $picture = print_user_picture($user->id, $COURSE->id, $user->picture, false, true, true);
-                 $value = $picture." <a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$COURSE->id\">".fullname($user)."</a>";
+                 $userpic = moodle_user_picture::make($user->id, $COURSE->id);
+                 $userpic->link = true;
+                 $picture = $OUTPUT->user_picture($userpic);
+                 $value = $picture . $OUTPUT->link("$CFG->wwwroot/user/view.php?id=$user->id&course=$COURSE->id", fullname($user));
              } else {
                  continue;
                  //$value = @$current['author'];

diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 0f7886375fda377b4e3b6bca4f198ad6707ec569..16a2440f7ef1ca767e38568a3c6b260b70db28a7 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -348,9 +348,10 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
             if (!isset($course->id)) {
                 $course->id = 1;
             }
-            $picture = print_user_picture($user->id, $course->id, $user->picture, false, true, true);
-            $value = $picture." <a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">".
-                     fullname($user)."</a>";
+            $userpic = moodle_user_picture::make($user->id, $course->id);
+            $userpic->link = true;
+            $picture = $OUTPUT->user_picture($userpic);
+            $value = $picture . $OUTPUT->link("$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", fullname($user));
         }
 
         $o .= '<a href="'.$info->url.'">'.$info->icon.$info->title.'</a>'.$info->size.'<br />'.

diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index 35ee4b5f4e8a6e6242649e21f815b435e10b6903..9a1892af5979c4ec1d2e12550b561a56f54fa3d2 100644 (file)
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -47,6 +47,7 @@
     $strweek  = get_string('week');
     $strtopic  = get_string('topic');
 
+    $table = new html_table();
     if ($course->format == "weeks") {
         $table->head  = array ($strweek, $strname, $strsummary, $strtype, $strlastmodified);
         $table->align = array ('CENTER', 'LEFT', 'LEFT', 'LEFT', 'LEFT');
@@ -99,7 +100,7 @@
 
     echo "<br />";
 
-    print_table($table);
+    echo $OUTPUT->table($table);
 
 /// Finish the page
 

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index eebc181d719f66c598cb4990a811d77a1871441b..6da17ae3af1f1613d59c9291ccdce46cc5daa420 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -1596,7 +1596,7 @@ function wiki_admin_get_flagarray() {
  */
 function wiki_admin_setpageflags_list($pageflagstatus) {
   $FD = wiki_admin_get_flagarray();
-  $table = new Object();
+    $table = new html_table();
   $table->head = array(get_string("pagename","wiki"), get_string("flags","wiki"));
   if($pageflagstatus) {
     $table->head[]=get_string("status","wiki");
@@ -1675,7 +1675,7 @@ function wiki_admin_setpageflags($pageflags) {
  */
 function wiki_admin_remove_list($listall="") {
   /// Table header
-  $table = new Object();
+    $table = new html_table();
   $table->head = array(" ", get_string("pagename","wiki"), get_string("errororreason","wiki"));
 
   /// Get all pages
@@ -1808,7 +1808,7 @@ function wiki_admin_remove($pagestodelete, $course, $wiki, $userid, $groupid) {
  */
 function wiki_admin_strip_list($pagestostrip="",$version="",$err="") {
   /// Table header
-  $table = new Object();
+    $table = new html_table();
   $table->head = array(" ", get_string("pagename","wiki"), get_string("deleteversions","wiki"));
 
   $vc=ewiki_database("COUNTVERSIONS", array());

diff --git a/mod/wiki/removepages.html b/mod/wiki/removepages.html
index 98d8b3b31029cbfd00b87992158c9620ad2a37ce..676509dfac479fa7288144a6113ee1f75bcf3057 100644 (file)
--- a/mod/wiki/removepages.html
+++ b/mod/wiki/removepages.html
@@ -14,7 +14,7 @@
 <input type="hidden" name="wikipage" value="<?php print $wikipage?>" />
 <?php
   $remove_table=wiki_admin_remove_list($form->listall);
-  print_table($remove_table);
+  echo $OUTPUT->table($remove_table);
 ?>
 <div class="boxaligncenter">
 <?php

diff --git a/mod/wiki/setpageflags.html b/mod/wiki/setpageflags.html
index 340f3895a88a9e58d6604cc29b6ce743ff660587..d0626c17dd9b14e95000c0d281f966f25b841200 100644 (file)
--- a/mod/wiki/setpageflags.html
+++ b/mod/wiki/setpageflags.html
@@ -11,7 +11,7 @@
 <input type="hidden" name="wikipage" value="<?php print $wikipage?>" />
 <?php
   $pageflags_table=wiki_admin_setpageflags_list($pageflagstatus);
-  print_table($pageflags_table);
+  echo $OUTPUT->table($pageflags_table);
 ?>
 <br />
 <div class="boxaligncenter">

diff --git a/mod/wiki/strippages.html b/mod/wiki/strippages.html
index 9167f87866450298d51f8937941124b001971ff7..ba3e45088172f2517fd5d0282c024bce875d52c7 100644 (file)
--- a/mod/wiki/strippages.html
+++ b/mod/wiki/strippages.html
@@ -11,7 +11,7 @@
 <input type="hidden" name="wikipage" value="<?php print $wikipage?>" />
 <?php
   $strip_table=wiki_admin_strip_list($form->pagestostrip, $form->version, $err);
-  print_table($strip_table);
+  echo $OUTPUT->table($strip_table);
 ?>
 <div class="boxaligncenter">
 <?php
@@ -20,4 +20,4 @@
   }
 ?>
   <input type="submit" name="proceed" value="<?php print get_string("strippages","wiki"); ?>" />
-</div></fieldset></form>
\ No newline at end of file
+</div></fieldset></form>