portfolio MDL-20639 mahara plugin: update to mnet requirements after stricter mnet...

diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html
index 3f23bafb2f64d516f8dfbe1f24beb1b6a6f6115c..2706eb415a612718c472d56c66ef233a2ce2f192 100644 (file)
--- a/admin/mnet/mnet_services.html
+++ b/admin/mnet/mnet_services.html
@@ -44,9 +44,6 @@ echo $OUTPUT->box_start();
             echo $breakstring;
 ?>
     <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-<?php if ($name == 'pf') { // see MDL-16269 ?>
-    <input type="hidden" name="publish[<?php echo $version['serviceid']; ?>]" value="0" />
-<?php } else { ?>
     <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
 <?php
             print_string('publish','mnet');
@@ -58,7 +55,7 @@ echo $OUTPUT->box_start();
                 print_string("enabled_for_all",'mnet',!empty($version['I_publish']));
             }
             echo '<br />';
-} ?>
+?>
     <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/>
 <?php
             print_string('subscribe','mnet');

diff --git a/lang/en_utf8/portfolio_mahara.php b/lang/en_utf8/portfolio_mahara.php
index 51f230fef6909f3bd29965e840df49c6df79bffe..29c17c8b41b869f7f3bb6f6e2d826a2c0baba14f 100644 (file)
--- a/lang/en_utf8/portfolio_mahara.php
+++ b/lang/en_utf8/portfolio_mahara.php
@@ -1,8 +1,8 @@
 <?php
 
-$string['err_nomnethosts'] = 'This plugin relies on Moodle Networking peers with SSO IDP published, and portfolio and SSO SP subscribed, as well as the mnet authentication plugin.  Any instances of this plugin has been set to not visible until this is fixed - you will need to set them to visible again manually. They cannot be used before this happens.';
+$string['err_nomnethosts'] = 'This plugin relies on Moodle Networking peers with SSO IDP published, SSO SP subscribed, Portfolio services published <b>and</b> subscribed as well as the mnet authentication plugin.  Any instances of this plugin has been set to not visible until this is fixed - you will need to set them to visible again manually. They cannot be used before this happens.';
 $string['err_networkingoff'] = 'Moodle Networking is off entirely. Please enable it before trying to configure this pugin.  Any instances of this plugin have been set to not visible until this is fixed - you will need to set them to visible again manully.  They cannot be used until this happens';
-$string['err_invalidhost'] = 'This plugin is misconfigured to point to an invalid (or deleted) mnet host.  This plugin relies on Moodle Networking peers with SSO IDP published, and portfolio and SSO_SP subscribed.';
+$string['err_invalidhost'] = 'This plugin is misconfigured to point to an invalid (or deleted) mnet host.  This plugin relies on Moodle Networking peers with SSO IDP published, SSO_SP subscribed, and portfolio subscribed <b>and</b> published.';
 $string['err_nomnetauth'] = 'The mnet authentication plugin is disabled, but is required for this service';
 $string['failedtojump'] = 'Failed to start communication with remote server';
 $string['failedtoping'] = 'Failed to start communication with remote server: $a';
@@ -11,7 +11,7 @@ $string['senddisallowed'] = 'You cannot transfer files to Mahara at this time';
 $string['url'] = 'URL';
 $string['pf_name'] = 'Portfolio services';
 $string['pf_description'] = 'Allow users to push Moodle content to this host<br />'.
-                                 'Subscribe to this service to allow authenticated users in your site to push content to $a<br />' .
+                                 'Subscribe to <b>and</b> publish this service to allow authenticated users in your site to push content to $a<br />' .
                                  '<ul><li><em>Dependency</em>: You must also <strong>publish</strong> the SSO (Identify Provider) service to $a.</li>' .
                                  '<li><em>Dependency</em>: You must also <strong>subscribe</strong> to the SSO (Service Provider) service on $a</li>' .
                                  '<li><em>Dependency</em>: You must also enable the mnet authentication plugin.</li></ul><br />';

diff --git a/portfolio/mahara/lib.php b/portfolio/mahara/lib.php
index 57127566304e3ca71a263c5f56b791d2e0afb00a..2a4b61261f48c79e4256d282b831f4e84ca9cccb 100644 (file)
--- a/portfolio/mahara/lib.php
+++ b/portfolio/mahara/lib.php
@@ -126,8 +126,9 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base {
                                     a.name = ? AND
                                     s1.name = ? AND hs1.publish = ? AND
                                     s2.name = ? AND hs2.subscribe = ? AND
-                                    s3.name = ? AND hs3.subscribe = ?',
-                        array($CFG->mnet_localhost_id, 'mahara', 'sso_idp', 1, 'sso_sp', 1, 'pf', 1));;
+                                    s3.name = ? AND hs3.subscribe = ? AND
+                                    s3.name = ? AND hs3.publish = ?',
+                        array($CFG->mnet_localhost_id, 'mahara', 'sso_idp', 1, 'sso_sp', 1, 'pf', 1, 'pf', 1));
         if (empty($hosts)) { $hosts = array(); }
         if (isset($this) && is_object($this)) {
             $this->hosts = $hosts;