Skip to content
Browse files

mnet: restore support - XML parser knows about MNET_EXTERNALUSERS, re…

…store_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.
  • Loading branch information...
1 parent 5d9bc14 commit 43f853c90820809f50c6c0830316530d8166980e martinlanghoff committed Jan 16, 2007
Showing with 14 additions and 0 deletions.
  1. +9 −0 backup/restore_check.html
  2. +3 −0 backup/restorelib.php
  3. +2 −0 lang/en_utf8/admin.php
View
9 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 {
View
3 backup/restorelib.php
@@ -3459,6 +3459,9 @@ function endElementInfo($parser, $tagName) {
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") {
View
2 lang/en_utf8/admin.php
@@ -356,6 +356,8 @@
$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';

0 comments on commit 43f853c

Please sign in to comment.
Something went wrong with that request. Please try again.