first commit

admin/mnet/access_control.php

@@ -0,0 +1,243 @@
+<?php
+
+// Allows the admin to control user logins from remote moodles.
+
+require_once(__DIR__ . '/../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+include_once($CFG->dirroot.'/mnet/lib.php');
+
+$sort         = optional_param('sort', 'username', PARAM_ALPHAEXT);
+$dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
+$page         = optional_param('page', 0, PARAM_INT);
+$perpage      = optional_param('perpage', 30, PARAM_INT);
+$action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
+
+admin_externalpage_setup('ssoaccesscontrol');
+
+if (!extension_loaded('openssl')) {
+    throw new \moodle_exception('requiresopenssl', 'mnet');
+}
+
+$sitecontext = context_system::instance();
+$sesskey = sesskey();
+$formerror = array();
+
+// grab the mnet hosts and remove the localhost
+$mnethosts = $DB->get_records_menu('mnet_host', array(), 'name', 'id, name');
+if (array_key_exists($CFG->mnet_localhost_id, $mnethosts)) {
+    unset($mnethosts[$CFG->mnet_localhost_id]);
+}
+
+
+
+// process actions
+if (!empty($action) and confirm_sesskey()) {
+
+    // boot if insufficient permission
+    if (!has_capability('moodle/user:delete', $sitecontext)) {
+        throw new \moodle_exception('nomodifyacl', 'mnet');
+    }
+
+    // fetch the record in question
+    $id = required_param('id', PARAM_INT);
+    if (!$idrec = $DB->get_record('mnet_sso_access_control', array('id'=>$id))) {
+        throw new \moodle_exception('recordnoexists', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+    }
+
+    switch ($action) {
+
+        case "delete":
+            $DB->delete_records('mnet_sso_access_control', array('id'=>$id));
+            redirect('access_control.php', get_string('deleteuserrecord', 'mnet', array('user'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
+            break;
+
+        case "acl":
+
+            // require the access parameter, and it must be 'allow' or 'deny'
+            $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
+            if ($accessctrl != 'allow' and $accessctrl != 'deny') {
+                throw new \moodle_exception('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+            }
+
+            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
+                if ($accessctrl == 'allow') {
+                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('user' => $idrec->username,
+                        'host' => $mnethosts[$idrec->mnet_host_id])));
+                } else if ($accessctrl == 'deny') {
+                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user' => $idrec->username,
+                        'host' => $mnethosts[$idrec->mnet_host_id])));
+                }
+            }
+            break;
+
+        default:
+            throw new \moodle_exception('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+    }
+}
+
+
+
+// process the form results
+if ($form = data_submitted() and confirm_sesskey()) {
+
+    // check permissions and verify form input
+    if (!has_capability('moodle/user:delete', $sitecontext)) {
+        throw new \moodle_exception('nomodifyacl', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+    }
+    if (empty($form->username)) {
+        $formerror['username'] = get_string('enterausername','mnet');
+    }
+    if (empty($form->mnet_host_id)) {
+        $formerror['mnet_host_id'] = get_string('selectahost','mnet');
+    }
+    if (empty($form->accessctrl)) {
+        $formerror['accessctrl'] = get_string('selectaccesslevel','mnet'); ;
+    }
+
+    // process if there are no errors
+    if (count($formerror) == 0) {
+
+        // username can be a comma separated list
+        $usernames = explode(',', $form->username);
+
+        foreach ($usernames as $username) {
+            $username = trim(core_text::strtolower($username));
+            if (!empty($username)) {
+                if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) {
+                    if ($form->accessctrl == 'allow') {
+                        redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('user'=>$username, 'host'=>$mnethosts[$form->mnet_host_id])));
+                    } elseif ($form->accessctrl == 'deny') {
+                        redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user'=>$username, 'host'=>$mnethosts[$form->mnet_host_id])));
+                    }
+                }
+            }
+        }
+    }
+    exit;
+}
+
+echo $OUTPUT->header();
+
+// Explain
+echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
+// Are the needed bits enabled?
+$warn = '';
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
+    $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
+}
+
+if (!is_enabled_auth('mnet')) {
+    $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
+}
+
+if (!empty($warn)) {
+    $warn = '<p>' .  get_string('ssoaclneeds','mnet').'</p>' . $warn;
+    echo $OUTPUT->box($warn);
+}
+// output the ACL table
+$columns = array("username", "mnet_host_id", "access", "delete");
+$headings = array();
+$string = array('username'     => get_string('username'),
+                'mnet_host_id' => get_string('remotehost', 'mnet'),
+                'access'       => get_string('accesslevel', 'mnet'),
+                'delete'       => get_string('delete'));
+foreach ($columns as $column) {
+    if ($sort != $column) {
+        $columnicon = "";
+        $columndir = "ASC";
+    } else {
+        $columndir = $dir == "ASC" ? "DESC" : "ASC";
+        $columnicon = $dir == "ASC" ? "down" : "up";
+        $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort'));
+    }
+    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
+}
+$headings['delete'] = '';
+
+$sortorder = get_safe_orderby([
+    'username' => 'username',
+    'mnet_host_id' => 'mnet_host_id',
+    'access' => 'accessctrl',
+    'default' => 'username',
+], $sort, $dir, false);
+
+$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
+$aclcount = $DB->count_records('mnet_sso_access_control');
+
+if (!$acl) {
+    echo $OUTPUT->heading(get_string('noaclentries','mnet'));
+    $table = NULL;
+} else {
+    $table = new html_table();
+    $table->head = $headings;
+    $table->align = array('left', 'left', 'center');
+    $table->width = "95%";
+    foreach ($acl as $aclrecord) {
+        if ($aclrecord->accessctrl == 'allow') {
+            $accesscolumn = get_string('allow', 'mnet')
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=deny&amp;sesskey=".sesskey()."\">"
+                . get_string('deny', 'mnet') . "</a>)";
+        } else {
+            $accesscolumn = get_string('deny', 'mnet')
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=allow&amp;sesskey=".sesskey()."\">"
+                . get_string('allow', 'mnet') . "</a>)";
+        }
+        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey=".sesskey()."\">"
+                . get_string('delete') . "</a>";
+        $table->data[] = array (s($aclrecord->username), $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
+    }
+}
+
+if (!empty($table)) {
+    echo html_writer::table($table);
+    echo '<p>&nbsp;</p>';
+    $baseurl = new moodle_url('/admin/mnet/access_control.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
+    echo $OUTPUT->paging_bar($aclcount, $page, $perpage, $baseurl);
+}
+
+
+
+// output the add form
+echo $OUTPUT->box_start();
+
+?>
+ <div class="mnetaddtoaclform">
+  <form id="mnetaddtoacl" method="post">
+    <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>" />
+<?php
+
+// enter a username
+echo get_string('username') . ":\n";
+if (!empty($formerror['username'])) {
+    echo '<span class="error"> * </span>';
+}
+echo html_writer::label(get_string('username'), 'menuusername', false, array('class' => 'accesshide'));
+echo '<input id="menuusername" type="text" name="username" size="20" maxlength="100" />';
+
+// choose a remote host
+echo " " . html_writer::label(get_string('remotehost', 'mnet'), 'menumnet_host_id') . ":\n";
+if (!empty($formerror['mnet_host_id'])) {
+    echo '<span class="error"> * </span>';
+}
+echo html_writer::select($mnethosts, 'mnet_host_id');
+
+// choose an access level
+echo " " . html_writer::label(get_string('accesslevel', 'mnet'), 'menuaccessctrl') . ":\n";
+if (!empty($formerror['accessctrl'])) {
+    echo '<span class="error"> * </span>';
+}
+$accessmenu['allow'] = get_string('allow', 'mnet');
+$accessmenu['deny'] = get_string('deny', 'mnet');
+echo html_writer::select($accessmenu, 'accessctrl');
+
+// submit button
+echo '<input type="submit" value="' . get_string('addtoacl', 'mnet') . '" />';
+echo "</form></div>\n";
+
+// print errors
+foreach ($formerror as $error) {
+    echo "<br><span class=\"error\">$error<span>";
+}
+
+echo $OUTPUT->box_end();
+echo $OUTPUT->footer();

admin/mnet/delete.php

@@ -0,0 +1,60 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+
+/**
+ * Page to allow the administrator to delete networked hosts, with a confirm message
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2007 Donal McMullan
+ * @copyright  2007 Martin Langhoff
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+
+$step   = optional_param('step', 'verify', PARAM_ALPHA);
+$hostid = required_param('hostid', PARAM_INT);
+
+
+$mnet = get_mnet_environment();
+
+$PAGE->set_url('/admin/mnet/delete.php');
+admin_externalpage_setup('mnetpeer' . $hostid);
+
+require_sesskey();
+
+$mnet_peer = new mnet_peer();
+$mnet_peer->set_id($hostid);
+
+if ('verify' == $step) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('deleteaserver', 'mnet'));
+    if ($live_users = $mnet_peer->count_live_sessions() > 0) {
+        echo $OUTPUT->notification(get_string('usersareonline', 'mnet', $live_users));
+    }
+    $yesurl = new moodle_url('/admin/mnet/delete.php', array('hostid' => $mnet_peer->id, 'step' => 'delete'));
+    $nourl = new moodle_url('/admin/mnet/peers.php');
+    echo $OUTPUT->confirm(get_string('reallydeleteserver', 'mnet')  . ': ' .  $mnet_peer->name, $yesurl, $nourl);
+    echo $OUTPUT->footer();
+} elseif ('delete' == $step) {
+    $mnet_peer->delete();
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('hostdeleted', 'mnet'), 5);
+}

admin/mnet/index.php

@@ -0,0 +1,146 @@
+<?php
+
+    // Allows the admin to configure mnet stuff
+
+    require(__DIR__.'/../../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+
+    admin_externalpage_setup('net');
+
+    $context = context_system::instance();
+
+
+    $site = get_site();
+    $mnet = get_mnet_environment();
+
+    if (!extension_loaded('openssl')) {
+        echo $OUTPUT->header();
+        set_config('mnet_dispatcher_mode', 'off');
+        throw new \moodle_exception('requiresopenssl', 'mnet');
+    }
+
+    if (!function_exists('curl_init') ) {
+        echo $OUTPUT->header();
+        set_config('mnet_dispatcher_mode', 'off');
+        throw new \moodle_exception('nocurl', 'mnet');
+    }
+
+    if (!isset($CFG->mnet_dispatcher_mode)) {
+        set_config('mnet_dispatcher_mode', 'off');
+    }
+
+/// If data submitted, process and store
+    if (($form = data_submitted()) && confirm_sesskey()) {
+        if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
+            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
+                if (set_config('mnet_dispatcher_mode', $form->mode)) {
+                    redirect('index.php', get_string('changessaved'));
+                } else {
+                    throw new \moodle_exception('invalidaction', '', 'index.php');
+                }
+            }
+        } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
+            $mnet->get_private_key();
+            $SESSION->mnet_confirm_delete_key = md5(sha1($mnet->keypair['keypair_PEM'])).':'.time();
+
+            $formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
+            $formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
+
+            echo $OUTPUT->header();
+            echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
+            echo $OUTPUT->footer();
+            exit;
+        } else {
+            // We're deleting
+
+            // If no/cancel then redirect back to the network setting page.
+            if (!isset($form->confirm)) {
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('keydeletedcancelled', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_SUCCESS
+                );
+            }
+
+            if (!isset($SESSION->mnet_confirm_delete_key)) {
+                // fail - you're being attacked?
+            }
+
+            $key = '';
+            $time = '';
+            @list($key, $time) = explode(':',$SESSION->mnet_confirm_delete_key);
+            $mnet->get_private_key();
+
+            if($time < time() - 60) {
+                // fail - you're out of time.
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('deleteoutoftime', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_WARNING
+                );
+            }
+
+            if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
+                // fail - you're being attacked?
+                throw new \moodle_exception ('deletewrongkeyvalue', 'mnet', 'index.php');
+                exit;
+            }
+
+            $mnet->replace_keys();
+            redirect('index.php', get_string('keydeleted','mnet'));
+        }
+    }
+    $hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
+
+    echo $OUTPUT->header();
+?>
+<form method="post" action="index.php">
+    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+        <tr>
+            <td  class="generalboxcontent">
+            <table cellpadding="9" cellspacing="0" >
+                <tr valign="top">
+                    <td colspan="2" class="header"><?php print_string('aboutyourhost', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('publickey', 'mnet'); ?>:</td>
+                    <td><pre><?php echo $mnet->public_key; ?></pre></td>
+                </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('expires', 'mnet'); ?>:</td>
+                    <td><?php echo userdate($mnet->public_key_expires); ?></td>
+                </tr>
+            </table>
+            </td>
+        </tr>
+    </table>
+</form>
+<form method="post" action="index.php">
+    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+        <tr>
+            <td  class="generalboxcontent">
+            <table cellpadding="9" cellspacing="0" >
+                <tr valign="top">
+                    <td colspan="2" class="header"><?php print_string('expireyourkey', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td colspan="2"><?php print_string('expireyourkeyexplain', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
+                    <td align="left"><input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
+                        <input type="hidden" name="deleteKey" value="" />
+                        <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
+                    </td>
+                </tr>
+            </table>
+            </td>
+        </tr>
+    </table>
+</form>
+
+<?php
+echo $OUTPUT->footer();

admin/mnet/peer_forms.php

@@ -0,0 +1,190 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains two forms for adding/editing mnet hosts, used by peers.php
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
+/**
+ * The very basic first step add new host form - just wwwroot & application
+ * The second form is loaded up with the information from this one.
+ */
+class mnet_simple_host_form extends moodleform {
+    function definition() {
+        global $DB;
+
+        $mform = $this->_form;
+
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
+        $mform->setType('wwwroot', PARAM_URL);
+        $mform->addRule('wwwroot', null, 'required', null, 'client');
+        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
+
+        $mform->addElement('select', 'applicationid', get_string('applicationtype', 'mnet'),
+                           $DB->get_records_menu('mnet_application', array(), 'id,display_name'));
+        $mform->addRule('applicationid', null, 'required', null, 'client');
+
+        $this->add_action_buttons(false, get_string('addhost', 'mnet'));
+    }
+
+    function validation($data, $files) {
+        global $DB;
+
+        $wwwroot = $data['wwwroot'];
+        // ensure the wwwroot starts with a http or https prefix
+        if (strtolower(substr($wwwroot, 0, 4)) != 'http') {
+            $wwwroot = 'http://'.$wwwroot;
+        }
+        if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
+            $str = get_string('hostexists', 'mnet', (new moodle_url('/admin/mnet/peers.php', ['hostid' => $host->id]))->out());
+            return array('wwwroot' => $str);
+        }
+        return array();
+    }
+}
+
+/**
+ * The second step of the form - reviewing the host details
+ * This is also the same form that is used for editing an existing host
+ */
+class mnet_review_host_form extends moodleform {
+    function definition() {
+        global $OUTPUT;
+
+        $mform = $this->_form;
+        $mnet_peer = $this->_customdata['peer'];
+
+        $mform->addElement('hidden', 'last_connect_time');
+        $mform->setType('last_connect_time', PARAM_INT);
+        $mform->addElement('hidden', 'id');
+        $mform->setType('id', PARAM_INT);
+        $mform->addElement('hidden', 'applicationid');
+        $mform->setType('applicationid', PARAM_INT);
+        $mform->addElement('hidden', 'oldpublickey');
+        $mform->setType('oldpublickey', PARAM_PEM);
+
+        $mform->addElement('text', 'name', get_string('site'), array('maxlength' => 80, 'size' => 50));
+        $mform->setType('name', PARAM_NOTAGS);
+        $mform->addRule('name', get_string('maximumchars', '', 80), 'maxlength', 80, 'client');
+
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
+        $mform->setType('wwwroot', PARAM_URL);
+        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
+
+        $options = array(
+            mnet_peer::SSL_NONE => get_string('none'),
+            mnet_peer::SSL_HOST => get_string('verifyhostonly', 'core_mnet'),
+            mnet_peer::SSL_HOST_AND_PEER => get_string('verifyhostandpeer', 'core_mnet')
+        );
+        $mform->addElement('select', 'sslverification', get_string('sslverification', 'core_mnet'), $options);
+        $mform->setDefault('sslverification', mnet_peer::SSL_HOST_AND_PEER);
+        $mform->addHelpButton('sslverification', 'sslverification', 'core_mnet');
+
+        $themes = array('' => get_string('forceno'));
+        foreach (array_keys(core_component::get_plugin_list('theme')) as $themename) {
+            $themes[$themename] = get_string('pluginname', 'theme_'.$themename);
+        }
+        $mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
+
+        $mform->addElement('textarea', 'public_key', get_string('publickey', 'mnet'), array('rows' => 17, 'cols' => 100, 'class' => 'smalltext'));
+        $mform->setType('public_key', PARAM_PEM);
+        $mform->addRule('public_key', get_string('required'), 'required');
+
+        // finished with form controls, now the static informational stuff
+        if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
+            $expires = '';
+            if ($mnet_peer->public_key_expires < time()) {
+                $expires = get_string('expired', 'mnet')  . ' ';
+            }
+            $expires .= userdate($mnet_peer->public_key_expires);
+            $mform->addElement('static', 'validuntil', get_string('expires', 'mnet'), $expires);
+
+            $lastconnect = '';
+            if ($mnet_peer->last_connect_time == 0) {
+                $lastconnect = get_string('never', 'mnet');
+            } else {
+                $lastconnect = date('H:i:s d/m/Y',$mnet_peer->last_connect_time);
+            }
+
+            $mform->addElement('static', 'lastconnect', get_string('last_connect_time', 'mnet'), $lastconnect);
+            $mform->addElement('static', 'ipaddress', get_string('ipaddress', 'mnet'), $mnet_peer->ip_address);
+
+            if (isset($mnet_peer->currentkey)) { // key being published is not the same as our records
+                $currentkeystr = '<b>' . get_string('keymismatch', 'mnet') . '</b><br /><br /> ' . $OUTPUT->box('<pre>' . $mnet_peer->currentkey . '</pre>');
+                $mform->addElement('static', 'keymismatch', get_string('currentkey', 'mnet'), $currentkeystr);
+            }
+
+            $credstr = '';
+            if ($credentials = $mnet_peer->check_credentials($mnet_peer->public_key)) {
+                foreach($credentials['subject'] as $key => $credential) {
+                    if (is_scalar($credential)) {
+                        $credstr .= str_pad($key, 16, " ", STR_PAD_LEFT).': '.$credential."\n";
+                    } else {
+                        $credstr .= str_pad($key, 16, " ", STR_PAD_LEFT).': '.var_export($credential,1)."\n";
+                    }
+                }
+            }
+
+            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'),
+                $OUTPUT->box('<pre>' . $credstr . '</pre>', 'generalbox certdetails'));
+        }
+
+        if ($mnet_peer && !empty($mnet_peer->deleted)) {
+            $radioarray = array();
+            $radioarray[] = $mform->createElement('static', 'deletedinfo', '',
+                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'alert alert-warning'));
+            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
+            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
+            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
+        } else {
+            $mform->addElement('hidden', 'deleted');
+            $mform->setType('deleted', PARAM_BOOL);
+        }
+
+        // finished with static stuff, print save button
+        $this->add_action_buttons(false);
+    }
+
+    function validation($data, $files) {
+        $errors = array();
+        if ($data['oldpublickey'] == $data['public_key']) {
+            return;
+        }
+        $mnet_peer = new mnet_peer(); // idiotic api
+        $mnet_peer->wwwroot = $data['wwwroot']; // just hard-set this rather than bootstrap the object
+        if (empty($data['public_key'])) {
+            $errors['public_key'] = get_string('publickeyrequired', 'mnet');
+        } else if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
+            $errmsg = '';
+            foreach ($mnet_peer->error as $err) {
+                $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
+            }
+            $errors['public_key'] = get_string('invalidpubkey', 'mnet', $errmsg);
+        }
+        unset($mnet_peer);
+        return $errors;
+    }
+}

