Merge branch 'MDL-65959-310' of git://github.com/peterRd/moodle into MOODLE_310_STABLE

diff --combined lib/db/install.xml
index 391c799,2225860..00697cb
--- 1/lib/db/install.xml
--- 2/lib/db/install.xml
+++ b/lib/db/install.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8" ?>
 -<XMLDB PATH="lib/db" VERSION="20201008" COMMENT="XMLDB file for core Moodle tables"
 +<XMLDB PATH="lib/db" VERSION="20201021" COMMENT="XMLDB file for core Moodle tables"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
  >
@@@ -89,7 -89,6 +89,7 @@@
          <FIELD NAME="showreports" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
          <FIELD NAME="visible" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/>
          <FIELD NAME="visibleold" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="the state of visible field when hiding parent category, this helps us to recover hidden states when unhiding the parent category later"/>
 +        <FIELD NAME="downloadcontent" TYPE="int" LENGTH="1" NOTNULL="false" SEQUENCE="false"/>
          <FIELD NAME="groupmode" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
          <FIELD NAME="groupmodeforce" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
          <FIELD NAME="defaultgroupingid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="default grouping used in course modules, does not have key intentionally"/>
@@@ -3189,6 -3188,7 +3189,7 @@@
        <KEYS>
          <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
          <KEY NAME="fk_userid" TYPE="foreign" FIELDS="userid" REFTABLE="user" REFFIELDS="id"/>
+         <KEY NAME="backpackcredentials" TYPE="unique" FIELDS="userid, externalbackpackid"/>
          <KEY NAME="externalbackpack" TYPE="foreign" FIELDS="externalbackpackid" REFTABLE="badge_external_backpack" REFFIELDS="id"/>
        </KEYS>
      </TABLE>
@@@ -3276,7 -3276,6 +3277,6 @@@
          <FIELD NAME="backpackweburl" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
          <FIELD NAME="apiversion" TYPE="char" LENGTH="12" NOTNULL="true" DEFAULT="1.0" SEQUENCE="false"/>
          <FIELD NAME="sortorder" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
-         <FIELD NAME="password" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="Password to login into external backpack and issue badges."/>
          <FIELD NAME="oauth2_issuerid" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false" COMMENT="OAuth 2 Issuer"/>
        </FIELDS>
        <KEYS>
@@@ -4323,4 -4322,4 +4323,4 @@@
        </INDEXES>
      </TABLE>
    </TABLES>
- </XMLDB>
+ </XMLDB>

diff --combined lib/db/upgrade.php
index 249d23b,2497594..5237245
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2774,7 -2774,6 +2774,7 @@@ function xmldb_main_upgrade($oldversion
  
          // Add example field.
          $field = new xmldb_field('example', XMLDB_TYPE_TEXT, null, null, null, null, null, 'tutorial');
 +
          if (!$dbman->field_exists($table, $field)) {
              $dbman->add_field($table, $field);
          }
@@@ -2864,17 -2863,45 +2864,56 @@@
      }
  
      if ($oldversion < 2020102300.01) {
 -        global $DB, $CFG;
 +        // Define field downloadcontent to be added to course.
 +        $table = new xmldb_table('course');
 +        $field = new xmldb_field('downloadcontent', XMLDB_TYPE_INTEGER, '1', null, null, null, null, 'visibleold');
 +
 +        if (!$dbman->field_exists($table, $field)) {
 +            $dbman->add_field($table, $field);
 +        }
  
 -        upgrade_main_savepoint(true, 2020102300.01);
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2020102300.01);
 +    }
 +
++    if ($oldversion < 2020102300.02) {
+         $table = new xmldb_table('badge_backpack');
+         $uniquekey = new xmldb_key('backpackcredentials', XMLDB_KEY_UNIQUE, ['userid', 'externalbackpackid']);
+ 
+         // All external backpack providers/hosts are now exclusively stored in badge_external_backpack.
+         // All credentials are stored in badge_backpack and are unique per user, backpack.
+         if (!$dbman->find_key_name($table, $uniquekey)) {
+             $dbman->add_key($table, $uniquekey);
+         }
+ 
+         // If there is a current backpack set then copy it across to the new structure.
+         if ($CFG->badges_defaultissuercontact) {
+             // Get the currently used site backpacks.
+             $records = $DB->get_records_select('badge_external_backpack', "password IS NOT NULL AND password != ''");
+             $backpack = [
+                 'userid' => '0',
+                 'email' => $CFG->badges_defaultissuercontact,
+                 'backpackuid' => -1
+             ];
+ 
+             // Create records corresponding to the site backpacks.
+             foreach ($records as $record) {
+                 $backpack['password'] = $record->password;
+                 $backpack['externalbackpackid'] = $record->id;
+                 $DB->insert_record('badge_backpack', (object) $backpack);
+             }
+         }
+ 
+         // Drop the password field as this is moved to badge_backpack.
+         $table = new xmldb_table('badge_external_backpack');
+         $field = new xmldb_field('password', XMLDB_TYPE_CHAR, '50');
+         if ($dbman->field_exists($table, $field)) {
+             $dbman->drop_field($table, $field);
+         }
+ 
+         // Main savepoint reached.
++        upgrade_main_savepoint(true, 2020102300.02);
+     }
+ 
      return true;
  }

diff --combined version.php
index 3b91464,3b91464..2f08fc2
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
--$version  = 2020102300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2020102300.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  $release  = '3.10dev+ (Build: 20201023)';// Human-friendly version name