From aae37b638cc37ccd661c243b53740688e2653d78 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 29 Sep 2006 06:41:10 +0000
Subject: [PATCH] Added progress bar to role assignments during upgrade

---
 lib/accesslib.php | 12 ++++++------
 lib/adminlib.php  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 4d6f167bd5..f1a7b3b57f 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -960,7 +960,7 @@ function moodle_install_roles() {
         }
     }
 
-    print_progress(0, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+    print_progress(0, $totalcount, 5, 1, 'Processing role assignments');
 
 /// Upgrade the admins.
 /// Sort using id ASC, first one is primary admin.
@@ -971,7 +971,7 @@ function moodle_install_roles() {
                 $admin = $rs->FetchObj();
                 role_assign($adminrole, $admin->userid, 0, $systemcontext->id);
                 $progresscount++;
-                print_progress($progresscount, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+                print_progress($progresscount, $totalcount, 5, 1, 'Processing role assignments');
                 $rs->MoveNext();
             }
         }
@@ -987,7 +987,7 @@ function moodle_install_roles() {
                 $coursecreator = $rs->FetchObj();
                 role_assign($coursecreatorrole, $coursecreator->userid, 0, $systemcontext->id);
                 $progresscount++;
-                print_progress($progresscount, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+                print_progress($progresscount, $totalcount, 5, 1, 'Processing role assignments');
                 $rs->MoveNext();
             }
         }
@@ -1015,7 +1015,7 @@ function moodle_install_roles() {
                     role_assign($noneditteacherrole, $teacher->userid, 0, $coursecontext->id);
                 }
                 $progresscount++;
-                print_progress($progresscount, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+                print_progress($progresscount, $totalcount, 5, 1, 'Processing role assignments');
 
                 $rs->MoveNext();
             }
@@ -1040,7 +1040,7 @@ function moodle_install_roles() {
                 $coursecontext = get_context_instance(CONTEXT_COURSE, $student->course);
                 role_assign($studentrole, $student->userid, 0, $coursecontext->id);
                 $progresscount++;
-                print_progress($progresscount, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+                print_progress($progresscount, $totalcount, 5, 1, 'Processing role assignments');
 
                 $rs->MoveNext();
             }
@@ -1052,7 +1052,7 @@ function moodle_install_roles() {
     if ($guestuser = get_record('user', 'username', 'guest')) {
         role_assign($guestrole, $guestuser->id, 0, $systemcontext->id);
     }
-    print_progress($totalcount, $totalcount, 5, 1, 'Processing '.$totalcount.'role assignments');
+    print_progress($totalcount, $totalcount, 5, 1, 'Processing role assignments');
 
 
 /// Insert the correct records for legacy roles
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 469976fd73..3aecb7be4d 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -459,8 +459,8 @@ function print_progress($done, $total, $updatetime=5, $sleeptime=1, $donetext=''
         }
 
         echo '<script>';
-        echo 'document.getElementById("text").innerHTML = "'.addslashes($donetext).' '.$done.' done.'.$projectedtext.'";'."\n";
-        echo 'document.getElementById("slider").style.width = \''.$width.'px\';'."\n";
+        echo 'document.getElementById("text'.$total.'").innerHTML = "'.addslashes($donetext).' ('.$done.'/'.$total.') '.$projectedtext.'";'."\n";
+        echo 'document.getElementById("slider'.$total.'").style.width = \''.$width.'px\';'."\n";
         echo '</script>';
 
         $lasttime = $now;
-- 
2.39.5