admin/mnet/peers.php

@@ -0,0 +1,271 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+
+/**
+ * Page to allow the administrator to configure networked hosts, and add new ones
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2007 Donal McMullan
+ * @copyright  2007 Martin Langhoff
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->dirroot.'/mnet/lib.php');
+require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php');
+
+
+/// Initialize variables.
+$hostid = optional_param('hostid', 0, PARAM_INT);
+$updra = optional_param('updateregisterall', 0, PARAM_INT);
+
+// first process the register all hosts setting if required
+if (!empty($updra)) {
+    set_config('mnet_register_allhosts', optional_param('registerallhosts', 0, PARAM_INT));
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
+}
+
+$adminsection = 'mnetpeers';
+if ($hostid && $DB->get_field('mnet_host', 'deleted', array('id' => $hostid)) != 1) {
+    $adminsection = 'mnetpeer' . $hostid;
+}
+
+$PAGE->set_url('/admin/mnet/peers.php');
+admin_externalpage_setup($adminsection);
+
+if (!extension_loaded('openssl')) {
+    throw new \moodle_exception('requiresopenssl', 'mnet');
+}
+
+if (!function_exists('curl_init') ) {
+    throw new \moodle_exception('nocurl', 'mnet');
+}
+
+if (!isset($CFG->mnet_dispatcher_mode)) {
+    set_config('mnet_dispatcher_mode', 'off');
+}
+
+$mnet_peer = new mnet_peer();
+$simpleform = new mnet_simple_host_form(); // the one that goes on the bottom of the main page
+$reviewform = null; // set up later in different code branches, so mnet_peer can be passed to the constructor
+
+// if the first form has been submitted, bootstrap the peer and load up the review form
+if ($formdata = $simpleform->get_data()) {
+    // ensure we remove trailing slashes
+    $formdata->wwwroot = trim($formdata->wwwroot);
+    $formdata->wwwroot = rtrim($formdata->wwwroot, '/');
+
+    // ensure the wwwroot starts with a http or https prefix
+    if (strtolower(substr($formdata->wwwroot, 0, 4)) != 'http') {
+        $formdata->wwwroot = 'http://'.$formdata->wwwroot;
+    }
+
+    $mnet_peer->set_applicationid($formdata->applicationid);
+    $application = $DB->get_field('mnet_application', 'name', array('id'=>$formdata->applicationid));
+    $mnet_peer->bootstrap($formdata->wwwroot, null, $application);
+    // bootstrap the second form straight with the data from the first form
+    $reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
+    $reviewform->set_data($mnet_peer);
+    echo $OUTPUT->header();
+    echo $OUTPUT->box_start();
+    $reviewform->display();
+    echo $OUTPUT->box_end();
+    echo $OUTPUT->footer();
+    exit;
+} else if ($simpleform->is_submitted()) { // validation failed
+    $noreviewform = true;
+}
+
+// editing a host - load up the review form
+if (!empty($hostid)) {
+    // TODO print a nice little heading
+    $mnet_peer->set_id($hostid);
+    echo $OUTPUT->header();
+    $currenttab = 'mnetdetails';
+    require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+
+    if ($hostid != $CFG->mnet_all_hosts_id) {
+        $mnet_peer->currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
+        if ($mnet_peer->currentkey == $mnet_peer->public_key) {
+            unset($mnet_peer->currentkey);
+        } else {
+            error_log($mnet_peer->currentkey);
+            error_log($mnet_peer->public_key);
+            error_log(md5($mnet_peer->currentkey));
+            error_log(md5($mnet_peer->public_key));
+        }
+        $credentials = $mnet_peer->check_credentials($mnet_peer->public_key);
+        $reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer)); // the second step (also the edit host form)
+        $reviewform->set_data((object)$mnet_peer);
+        echo $OUTPUT->box_start();
+        $reviewform->display();
+        echo $OUTPUT->box_end();
+    } else {
+        // no options for allhosts host - just let the tabs display and print a notification
+        echo $OUTPUT->notification(get_string('allhosts_no_options', 'mnet'));
+    }
+    echo $OUTPUT->footer();
+    exit;
+}
+
+// either we're in the second step of setting up a new host
+// or editing an existing host
+// try our best to set up the mnet_peer object to pass to the form definition
+// unless validation on simpleform failed, in which case fall through.
+if (empty($noreviewform) && $id = optional_param('id', 0, PARAM_INT)) {
+    // we're editing an existing one, so set up the tabs
+    $currenttab = 'mnetdetails';
+    $mnet_peer->set_id($id);
+    require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+} else if (empty($noreviewform) && ($wwwroot = optional_param('wwwroot', '', PARAM_URL)) && ($applicationid = optional_param('applicationid', 0, PARAM_INT))) {
+    $application = $DB->get_field('mnet_application', 'name', array('id'=>$applicationid));
+    $mnet_peer->bootstrap($wwwroot, null, $application);
+}
+$reviewform = new mnet_review_host_form(null, array('peer' => $mnet_peer));
+if ($formdata = $reviewform->get_data()) {
+
+    $mnet_peer->set_applicationid($formdata->applicationid);
+    $application = $DB->get_field('mnet_application', 'name', array('id'=>$formdata->applicationid));
+    $mnet_peer->bootstrap($formdata->wwwroot, null, $application);
+
+    if (!empty($formdata->name) && $formdata->name != $mnet_peer->name) {
+        $mnet_peer->set_name($formdata->name);
+    }
+
+    if (empty($formdata->theme)) {
+        $mnet_peer->force_theme = 0;
+        $mnet_peer->theme = null;
+    } else {
+        $mnet_peer->force_theme = 1;
+        $mnet_peer->theme = $formdata->theme;
+    }
+
+    $mnet_peer->deleted             = $formdata->deleted;
+    $mnet_peer->public_key          = $formdata->public_key;
+    $credentials                    = $mnet_peer->check_credentials($mnet_peer->public_key);
+    $mnet_peer->public_key_expires  = $credentials['validTo_time_t'];
+    $mnet_peer->sslverification     = $formdata->sslverification;
+
+    if ($mnet_peer->commit()) {
+        redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));
+    } else {
+        throw new \moodle_exception('invalidaction', 'error', 'index.php');
+    }
+} else if ($reviewform->is_submitted()) { // submitted, but errors
+    echo $OUTPUT->header();
+    echo $OUTPUT->box_start();
+    $reviewform->display();
+    echo $OUTPUT->box_end();
+    echo $OUTPUT->footer();
+    exit;
+}
+
+
+// normal flow - just display all hosts with links
+echo $OUTPUT->header();
+$hosts = mnet_get_hosts(true);
+
+// print the table to display the register all hosts setting
+$table = new html_table();
+$table->head = array(get_string('registerallhosts', 'mnet'));
+
+$registerrow = '';
+$registerstr = '';
+$registerurl = new moodle_url('/admin/mnet/peers.php', array('updateregisterall' => 1));
+if (!empty($CFG->mnet_register_allhosts)) {
+    $registerrow = get_string('registerhostson', 'mnet');
+    $registerurl->param('registerallhosts', 0);
+    $registerstr = get_string('turnitoff', 'mnet');
+} else {
+    $registerrow = get_string('registerhostsoff', 'mnet');
+    $registerurl->param('registerallhosts', 1);
+    $registerstr = get_string('turniton', 'mnet');
+}
+$registerrow .= $OUTPUT->single_button($registerurl, $registerstr);
+
+// simple table with two rows of a single cell
+$table->data = array(
+    array(
+        get_string('registerallhostsexplain', 'mnet'),
+    ),
+    array(
+        $registerrow
+    ),
+);
+echo html_writer::table($table);
+
+// print the list of all hosts, with little action links and buttons
+$table = new html_table();
+$table->head = array(
+    get_string('site'),
+    get_string('system', 'mnet'),
+    get_string('last_connect_time', 'mnet'),
+    '',
+);
+$table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
+$baseurl = new moodle_url('/admin/mnet/peers.php');
+$deleted = array();
+foreach($hosts as $host) {
+    $hosturl = new moodle_url($baseurl, array('hostid' => $host->id));
+    if (trim($host->name) === '') {
+        // should not happen but...
+        $host->name = '???';
+    }
+    // process all hosts first since it's the easiest
+    if ($host->id == $CFG->mnet_all_hosts_id) {
+        $table->data[] = array(html_writer::link($hosturl, get_string('allhosts', 'core_mnet')), '*', '', '');
+        continue;
+    }
+
+    // populate the list of deleted hosts
+    if ($host->deleted) {
+        $deleted[] = html_writer::link($hosturl, $host->name);
+        continue;
+    }
+
+    if ($host->last_connect_time == 0) {
+        $last_connect = get_string('never');
+    } else {
+        $last_connect = userdate($host->last_connect_time, get_string('strftimedatetime', 'core_langconfig'));
+    }
+    $table->data[] = array(
+        html_writer::link($hosturl, $host->name),
+        html_writer::link($host->wwwroot, $host->wwwroot),
+        $last_connect,
+        $OUTPUT->single_button(new moodle_url('/admin/mnet/delete.php', array('hostid' => $host->id)), get_string('delete'))
+    );
+}
+echo html_writer::table($table);
+
+if ($deleted) {
+    echo $OUTPUT->box(get_string('deletedhosts', 'core_mnet', join(', ', $deleted)), 'deletedhosts');
+}
+
+// finally, print the initial form to add a new host
+echo $OUTPUT->box_start();
+echo $OUTPUT->heading(get_string('addnewhost', 'mnet'), 3);
+$simpleform->display();
+echo $OUTPUT->box_end();
+
+// done
+echo $OUTPUT->footer();
+exit;
+

admin/mnet/profilefields.php

@@ -0,0 +1,89 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Allows the admin to configure a list of profile fields that are sent/recieved
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2010 onwards Penny Leach <penny@liip.ch>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php');
+$mnet = get_mnet_environment();
+
+$hostid = required_param('hostid', PARAM_INT);
+$mnet_peer = new mnet_peer();
+$mnet_peer->set_id($hostid);
+
+admin_externalpage_setup('mnetpeers');
+$form = new mnet_profile_form(null, array('hostid' => $hostid));
+
+if ($data = $form->get_data()) {
+    if (!isset($data->importdefault)) {
+        $data->importdefault = 0;
+    }
+    if (!isset($data->exportdefault)) {
+        $data->exportdefault = 0;
+    }
+    if (!isset($data->importfields)) {
+        $data->importfields = array();
+    }
+    if (!isset($data->exportfields)) {
+        $data->exportfields = array();
+    }
+    set_config('host' . $hostid . 'importdefault', $data->importdefault, 'mnet');
+    set_config('host' . $hostid . 'importfields', implode(',', $data->importfields), 'mnet');
+    set_config('host' . $hostid . 'exportdefault', $data->exportdefault, 'mnet');
+    set_config('host' . $hostid . 'exportfields', implode(',', $data->exportfields), 'mnet');
+
+    redirect(new moodle_url('/admin/mnet/peers.php'), get_string('changessaved'));
+} elseif ($form->is_cancelled()) {
+    redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $hostid)));
+}
+
+echo $OUTPUT->header();
+
+$currenttab = 'mnetprofilefields';
+require_once('tabs.php');
+
+echo $OUTPUT->heading(get_string('peerprofilefielddesc', 'mnet'), 4);
+
+$data = new Stdclass;
+$data->importdefault = get_config('mnet', 'host' . $hostid . 'importdefault');
+$data->exportdefault = get_config('mnet', 'host' . $hostid . 'exportdefault');
+$data->importfields = get_config('mnet', 'host' . $hostid . 'importfields');
+$data->exportfields = get_config('mnet', 'host' . $hostid . 'exportfields');
+
+if ($data->importfields === false) {
+    $data->importdefault = true;
+} else {
+    $data->importfields = explode(',', $data->importfields);
+}
+if ($data->exportfields === false) {
+    $data->exportdefault = true;
+} else {
+    $data->exportfields = explode(',', $data->exportfields);
+}
+
+$form->set_data($data);
+$form->display();
+
+echo $OUTPUT->footer();

admin/mnet/profilefields_form.php

@@ -0,0 +1,75 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Allows the admin to configure a list of profile fields that are sent/recieved
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2010 onwards Penny Leach <penny@liip.ch>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
+require_once($CFG->libdir . '/formslib.php');
+
+/**
+ * small form to allow the administrator to configure (override) which profile fields are sent/imported over mnet
+ */
+class mnet_profile_form extends moodleform {
+
+    function definition() {
+        global $CFG;
+        $mform =& $this->_form;
+
+        $mnetprofileimportfields = '';
+        if (isset($CFG->mnetprofileimportfields)) {
+            $mnetprofileimportfields = str_replace(',', ', ', $CFG->mnetprofileimportfields);
+        }
+
+        $mnetprofileexportfields = '';
+        if (isset($CFG->mnetprofileexportfields)) {
+            $mnetprofileexportfields = str_replace(',', ', ', $CFG->mnetprofileexportfields);
+        }
+
+        $mform->addElement('hidden', 'hostid', $this->_customdata['hostid']);
+        $mform->setType('hostid', PARAM_INT);
+
+        $fields = mnet_profile_field_options();
+
+        // Fields to import ----------------------------------------------------
+        $mform->addElement('header', 'import', get_string('importfields', 'mnet'));
+
+        $select = $mform->addElement('select', 'importfields', get_string('importfields', 'mnet'), $fields['optional']);
+        $select->setMultiple(true);
+
+        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), $mnetprofileimportfields);
+
+        // Fields to export ----------------------------------------------------
+        $mform->addElement('header', 'export', get_string('exportfields', 'mnet'));
+
+        $select = $mform->addElement('select', 'exportfields', get_string('exportfields', 'mnet'), $fields['optional']);
+        $select->setMultiple(true);
+
+        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), $mnetprofileexportfields);
+
+        $this->add_action_buttons();
+    }
+}

