Skip to content
Browse files

MDL-15933 Require jump destination MNET peer to be non-deleted.

Also require landing source MNET peer to be non-deleted.
  • Loading branch information...
1 parent a9aaede commit a17912002bb63654a7df018d84714d6836711835 peterbulmer committed Aug 13, 2008
Showing with 4 additions and 1 deletion.
  1. +4 −1 auth/mnet/auth.php
View
5 auth/mnet/auth.php
@@ -244,7 +244,7 @@ function confirm_mnet_session($token, $remotewwwroot) {
require_once $CFG->dirroot . '/mnet/xmlrpc/client.php';
// verify the remote host is configured locally before attempting RPC call
- if (! $remotehost = get_record('mnet_host', 'wwwroot', $remotewwwroot)) {
+ if (! $remotehost = get_record('mnet_host', 'wwwroot', $remotewwwroot, 'deleted', 0)) {
error(get_string('notpermittedtoland', 'mnet'));
}
@@ -1311,9 +1311,12 @@ function has_service($mnethostid, $servicename) {
svc.apiversion,
h2s.id as h2s_id
FROM
+ {$CFG->prefix}mnet_host h,
{$CFG->prefix}mnet_service svc,
{$CFG->prefix}mnet_host2service h2s
WHERE
+ h.deleted = '0' AND
+ h.id = h2s.hostid AND
h2s.hostid = '$mnethostid' AND
h2s.serviceid = svc.id AND
svc.name = '$servicename' AND

0 comments on commit a179120

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