Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle

Conflicts: mod/scorm/lib.php
moodle · Jun 3, 2014 · ed3f859 · ed3f859
2 parents 0eb4061 + 6a97697
commit ed3f859
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 178 deletions.
diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -1121,37 +1121,6 @@ function data_update_grades($data, $userid=0, $nullifnone=true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- *
- * @global object
- */
-function data_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {data} d, {course_modules} cm, {modules} m
-             WHERE m.name='data' AND m.id=cm.module AND cm.instance=d.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT d.*, cm.idnumber AS cmidnumber, d.course AS courseid
-              FROM {data} d, {course_modules} cm, {modules} m
-             WHERE m.name='data' AND m.id=cm.module AND cm.instance=d.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        // too much debug output
-        $pbar = new progress_bar('dataupgradegrades', 500, true);
-        $i=0;
-        foreach ($rs as $data) {
-            $i++;
-            upgrade_set_timeout(60*5); // set up timeout, may also abort execution
-            data_update_grades($data, 0, false);
-            $pbar->update($i, $count, "Updating Database grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Update/create grade item for given data
  *

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -1669,35 +1669,6 @@ function forum_update_grades($forum, $userid=0, $nullifnone=true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- * @global object
- */
-function forum_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {forum} f, {course_modules} cm, {modules} m
-             WHERE m.name='forum' AND m.id=cm.module AND cm.instance=f.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT f.*, cm.idnumber AS cmidnumber, f.course AS courseid
-              FROM {forum} f, {course_modules} cm, {modules} m
-             WHERE m.name='forum' AND m.id=cm.module AND cm.instance=f.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $pbar = new progress_bar('forumupgradegrades', 500, true);
-        $i=0;
-        foreach ($rs as $forum) {
-            $i++;
-            upgrade_set_timeout(60*5); // set up timeout, may also abort execution
-            forum_update_grades($forum, 0, false);
-            $pbar->update($i, $count, "Updating Forum grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Create/update grade item for given forum
  *

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -788,36 +788,6 @@ function glossary_update_grades($glossary=null, $userid=0, $nullifnone=true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- *
- * @global object
- */
-function glossary_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {glossary} g, {course_modules} cm, {modules} m
-             WHERE m.name='glossary' AND m.id=cm.module AND cm.instance=g.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT g.*, cm.idnumber AS cmidnumber, g.course AS courseid
-              FROM {glossary} g, {course_modules} cm, {modules} m
-             WHERE m.name='glossary' AND m.id=cm.module AND cm.instance=g.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $pbar = new progress_bar('glossaryupgradegrades', 500, true);
-        $i=0;
-        foreach ($rs as $glossary) {
-            $i++;
-            upgrade_set_timeout(60*5); // set up timeout, may also abort execution
-            glossary_update_grades($glossary, 0, false);
-            $pbar->update($i, $count, "Updating Glossary grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Create/update grade item for given glossary
  *

diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
@@ -408,36 +408,6 @@ function lesson_update_grades($lesson, $userid=0, $nullifnone=true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- *
- * @global object
- */
-function lesson_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {lesson} l, {course_modules} cm, {modules} m
-             WHERE m.name='lesson' AND m.id=cm.module AND cm.instance=l.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT l.*, cm.idnumber AS cmidnumber, l.course AS courseid
-              FROM {lesson} l, {course_modules} cm, {modules} m
-             WHERE m.name='lesson' AND m.id=cm.module AND cm.instance=l.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $pbar = new progress_bar('lessonupgradegrades', 500, true);
-        $i=0;
-        foreach ($rs as $lesson) {
-            $i++;
-            upgrade_set_timeout(60*5); // set up timeout, may also abort execution
-            lesson_update_grades($lesson, 0, false);
-            $pbar->update($i, $count, "Updating Lesson grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Create grade item for given lesson
  *

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
@@ -667,34 +667,6 @@ function quiz_update_grades($quiz, $userid = 0, $nullifnone = true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- */
-function quiz_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {quiz} a, {course_modules} cm, {modules} m
-             WHERE m.name='quiz' AND m.id=cm.module AND cm.instance=a.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT a.*, cm.idnumber AS cmidnumber, a.course AS courseid
-              FROM {quiz} a, {course_modules} cm, {modules} m
-             WHERE m.name='quiz' AND m.id=cm.module AND cm.instance=a.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $pbar = new progress_bar('quizupgradegrades', 500, true);
-        $i=0;
-        foreach ($rs as $quiz) {
-            $i++;
-            upgrade_set_timeout(60*5); // Set up timeout, may also abort execution.
-            quiz_update_grades($quiz, 0, false);
-            $pbar->update($i, $count, "Updating Quiz grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Create or update the grade item for given quiz
  *

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
@@ -624,36 +624,6 @@ function scorm_update_grades($scorm, $userid=0, $nullifnone=true) {
     }
 }
 
-/**
- * Update all grades in gradebook.
- *
- * @global object
- */
-function scorm_upgrade_grades() {
-    global $DB;
-
-    $sql = "SELECT COUNT('x')
-              FROM {scorm} s, {course_modules} cm, {modules} m
-             WHERE m.name='scorm' AND m.id=cm.module AND cm.instance=s.id";
-    $count = $DB->count_records_sql($sql);
-
-    $sql = "SELECT s.*, cm.idnumber AS cmidnumber, s.course AS courseid
-              FROM {scorm} s, {course_modules} cm, {modules} m
-             WHERE m.name='scorm' AND m.id=cm.module AND cm.instance=s.id";
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $pbar = new progress_bar('scormupgradegrades', 500, true);
-        $i = 0;
-        foreach ($rs as $scorm) {
-            $i++;
-            upgrade_set_timeout(60 * 5); // Set up timeout, may also abort execution.
-            scorm_update_grades($scorm, 0, false);
-            $pbar->update($i, $count, "Updating Scorm grades ($i/$count).");
-        }
-    }
-    $rs->close();
-}
-
 /**
  * Update/create grade item for given scorm
  *