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

diff --git a/login/confirm.php b/login/confirm.php
index 20e33442a8a5d8f2dcb011a71a428c2aaa9ceefb..029a6eb079c5e8e42c7560be752c6a6ce99320e7 100644 (file)
--- a/login/confirm.php
+++ b/login/confirm.php
@@ -35,7 +35,7 @@
             echo $OUTPUT->box_start('generalbox centerpara boxwidthnormal boxaligncenter');
             echo "<h3>".get_string("thanks").", ". fullname($user) . "</h3>\n";
             echo "<p>".get_string("alreadyconfirmed")."</p>\n";
-            print_single_button("$CFG->wwwroot/course/", null, get_string('courses'));
+            echo $OUTPUT->button(html_form::make_button("$CFG->wwwroot/course/", null, get_string('courses')));
             echo $OUTPUT->box_end();
             echo $OUTPUT->footer();
             exit;
@@ -60,7 +60,7 @@
             echo $OUTPUT->box_start('generalbox centerpara boxwidthnormal boxaligncenter');
             echo "<h3>".get_string("thanks").", ". fullname($USER) . "</h3>\n";
             echo "<p>".get_string("confirmed")."</p>\n";
-            print_single_button("$CFG->wwwroot/course/", null, get_string('courses'));
+            echo $OUTPUT->button(html_form::make_button("$CFG->wwwroot/course/", null, get_string('courses')));
             echo $OUTPUT->box_end();
             echo $OUTPUT->footer();
             exit;

diff --git a/login/index.php b/login/index.php
index 624d5cc34240987126b684457a095fd00cb6a48e..f2d8127781fb7efef318c9b33f05c6081aff7e37 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -182,12 +182,12 @@
                 $days2expire = $userauth->password_expire($USER->username);
                 if (intval($days2expire) > 0 && intval($days2expire) < intval($userauth->config->expiration_warning)) {
                     print_header("$site->fullname: $loginsite", "$site->fullname", $navigation, '', '', true, "<div class=\"langmenu\">$langmenu</div>");
-                    notice_yesno(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo);
+                    echo $OUTPUT->confirm(get_string('auth_passwordwillexpire', 'auth', $days2expire), $passwordchangeurl, $urltogo);
                     echo $OUTPUT->footer();
                     exit;
                 } elseif (intval($days2expire) < 0 ) {
                     print_header("$site->fullname: $loginsite", "$site->fullname", $navigation, '', '', true, "<div class=\"langmenu\">$langmenu</div>");
-                    notice_yesno(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
+                    echo $OUTPUT->confirm(get_string('auth_passwordisexpired', 'auth'), $passwordchangeurl, $urltogo);
                     echo $OUTPUT->footer();
                     exit;
                 }

diff --git a/login/logout.php b/login/logout.php
index a276d143df420cc66403cbe728a917cd89a05ef8..fb5f3a633e875495c24552f93ac265a7f7006615 100644 (file)
--- a/login/logout.php
+++ b/login/logout.php
@@ -15,7 +15,7 @@
 
     } else if (!confirm_sesskey($sesskey)) {
         print_header($SITE->fullname, $SITE->fullname, 'home');
-        notice_yesno(get_string('logoutconfirm'), 'logout.php', $CFG->wwwroot.'/', array('sesskey'=>sesskey()), null, 'post', 'get');
+        echo $OUTPUT->confirm(get_string('logoutconfirm'), 'logout.php', $CFG->wwwroot.'/');
         echo $OUTPUT->footer();
         die;
     }