From: martinlanghoff <martinlanghoff>
Date: Tue, 16 Jan 2007 03:28:57 +0000 (+0000)
Subject: mnet: restore support - XML parser knows about MNET_EXTERNALUSERS, restore_check... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=43f853c90820809f50c6c0830316530d8166980e;p=moodle.git

mnet: restore support - XML parser knows about MNET_EXTERNALUSERS, restore_check.html warns

This may need to be reworked to move the warning to an earlier stage. In the
meantime, we have

 - at INFO parsing time we read MNET_EXTERNALUSERS into the backup info obj
 - at restore_check time, we warn the user that external users are in the
   package. If the situation looks dodgy, we say so. But don't block the
   user, as it may be a valid situation.
---

diff --git a/backup/restore_check.html b/backup/restore_check.html
index 56c56bd7c0..e8d55b38b5 100644
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -265,6 +265,15 @@
             $hidden["file"]               =  $file;
             $hidden["id"]                 =  $id;
             print_string('longtimewarning','admin');
+
+            if ($restore->users && !empty($info->mnet_externalusers) 
+                && $info->mnet_externalusers === 'true') {
+                if ($info->original_wwwroot === $CFG->wwwroot) {
+                    print '<p>'.get_string('mnetrestore_extusers','admin').'</p>';
+                } else {
+                    print '<p>'. get_string('mnetrestore_extusers_mismatch','admin').'</p>';
+                }
+            }
             print_single_button("restore.php", $hidden, get_string("restorecoursenow"),"post");
             echo "</center>";
         } else {
diff --git a/backup/restorelib.php b/backup/restorelib.php
index 6bedea31d1..4740f00399 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -3459,6 +3459,9 @@
                         case "ORIGINAL_WWWROOT":
                             $this->info->original_wwwroot = $this->getContents();
                             break;
+                        case "MNET_EXTERNALUSERS":
+                            $this->info->mnet_externalusers = $this->getContents();
+                            break;
                     }
                 }
                 if ($this->tree[3] == "DETAILS") {
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 6301901316..898bc73242 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -356,6 +356,8 @@ $string['memcachedhosts'] = 'memcached hosts';
 $string['memcachedpconn'] = 'memcached use persistent connections';
 $string['messaging'] = 'Enable messaging system';
 $string['misc'] = 'Miscellaneous';
+$string['mnetrestore_extusers'] = '<strong>Note:</strong> This backup file contains remote Moodle Network user accounts which will be restored as part of the process.';
+$string['mnetrestore_extusers_mismatch'] = '<strong>Note:</strong> This backup file apparently originates from a different Moodle installation and contains remote Moodle Network user accounts that may fail to restore. This operation is unsupported. If you are certain that it was created on this Moodle installation, or you can ensure that all the needed Moodle Network Hosts are configured, you may want to still try the restore.';
 $string['modulesecurity'] = 'Module security';
 $string['multilangforceold'] = 'Force old multilang syntax: &lt;span&gt; without the class=\"multilang\" and &lt;lang&gt;';
 $string['multilangupgrade'] = 'Multilang upgrade';