From 04592aec062cfeea95b16c4abf35b6a6ad4dea73 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Fri, 22 Apr 2005 23:49:48 +0000
Subject: [PATCH] Now event->repeatid is included in backup/restore. Thanks for
 your support Jon! Bump to 1.5 beta

---
 backup/CHANGES_14_15.txt |  2 +-
 backup/backuplib.php     |  1 +
 backup/restorelib.php    | 15 +++++++++++++++
 backup/version.php       |  4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/backup/CHANGES_14_15.txt b/backup/CHANGES_14_15.txt
index e3f8a0801fa..1c657d74894 100644
--- a/backup/CHANGES_14_15.txt
+++ b/backup/CHANGES_14_15.txt
@@ -61,7 +61,7 @@ Now I show the specific detailed status of every item in the process:
 37. DONE: Convert module ids in every Wiki reference to other activities.
 38. DONE: Convert every wiki formatted text to markdown. Bye, wikies! ;-)
 39. DONE: Add backup/restore of new grade tables.
-40. TODO: event->repeatid?
+40. DONE: event->repeatid.
          
 Eloy (stronk7)
 23-01-2004
diff --git a/backup/backuplib.php b/backup/backuplib.php
index de54ea734f5..28a32a6d8ba 100644
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -1580,6 +1580,7 @@
                 fwrite ($bf,full_tag("FORMAT",4,false,$event->format));
                 fwrite ($bf,full_tag("GROUPID",4,false,$event->groupid));
                 fwrite ($bf,full_tag("USERID",4,false,$event->userid));
+                fwrite ($bf,full_tag("REPEATID",4,false,$event->repeatid));
                 fwrite ($bf,full_tag("EVENTTYPE",4,false,$event->eventtype));
                 fwrite ($bf,full_tag("TIMESTART",4,false,$event->timestart));
                 fwrite ($bf,full_tag("TIMEDURATION",4,false,$event->timeduration));
diff --git a/backup/restorelib.php b/backup/restorelib.php
index e84ec4df778..3d5455e4d6f 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2027,6 +2027,7 @@
                         $eve->courseid = $restore->course_id;
                         $eve->groupid = backup_todb($info['EVENT']['#']['GROUPID']['0']['#']);
                         $eve->userid = backup_todb($info['EVENT']['#']['USERID']['0']['#']);
+                        $eve->repeatid = backup_todb($info['EVENT']['#']['REPEATID']['0']['#']);
                         $eve->modulename = "";
                         $eve->instance = 0;
                         $eve->eventtype = backup_todb($info['EVENT']['#']['EVENTTYPE']['0']['#']);
@@ -2053,6 +2054,20 @@
                                 //Assign it to admin
                                 $eve->userid = $adminid;
                             }
+
+                            //We must recode the repeatid if the event has it
+                            if (!empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
+                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                            }
+ 
                             //We have to recode the groupid field
                             $group = backup_getid($restore->backup_unique_code,"group",$eve->groupid);
                             if ($group) {
diff --git a/backup/version.php b/backup/version.php
index 16e9ce5dac0..55241f104f5 100644
--- a/backup/version.php
+++ b/backup/version.php
@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2005042200;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2005042300;   // The current version is a date (YYYYMMDDXX)
 
-$backup_release = "1.5 pre-beta";  // User-friendly version number
+$backup_release = "1.5 beta";  // User-friendly version number