From 8219502369c3ed9319072e383063f03d065245d4 Mon Sep 17 00:00:00 2001
From: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Date: Mon, 16 Apr 2012 09:31:42 +0100
Subject: [PATCH] MDL-32454 Fix issues highlighted by strict warnings in MNet
 code

---
 admin/mnet/peer_forms.php         |  4 ++--
 admin/mnet/profilefields_form.php | 13 +++++++++++--
 admin/mnet/services_form.php      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/admin/mnet/peer_forms.php b/admin/mnet/peer_forms.php
index 4725e1fe3c7..659a56c8989 100644
--- a/admin/mnet/peer_forms.php
+++ b/admin/mnet/peer_forms.php
@@ -50,7 +50,7 @@ class mnet_simple_host_form extends moodleform {
         $this->add_action_buttons(false, get_string('addhost', 'mnet'));
     }
 
-    function validation($data) {
+    function validation($data, $files) {
         global $DB;
 
         $wwwroot = $data['wwwroot'];
@@ -154,7 +154,7 @@ class mnet_review_host_form extends moodleform {
         $this->add_action_buttons(false);
     }
 
-    function validation($data) {
+    function validation($data, $files) {
         $errors = array();
         if ($data['oldpublickey'] == $data['public_key']) {
             return;
diff --git a/admin/mnet/profilefields_form.php b/admin/mnet/profilefields_form.php
index 79809f3b55a..30b4b9e5662 100644
--- a/admin/mnet/profilefields_form.php
+++ b/admin/mnet/profilefields_form.php
@@ -39,6 +39,15 @@ class mnet_profile_form extends moodleform {
         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']);
         $fields = mnet_profile_field_options();
@@ -49,7 +58,7 @@ class mnet_profile_form extends moodleform {
         $select = $mform->addElement('select', 'importfields', get_string('importfields', 'mnet'), $fields['optional']);
         $select->setMultiple(true);
 
-        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileimportfields));
+        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), $mnetprofileimportfields);
 
         // Fields to export ----------------------------------------------------
         $mform->addElement('header', 'export', get_string('exportfields', 'mnet'));
@@ -57,7 +66,7 @@ class mnet_profile_form extends moodleform {
         $select = $mform->addElement('select', 'exportfields', get_string('exportfields', 'mnet'), $fields['optional']);
         $select->setMultiple(true);
 
-        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileexportfields));
+        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), $mnetprofileexportfields);
 
         $this->add_action_buttons();
     }
diff --git a/admin/mnet/services_form.php b/admin/mnet/services_form.php
index af4d5b06479..497eead82ed 100644
--- a/admin/mnet/services_form.php
+++ b/admin/mnet/services_form.php
@@ -36,7 +36,7 @@ class mnet_services_form extends moodleform {
     function definition() {
         $mform =& $this->_form;
         $mnet_peer =& $this->_customdata['peer'];
-        $myservices =& mnet_get_service_info($mnet_peer);
+        $myservices = mnet_get_service_info($mnet_peer);
 
         $mform->addElement('hidden', 'hostid', $mnet_peer->id);