# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/mod/forum/backuplib.php
--- moodle/mod/forum/backuplib.php Base (1.28)
+++ moodle/mod/forum/backuplib.php Locally Modified (Based On 1.28)
@@ -130,41 +130,6 @@
}
- function forum_check_backup_mods_instances($instance,$backup_unique_code) {
- $info[$instance->id.'0'][0] = ''.$instance->name.'';
- $info[$instance->id.'0'][1] = '';
- if (!empty($instance->userdata)) {
- $info[$instance->id.'1'][0] = get_string("subscriptions","forum");
- if ($ids = forum_subscription_ids_by_instance ($instance->id)) {
- $info[$instance->id.'1'][1] = count($ids);
- } else {
- $info[$instance->id.'1'][1] = 0;
- }
- //Discussions
- $info[$instance->id.'2'][0] = get_string("discussions","forum");
- if ($ids = forum_discussion_ids_by_instance ($instance->id)) {
- $info[$instance->id.'2'][1] = count($ids);
- } else {
- $info[$instance->id.'2'][1] = 0;
- }
- //Posts
- $info[$instance->id.'3'][0] = get_string("posts","forum");
- if ($ids = forum_post_ids_by_instance ($instance->id)) {
- $info[$instance->id.'3'][1] = count($ids);
- } else {
- $info[$instance->id.'3'][1] = 0;
- }
- //Ratings
- $info[$instance->id.'4'][0] = get_string("ratings","forum");
- if ($ids = forum_rating_ids_by_instance ($instance->id)) {
- $info[$instance->id.'4'][1] = count($ids);
- } else {
- $info[$instance->id.'4'][1] = 0;
- }
- }
- return $info;
- }
-
//Backup forum_subscriptions contents (executed from forum_backup_mods)
function backup_forum_subscriptions ($bf,$preferences,$forum) {
@@ -292,8 +257,6 @@
fwrite ($bf,full_tag("ATTACHMENT",8,false,$for_pos->attachment));
fwrite ($bf,full_tag("TOTALSCORE",8,false,$for_pos->totalscore));
fwrite ($bf,full_tag("MAILNOW",8,false,$for_pos->mailnow));
- //Now print ratings to xml
- $status = backup_forum_ratings($bf,$preferences,$for_pos->id);
//End discussion
$status =fwrite ($bf,end_tag("POST",7,true));
@@ -304,37 +267,6 @@
return $status;
}
-
- //Backup forum_ratings contents (executed from backup_forum_posts)
- function backup_forum_ratings ($bf,$preferences,$post) {
-
- global $CFG, $DB;
-
- $status = true;
-
- $forum_ratings = $DB->get_records("forum_ratings",array("post" => $post),"id");
- //If there are ratings
- if ($forum_ratings) {
- //Write start tag
- $status =fwrite ($bf,start_tag("RATINGS",8,true));
- //Iterate over each rating
- foreach ($forum_ratings as $for_rat) {
- //Start rating
- $status =fwrite ($bf,start_tag("RATING",9,true));
- //Print forum_rating contents
- fwrite ($bf,full_tag("ID",10,false,$for_rat->id));
- fwrite ($bf,full_tag("USERID",10,false,$for_rat->userid));
- fwrite ($bf,full_tag("TIME",10,false,$for_rat->time));
- fwrite ($bf,full_tag("POST_RATING",10,false,$for_rat->rating));
- //End rating
- $status =fwrite ($bf,end_tag("RATING",9,true));
- }
- //Write end tag
- $status =fwrite ($bf,end_tag("RATINGS",8,true));
- }
- return $status;
- }
-
//Backup forum files because we've selected to backup user info
//and files are user info's level
function backup_forum_files($bf,$preferences) {
@@ -390,58 +322,6 @@
}
- ////Return an array of info (name,value)
- function forum_check_backup_mods($course,$user_data=false,$backup_unique_code,$instances=null) {
-
- if (!empty($instances) && is_array($instances) && count($instances)) {
- $info = array();
- foreach ($instances as $id => $instance) {
- $info += forum_check_backup_mods_instances($instance,$backup_unique_code);
- }
- return $info;
- }
- //First the course data
- $info[0][0] = get_string("modulenameplural","forum");
- if ($ids = forum_ids ($course)) {
- $info[0][1] = count($ids);
- } else {
- $info[0][1] = 0;
- }
-
- //Now, if requested, the user_data
- if ($user_data) {
- //Subscriptions
- $info[1][0] = get_string("subscriptions","forum");
- if ($ids = forum_subscription_ids_by_course ($course)) {
- $info[1][1] = count($ids);
- } else {
- $info[1][1] = 0;
- }
- //Discussions
- $info[2][0] = get_string("discussions","forum");
- if ($ids = forum_discussion_ids_by_course ($course)) {
- $info[2][1] = count($ids);
- } else {
- $info[2][1] = 0;
- }
- //Posts
- $info[3][0] = get_string("posts","forum");
- if ($ids = forum_post_ids_by_course ($course)) {
- $info[3][1] = count($ids);
- } else {
- $info[3][1] = 0;
- }
- //Ratings
- $info[4][0] = get_string("ratings","forum");
- if ($ids = forum_rating_ids_by_course ($course)) {
- $info[4][1] = count($ids);
- } else {
- $info[4][1] = 0;
- }
- }
- return $info;
- }
-
//Return a content encoded to support interactivities linking. Every module
//should have its own. They are called automatically from the backup procedure.
function forum_encode_content_links ($content,$preferences) {
@@ -559,33 +439,4 @@
p.discussion = s.id", array($instanceid));
}
- //Returns an array of ratings posts id
- function forum_rating_ids_by_course ($course) {
- global $CFG, $DB;
-
- return $DB->get_records_sql ("SELECT r.id, r.post, p.discussion, s.forum
- FROM {forum_ratings} r,
- {forum_posts} p,
- {forum_discussions} s,
- {forum} a
- WHERE a.course = ? AND
- s.forum = a.id AND
- p.discussion = s.id AND
- r.post = p.id", array($course));
- }
-
- //Returns an array of ratings posts id
- function forum_rating_ids_by_instance ($instanceid) {
-
- global $CFG, $DB;
-
- return $DB->get_records_sql ("SELECT r.id, r.post, p.discussion, s.forum
- FROM {forum_ratings} r,
- {forum_posts} p,
- {forum_discussions} s
- WHERE s.forum = ? AND
- p.discussion = s.id AND
- r.post = p.id", array($instanceid));
- }
-
Index: moodle/mod/forum/restorelib.php
--- moodle/mod/forum/restorelib.php Base (1.75)
+++ moodle/mod/forum/restorelib.php Locally Modified (Based On 1.75)
@@ -614,67 +614,6 @@
return $status;
}
- //This function restores the forum_ratings
- /*function forum_ratings_restore_mods($new_post_id,$info,$restore) {
- global $CFG, $DB;
-
- $status = true;
-
- //Get the ratings array
- $ratings = array();
- if (isset($info['#']['RATINGS']['0']['#']['RATING'])) {
- $ratings = $info['#']['RATINGS']['0']['#']['RATING'];
- }
-
- //Iterate over ratings
- for($i = 0; $i < sizeof($ratings); $i++) {
- $rat_info = $ratings[$i];
- //traverse_xmlize($rat_info); //Debug
- //print_object ($GLOBALS['traverse_array']); //Debug
- //$GLOBALS['traverse_array']=""; //Debug
-
- //We'll need this later!!
- $oldid = backup_todb($rat_info['#']['ID']['0']['#']);
- $olduserid = backup_todb($rat_info['#']['USERID']['0']['#']);
-
- //Now, build the FORM_RATINGS record structure
- $rating->post = $new_post_id;
- $rating->userid = backup_todb($rat_info['#']['USERID']['0']['#']);
- $rating->time = backup_todb($rat_info['#']['TIME']['0']['#']);
- $rating->rating = backup_todb($rat_info['#']['POST_RATING']['0']['#']);
-
- //We have to recode the userid field
- $user = backup_getid($restore->backup_unique_code,"user",$rating->userid);
- if ($user) {
- $rating->userid = $user->new_id;
- }
-
- //The structure is equal to the db, so insert the forum_ratings
- $newid = $DB->insert_record ("forum_ratings",$rating);
-
- //Do some output
- if (($i+1) % 50 == 0) {
- if (!defined('RESTORE_SILENTLY')) {
- echo ".";
- if (($i+1) % 1000 == 0) {
- echo "
";
- }
- }
- backup_flush(300);
- }
-
- if ($newid) {
- //We have the newid, update backup_ids
- backup_putid($restore->backup_unique_code,"forum_ratings",$oldid,
- $newid);
- } else {
- $status = false;
- }
- }
-
- return $status;
- }*/
-
//This function converts texts in FORMAT_WIKI to FORMAT_MARKDOWN for
//some texts in the module
function forum_restore_wiki2markdown ($restore) {