admin/mnet/services.php

@@ -0,0 +1,89 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+
+/**
+ * This page is for configuring which services are published/subscribed on a host
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php');
+$mnet = get_mnet_environment();
+
+admin_externalpage_setup('mnetpeers');
+
+
+$hostid = required_param('hostid', PARAM_INT);
+
+$mnet_peer = new mnet_peer();
+$mnet_peer->set_id($hostid);
+
+$mform = new mnet_services_form(null, array('peer' => $mnet_peer));
+if ($formdata = $mform->get_data()) {
+    if (!isset($formdata->publish)) {
+        $formdata->publish = array();
+    }
+    if (!isset($formdata->subscribe)) {
+        $formdata->subscribe = array();
+    }
+    foreach($formdata->exists as $key => $value) {
+        $host2service   = $DB->get_record('mnet_host2service', array('hostid'=>$hostid, 'serviceid'=>$key));
+        $publish        = (array_key_exists($key, $formdata->publish)) ? $formdata->publish[$key] : 0;
+        $subscribe      = (array_key_exists($key, $formdata->subscribe)) ? $formdata->subscribe[$key] : 0;
+
+        if ($publish != 1 && $subscribe != 1) {
+            if (false == $host2service) {
+                // We don't have or need a record - do nothing!
+            } else {
+                // We don't need the record - delete it
+                $DB->delete_records('mnet_host2service', array('hostid' => $hostid, 'serviceid'=>$key));
+            }
+        } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+            $host2service = new stdClass();
+            $host2service->hostid = $hostid;
+            $host2service->serviceid = $key;
+
+            $host2service->publish = $publish;
+            $host2service->subscribe = $subscribe;
+
+            $host2service->id = $DB->insert_record('mnet_host2service', $host2service);
+        } elseif ($host2service->publish != $publish || $host2service->subscribe != $subscribe) {
+            $host2service->publish   = $publish;
+            $host2service->subscribe = $subscribe;
+            $DB->update_record('mnet_host2service', $host2service);
+        }
+    }
+    $redirecturl = new moodle_url('/admin/mnet/services.php?hostid=' . $hostid);
+    redirect($redirecturl, get_string('changessaved'));
+}
+
+echo $OUTPUT->header();
+$currenttab = 'mnetservices';
+require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+echo $OUTPUT->box_start();
+$s = mnet_get_service_info($mnet_peer, false); // basic data only
+$mform->set_data($s);
+$mform->display();
+echo $OUTPUT->box_end();
+
+echo $OUTPUT->footer();

admin/mnet/services_form.php

@@ -0,0 +1,77 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+
+/**
+ * The form for configuring which services are subscribed and published on a host
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
+require_once($CFG->libdir . '/formslib.php');
+
+class mnet_services_form extends moodleform {
+
+    function definition() {
+        $mform =& $this->_form;
+        $mnet_peer =& $this->_customdata['peer'];
+        $myservices = mnet_get_service_info($mnet_peer);
+
+        $mform->addElement('hidden', 'hostid', $mnet_peer->id);
+        $mform->setType('hostid', PARAM_INT);
+
+        $count = 0;
+        foreach ($myservices as $name => $versions) {
+            $version = current($versions);
+            $langmodule =
+                ($version['plugintype'] == 'mod'
+                    ? ''
+                    : ($version['plugintype'] . '_'))
+                . $version['pluginname']; // TODO there should be a moodle-wide way to do this
+
+            if ($count > 0) {
+                $mform->addElement('html', '<hr />');
+            }
+            $mform->addElement('html', '<h3>' .  get_string($name.'_name', $langmodule , $mnet_peer->name) . '</h3>' . get_string($name.'_description', $langmodule, $mnet_peer->name));
+
+            $mform->addElement('hidden', 'exists[' . $version['serviceid'] . ']', 1);
+            // Temporary fix until MDL-38885 gets integrated.
+            $mform->setType('exists', PARAM_BOOL);
+
+            $pubstr = get_string('publish','mnet');
+            if (!empty($version['hostsubscribes'])) {
+                $pubstr .= ' <a class="notifysuccess" title="'.s(get_string('issubscribed','mnet', $mnet_peer->name)).'">&radic;</a> ';
+            }
+            $mform->addElement('advcheckbox', 'publish[' . $version['serviceid'] . ']', $pubstr);
+
+            $substr = get_string('subscribe','mnet');
+            if (!empty($version['hostpublishes'])) {
+                $substr .= ' <a class="notifysuccess" title="'.s(get_string('ispublished','mnet', $mnet_peer->name)).'">&radic;</a> ';
+            }
+            $mform->addElement('advcheckbox', 'subscribe[' . $version['serviceid']. ']', $substr);
+            $count++;
+        }
+        $this->add_action_buttons();
+    }
+}

admin/mnet/tabs.php

@@ -0,0 +1,47 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+
+/**
+ * Tabs to be included on the pages for configuring a single host
+ * $mnet_peer object must be set and bootstrapped
+ * $currenttab string must be set
+ *
+ * @package    core
+ * @subpackage mnet
+ * @copyright  2007 Donal McMullan
+ * @copyright  2007 Martin Langhoff
+ * @copyright  2010 Penny Leach
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
+}
+
+$strmnetservices   = get_string('mnetservices', 'mnet');
+$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+
+$tabs = array();
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
+    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+    $tabs[] = new tabobject('mnetservices', 'services.php?hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+    $tabs[] = new tabobject('mnetprofilefields', 'profilefields.php?hostid=' . $mnet_peer->id, get_string('profilefields', 'mnet'), get_string('profilefields', 'mnet'), false);
+} else {
+    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
+}
+print_tabs(array($tabs), $currenttab);

admin/mnet/testclient.php

@@ -0,0 +1,227 @@
+<?php
+/**
+ * A service browser for remote Moodles
+ *
+ * This script 'remotely' executes the reflection methods on a remote Moodle,
+ * and publishes the details of the available services
+ *
+ * @package    core
+ * @subpackage mnet
+ * @author  Donal McMullan  donal@catalyst.net.nz
+ * @version 0.0.1
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package mnet
+ */
+require(__DIR__.'/../../config.php');
+require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
+require_once($CFG->libdir.'/adminlib.php');
+include_once($CFG->dirroot.'/mnet/lib.php');
+
+if ($CFG->mnet_dispatcher_mode === 'off') {
+    throw new \moodle_exception('mnetdisabled', 'mnet');
+}
+
+admin_externalpage_setup('mnettestclient');
+
+error_reporting(DEBUG_ALL);
+
+echo $OUTPUT->header();
+if (!extension_loaded('openssl')) {
+    throw new \moodle_exception('requiresopenssl', 'mnet', '', null, true);
+}
+
+// optional drilling down parameters
+$hostid = optional_param('hostid', 0, PARAM_INT);
+$servicename = optional_param('servicename', '', PARAM_SAFEDIR);
+$methodid = optional_param('method', 0, PARAM_INT);
+
+$hosts = $DB->get_records('mnet_host');
+$moodleapplicationid = $DB->get_field('mnet_application', 'id', array('name' => 'moodle'));
+
+$url = new moodle_url('/admin/mnet/testclient.php');
+$PAGE->set_url($url);
+
+echo $OUTPUT->heading(get_string('hostlist', 'mnet'));
+foreach ($hosts as $id => $host) {
+    if (empty($host->wwwroot) || $host->wwwroot == $CFG->wwwroot) {
+        continue;
+    }
+    $newurl = new moodle_url($url, array('hostid' => $host->id));
+    echo '<p>' . html_writer::link($newurl, $host->wwwroot) . '</p>';
+}
+
+if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
+    $host = $hosts[$hostid];
+    if ($host->applicationid != $moodleapplicationid) {
+        echo $OUTPUT->notification(get_string('notmoodleapplication', 'mnet'));
+    }
+    $mnet_peer = new mnet_peer();
+    $mnet_peer->set_wwwroot($host->wwwroot);
+
+    $mnet_request = new mnet_xmlrpc_client();
+
+    $mnet_request->set_method('system/listServices');
+    $mnet_request->send($mnet_peer);
+
+    $services = $mnet_request->response;
+    $yesno = array('No', 'Yes');
+    $servicenames = array();
+
+    echo $OUTPUT->heading(get_string('servicesavailableonhost', 'mnet', $host->wwwroot));
+
+    if (!empty($mnet_request->error)) {
+        echo $OUTPUT->heading(get_string('error'), 3);
+        echo html_writer::alist($mnet_request->error);
+        $services = array();
+    }
+
+    $table = new html_table();
+    $table->head = array(
+        get_string('serviceid', 'mnet'),
+        get_string('service', 'mnet'),
+        get_string('version', 'mnet'),
+        get_string('theypublish', 'mnet'),
+        get_string('theysubscribe', 'mnet'),
+        get_string('options', 'mnet'),
+    );
+    $table->data = array();
+
+    $yesno = array(get_string('no'), get_string('yes'));
+
+    // this query is horrible and has to be remapped afterwards, because of the non-uniqueness
+    // of the remoterep service (it has two plugins so far that use it)
+    // it's possible to get a unique list back using a subquery with LIMIT but that would break oracle
+    // so it's best to just do this small query and then remap the results afterwards
+    $sql = '
+        SELECT DISTINCT
+            ' . $DB->sql_concat('r.plugintype', "'_'", 'r.pluginname', "'_'", 's.name')  . ' AS uniqueid,
+             s.name,
+             r.plugintype,
+             r.pluginname
+        FROM
+            {mnet_service} s
+       JOIN {mnet_remote_service2rpc} s2r ON s2r.serviceid = s.id
+       JOIN {mnet_remote_rpc} r ON r.id = s2r.rpcid';
+
+    $serviceinfo = array();
+
+    foreach ($DB->get_records_sql($sql) as $result) {
+        $serviceinfo[$result->name] = $result->plugintype . '_' . $result->pluginname;
+    }
+
+    foreach ($services as $id => $servicedata) {
+        if (array_key_exists($servicedata['name'], $serviceinfo)) {
+            $service = $serviceinfo[$servicedata['name']];
+            $servicedata['humanname'] = get_string($servicedata['name'].'_name', $service);
+        } else {
+            $servicedata['humanname'] = get_string('unknown', 'mnet');
+        }
+        $newurl = new moodle_url($url, array('hostid' => $host->id, 'servicename' => $servicedata['name']));
+        $table->data[] = array(
+            $servicedata['name'],
+            $servicedata['humanname'],
+            $servicedata['apiversion'],
+            $yesno[$servicedata['publish']],
+            $yesno[$servicedata['subscribe']],
+            html_writer::link($newurl, get_string('listservices', 'mnet'))
+        );
+
+    }
+    echo html_writer::table($table);
+
+
+    $mnet_request = new mnet_xmlrpc_client();
+    $mnet_request->set_method('system/listMethods');
+    if (isset($servicename) && array_key_exists($servicename, $serviceinfo)) {
+        echo $OUTPUT->heading(get_string('methodsavailableonhostinservice', 'mnet', (object)array('host' => $host->wwwroot, 'service' => $servicename)));
+        $service = $serviceinfo[$servicename];
+        $mnet_request->add_param($servicename, 'string');
+    } else {
+        echo $OUTPUT->heading(get_string('methodsavailableonhost', 'mnet', $host->wwwroot));
+    }
+
+    $mnet_request->send($mnet_peer);
+    $methods = $mnet_request->response;
+
+    if (!empty($mnet_request->error)) {
+        echo $OUTPUT->heading(get_string('error'), 3);
+        echo html_writer::alist($mnet_request->error);
+        $methods = array();
+    }
+
+    $table = new html_table();
+    $table->head = array(
+        get_string('method', 'mnet'),
+        get_string('options', 'mnet'),
+    );
+    $table->data = array();
+
+    foreach ($methods as $id => $method) {
+        $params = array('hostid' => $host->id, 'method' => $id+1);
+        if (isset($servicename)) {
+            $params['servicename'] = $servicename;
+        }
+        $newurl = new moodle_url($url, $params);
+        $table->data[] = array(
+            $method,
+            html_writer::link($newurl, get_string('inspect', 'mnet'))
+        );
+    }
+    echo html_writer::table($table);
+
+    if (isset($methodid) && array_key_exists($methodid-1, $methods)) {
+        $method = $methods[$methodid-1];
+
+        $mnet_request = new mnet_xmlrpc_client();
+        $mnet_request->set_method('system/methodSignature');
+        $mnet_request->add_param($method, 'string');
+        $mnet_request->send($mnet_peer);
+        $signature = $mnet_request->response;
+
+        echo $OUTPUT->heading(get_string('methodsignature', 'mnet', $method));
+
+        if (!empty($mnet_request->error)) {
+            echo $OUTPUT->heading(get_string('error'), 3);
+            echo html_writer::alist($mnet_request->error);
+            $signature = array();
+        }
+
+        $table = new html_table();
+        $table->head = array(
+            get_string('position', 'mnet'),
+            get_string('name', 'mnet'),
+            get_string('type', 'mnet'),
+            get_string('description', 'mnet'),
+        );
+        $table->data = array();
+
+        $params = $signature['parameters'];
+        foreach ($params as $pos => $details) {
+            $table->data[] = array(
+                $pos,
+                $details['name'],
+                $details['type'],
+                $details['description'],
+            );
+        }
+        $table->data[] = array(
+            get_string('returnvalue', 'mnet'),
+            '',
+            $signature['return']['type'],
+            $signature['return']['description']
+        );
+
+        echo html_writer::table($table);
+
+        $mnet_request->set_method('system/methodHelp');
+        $mnet_request->add_param($method, 'string');
+        $mnet_request->send($mnet_peer);
+        $help = $mnet_request->response;
+
+        echo $OUTPUT->heading(get_string('methodhelp', 'mnet', $method));
+        echo(str_replace('\n', '<br />',$help));
+    }
+}
+
+echo $OUTPUT->footer();
+?>

