Remove checkpolicy #38

.travis.yml

@@ -31,9 +31,9 @@ env:
   - DB=mysqli MOODLE_BRANCH=master
 matrix:
     - php: 7.1
-      env: DB=pgsql MOODLE_BRANCH=master
+      env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
     - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=master
+      env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
     - php: 7.3
       env: DB=pgsql MOODLE_BRANCH=master
     - php: 7.3
@@ -45,16 +45,12 @@ matrix:
 before_install:
   - phpenv config-rm xdebug.ini
   - cd ../..
-  - if [ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]; then export BRANCH="MOODLE_38_STABLE"; else export BRANCH="master"; fi
-  - git clone --branch "$BRANCH" --mirror 'https://github.com/moodlehq/moodle-behat-extension.git' '/home/travis/.composer/cache/vcs/git-github.com-moodlehq-moodle-behat-extension.git/' || true
+  - git clone --mirror 'https://github.com/moodlehq/moodle-behat-extension.git' '/home/travis/.composer/cache/vcs/git-github.com-moodlehq-moodle-behat-extension.git/' || true
   - composer selfupdate
   - composer create-project -n --no-dev moodlerooms/moodle-plugin-ci ci ^1
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:
-  - if [ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]; then
-      moodle-plugin-ci add-plugin --branch 4.4 symfony/filesystem;
-    fi
   - moodle-plugin-ci install
 
 script:

README.md

@@ -55,6 +55,8 @@ Settings
 
 It is possible to force the the enrolment key as a required element for signing up.
 
+Users can be forced to confirm their account via email even when entering a valid token.
+
 Admin Usage
 -----------
 

auth.php

@@ -116,7 +116,7 @@ public function user_signup($user, $notify=true) {
         $user->picture = 0;
         $user->imagealt = 0;
         $user->deleted = 0;
-        $user->policyagreed = 0;
+        $user->policyagreed = (int)!get_config('auth_enrolkey', 'emailconfirmation');
         $user->id = user_create_user($user, false, false);
 
         // Save any custom profile field information.

lang/en/auth_enrolkey.php

@@ -30,7 +30,7 @@
 $string['settings_visible_title'] = 'Enable enrolment key element';
 $string['settings_required_title'] = 'Require enrolment key for validation';
 $string['settings_email_title'] = 'Require email confirmation';
-$string['settings_email_description'] = 'Require users confirm their account with an email before accessing enrolled courses.';
+$string['settings_email_description'] = 'Force users to confirm their account with an email before accessing enrolled courses.';
 $string['signup_failure'] = 'Opps! Something went wrong, and you may not have been enrolled properly. Go to <a href="{$a->href}">Home</a>';
 $string['signup_field_title'] = 'Enrolment key';
 $string['signup_token_invalid'] = 'The enrolment key you have entered is invalid';

version.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2020022800;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = 2020022800;        // Match release exactly to version.
+$plugin->version   = 2020030200;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = 2020030200;        // Match release exactly to version.
 $plugin->requires  = 2014051200;        // Requires this Moodle version. (2.7+)
 $plugin->component = 'auth_enrolkey';      // Full name of the plugin (used for diagnostics).
 $plugin->maturity  = MATURITY_STABLE;