portfolio MDL-20905 updated box.net docs to explain new returnurl

diff --git a/lang/en_utf8/help/portfolio/boxnet_apikey.html b/lang/en_utf8/help/portfolio/boxnet_apikey.html
index f7ab8cff5e389b5681e2ff424913290792026e0b..575df8762cae7a606c1e3825f6ddad48f06408ea 100644 (file)
--- a/lang/en_utf8/help/portfolio/boxnet_apikey.html
+++ b/lang/en_utf8/help/portfolio/boxnet_apikey.html
@@ -3,7 +3,8 @@
 developer account. You can then navigate to My projects, and create a new one.</p>
 
 <p>For all the settings, Moodle doesn't care what you put in except for the
-callback url, which should be $CFG-&gt;wwwroot/portfolio/add.php?postcontrol=1.</p>
+callback url, which should be:<br />
+<b>$CFG-&gt;wwwroot/portfolio/add.php?postcontrol=1&amp;type=boxnet.</b></p>
 
 <p>Box.net will append the relevant authentication tokens to the url (detecting
 it already contains ? and everything already) </p>

diff --git a/lang/en_utf8/portfolio_boxnet.php b/lang/en_utf8/portfolio_boxnet.php
index 853ad9b55930043ce5556d61222084392f1f818b..ec72ac4ac070c043cf445d36d4a206567e6ff54f 100644 (file)
--- a/lang/en_utf8/portfolio_boxnet.php
+++ b/lang/en_utf8/portfolio_boxnet.php
@@ -1,7 +1,7 @@
 <?php
 
 $string['apikey'] = 'API key';
-$string['apikeyhelp'] = 'You need to get this by signing up to enabled.box.net and adding an application.  The callback url must be yourwwwroot/portfolio/add.php?postcontrol=1';
+$string['apikeyhelp'] = 'You need to get this by signing up to enabled.box.net and adding an application.  The callback url must be yourwwwroot/portfolio/add.php?postcontrol=1&type=boxnet';
 $string['apikeyinlinehelp'] = '<p>To configure Box.net, visit <a href=\"http://enabled.box.net/my-projects\">enabled.box.net</a> and log in.</p><p>Under My Projects you will need to create one new project for each Moodle site.</p><p>The only setting that matters is the callback url, which should be $a. You can put anything you like for the other settings. Save it and you\'re done!';
 $string['err_noapikey'] = 'There is no API Key configured for this plugin.  You can get one of these from http://enabled.box.net';
 $string['existingfolder'] = 'Exiting folder to put file(s) into';

diff --git a/portfolio/boxnet/lib.php b/portfolio/boxnet/lib.php
index f3a08e1e57d7c5e82f07a3f1e16740374d3bd320..76e58240e72db98340af097b83cad1db18532e12 100644 (file)
--- a/portfolio/boxnet/lib.php
+++ b/portfolio/boxnet/lib.php
@@ -116,7 +116,7 @@ class portfolio_plugin_boxnet extends portfolio_plugin_push_base {
         );
         $mform->setHelpButton('apikey', $helpparams);
         $mform->addRule('apikey', $strrequired, 'required', null, 'client');
-        $mform->addElement('warning', 'apikeyhelp', 'smalltext', get_string('apikeyinlinehelp', 'portfolio_boxnet', $CFG->wwwroot . '/portfolio/add.php?postcontrol=1'));
+        $mform->addElement('warning', 'apikeyhelp', 'smalltext', get_string('apikeyinlinehelp', 'portfolio_boxnet', $CFG->wwwroot . '/portfolio/add.php?postcontrol=1&type=boxnet'));
 
     }