admin/mnet/trustedhosts.html

@@ -0,0 +1,68 @@
+<?php
+echo $OUTPUT->header();
+?>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+<table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
+    </tr>
+    <tr>
+        <td class="cell c1" colspan="2"><?php print_string('trustedhostsexplain', 'mnet'); ?></td>
+    </tr>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <form  method="post" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
+                <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
+                <input type="submit" value="<?php print_string('savechanges'); ?>" />
+            </div>
+            </form>
+        </td>
+    </tr>
+</table>
+<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
+    </tr>
+<?php
+    if (!empty($test_ip_address)){
+?>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <?php
+                if ($in_range) {
+                    print_string('is_in_range',  'mnet', $test_ip_address);
+                    echo '<br />';
+                    print_string('validated_by', 'mnet', $validated_by);
+                } else {
+                    print_string('not_in_range',  'mnet', $test_ip_address);
+                }
+            ?>
+        </td>
+    </tr>
+<?php
+   } else {
+?>
+    <tr>
+        <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
+    </tr>
+<?php
+   }
+?>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <form  method="get" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
+                <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
+                <input type="submit" value="<?php print_string('go'); ?>" />
+            </div>
+            </form>
+        </td>
+    </tr>
+</table>
+</div>
+<?php
+echo $OUTPUT->footer();
+?>

