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

diff --git a/backup/backup_check.html b/backup/backup_check.html
index 51d46763fc27db877a2e6677d686344de93c72a6..d5b034554c4e7a36870ae3bbe537f6050ea33a67 100644 (file)
--- a/backup/backup_check.html
+++ b/backup/backup_check.html
@@ -129,6 +129,7 @@
     }
 
     //This is the alignment of every row in the table
+    $table = new html_table();
     $table->align = array ("left","right");
 
     if ($allmods = $DB->get_records("modules") ) {
@@ -179,7 +180,7 @@
                         }
                     }
                     $table->data = $modcheckbackup($id,$backupprefs->$var,$backupprefs->backup_unique_code,$instancestopass);
-                    print_table($table);
+                    echo $OUTPUT->table($table);
                     echo "</td></tr>";
                 }
             }
@@ -199,7 +200,7 @@
             echo $user_options[$backupprefs->backup_users].'</b>';
             //Print info
             $table->data = user_check_backup($id,$backupprefs->backup_unique_code,$backupprefs->backup_users,$backupprefs->backup_messages, $backupprefs->backup_blogs);
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
 
         }
@@ -211,7 +212,7 @@
             echo get_string("includelogentries").'</b>';
             //Print info
             $table->data = log_check_backup($id);
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
         }
 
@@ -222,7 +223,7 @@
             echo get_string("includeuserfiles").'</b>';
             //Print info
             $table->data = user_files_check_backup($id,$backupprefs->backup_unique_code);
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
         }
 
@@ -233,7 +234,7 @@
             echo get_string("includecoursefiles").'</b>';
             //Print info
             $table->data = course_files_check_backup($id,$backupprefs->backup_unique_code);
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
         }
 
@@ -244,7 +245,7 @@
             echo get_string("includesitefiles").'</b>';
             //Print info
             $table->data = site_files_check_backup($id,$backupprefs->backup_unique_code);
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
         }
 
@@ -255,7 +256,7 @@
             echo get_string("includeroleassignments").'</b>';
             //Print info
             $table->data = array(array(get_string('roles'), count($backupprefs->backuproleassignments)));
-            print_table($table);
+            echo $OUTPUT->table($table);
             echo "</td></tr>";
         }
     }

diff --git a/backup/restore_check.html b/backup/restore_check.html
index deb4aaf38082183679d2ccb8f1f283713becf33d..de9fa8487e1176bad3d9a0019e1fd668e38454bd 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -7,7 +7,7 @@
     //Finally, it calls restore_execute to do the hard work
     //Get objects from session
 
-    global $DB;
+    global $DB, $OUTPUT;
 
     if ($SESSION) {
         $info = $SESSION->info;
@@ -333,7 +333,7 @@
 
 
         /// Restore button
-            print_single_button("restore.php", $hidden, get_string("restorecoursenow"),"post");
+            echo $OUTPUT->button(html_form::make_button("restore.php", $hidden, get_string("restorecoursenow")));
         }
         echo "</div>";
 

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 82382814b09974c2c1882dd792e81ea944136e0c..a39045d73f682ad7adafabd52fb6cc2c5763fa39 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -500,7 +500,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
 
         $status = true;
         if ($info) {
-            $table = new object();
+            $table = new html_table();
             //This is tha align to every ingo table
             $table->align = array ("right","left");
             //This is the nowrap clause
@@ -533,7 +533,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             echo $OUTPUT->heading(get_string("backup").":");
             $table->data = $tab;
             //Print backup general info
-            print_table($table);
+            echo $OUTPUT->table($table);
 
             if ($info->backup_backup_version <= 2005070500) {
                  echo $OUTPUT->notification(get_string('backupnonisowarning'));  // Message informing that this backup may not work!
@@ -643,7 +643,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             //Print title
             echo $OUTPUT->heading(get_string("backupdetails").":");
             //Print backup general info
-            print_table($table);
+            echo $OUTPUT->table($table);
         } else {
             $status = false;
         }
@@ -656,7 +656,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         global $OUTPUT;
         $status = true;
         if ($course_header) {
-            $table = new object();
+            $table = new html_table();
             //This is tha align to every ingo table
             $table->align = array ("right","left");
             //The width
@@ -672,7 +672,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             //Print title
             echo $OUTPUT->heading(get_string("course").":");
             //Print backup course header info
-            print_table($table);
+            echo $OUTPUT->table($table);
         } else {
             $status = false;
         }
@@ -7972,7 +7972,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                 $hidden["launch"]             = "form";
                 $hidden["file"]               =  $file;
                 $hidden["id"]                 =  $id;
-                print_single_button("restore.php", $hidden, get_string("continue"),"post");
+                echo $OUTPUT->button(html_form::make_button("restore.php", $hidden, get_string("continue")));
                 echo "</div>";
             }
             else {