admin/mnet/trustedhosts.php

@@ -0,0 +1,59 @@
+<?php
+    // Allows the admin to configure services for remote hosts
+
+    require(__DIR__.'/../../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+
+    admin_externalpage_setup('trustedhosts');
+
+
+    if (!extension_loaded('openssl')) {
+        echo $OUTPUT->header();
+        throw new \moodle_exception('requiresopenssl', 'mnet', '', null, true);
+    }
+
+    $site = get_site();
+
+    $trusted_hosts = '';//array();
+    $old_trusted_hosts = get_config('mnet', 'mnet_trusted_hosts');
+    if (!empty($old_trusted_hosts)) {
+        $old_trusted_hosts =  explode(',', $old_trusted_hosts);
+    } else {
+        $old_trusted_hosts = array();
+    }
+
+    $test_ip_address = optional_param('testipaddress', NULL, PARAM_HOST);
+    $in_range = false;
+    if (!empty($test_ip_address)) {
+        foreach($old_trusted_hosts as $host) {
+            if (address_in_subnet($test_ip_address, $host)) {
+                $in_range = true;
+                $validated_by = $host;
+                break;
+            }
+        }
+    }
+
+    /// If data submitted, process and store
+    if (($form = data_submitted()) && confirm_sesskey()) {
+        $hostlist = preg_split("/[\s,]+/", $form->hostlist);
+        foreach($hostlist as $host) {
+            list($address, $mask) = explode('/', $host.'/');
+            if (empty($address)) continue;
+            if (strlen($mask) == 0) $mask = 32;
+            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
+            unset($address, $mask);
+        }
+        set_config('mnet_trusted_hosts', str_replace("\n", ',', $trusted_hosts), 'mnet');
+    } elseif (!empty($old_trusted_hosts)) {
+        foreach($old_trusted_hosts as $host) {
+            list($address, $mask) = explode('/', $host.'/');
+            if (empty($address)) continue;
+            if (strlen($mask) == 0) $mask = 32;
+            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
+            unset($address, $mask);
+        }
+    }
+
+    include('./trustedhosts.html');