From d5ec7b556429157617c4fce8331758e4c7a25e5c Mon Sep 17 00:00:00 2001
From: Ryan Smith <3045513+ryansmith94@users.noreply.github.com>
Date: Tue, 17 Jul 2018 12:36:02 +0100
Subject: [PATCH] fix: Fixes the duplicate username setting from #181 to close
#188. (#189)
---
classes/log/store.php | 2 +-
lang/en/logstore_xapi.php | 4 ++--
settings.php | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/classes/log/store.php b/classes/log/store.php
index fea0d58..9cf20f9 100755
--- a/classes/log/store.php
+++ b/classes/log/store.php
@@ -97,7 +97,7 @@ class store extends php_obj implements log_writer {
'source_lang' => 'en',
'send_mbox' => $this->get_config('mbox', false),
'send_short_course_id' => $this->get_config('shortcourseid', false),
- 'send_username' => $this->get_config('username', false),
+ 'send_username' => $this->get_config('send_username', false),
'plugin_url' => 'https://github.com/xAPI-vle/moodle-logstore_xapi',
'plugin_version' => $plugin->release,
'repo' => new \src\transformer\repos\MoodleRepository($DB),
diff --git a/lang/en/logstore_xapi.php b/lang/en/logstore_xapi.php
index 66ca3dc..20241bd 100644
--- a/lang/en/logstore_xapi.php
+++ b/lang/en/logstore_xapi.php
@@ -41,7 +41,7 @@ $string['logguests'] = 'Log guest actions';
$string['filters_help'] = 'Enable filters that INCLUDE some actions to be logged.';
$string['mbox'] = 'Identify users by email';
$string['mbox_desc'] = 'Statements will identify users with their email (mbox) when this box is ticked.';
-$string['username'] = 'Identify users by id';
-$string['username_desc'] = 'Statements will identify users with their username when this box is ticked, but only if identifying users by email is disabled.';
+$string['send_username'] = 'Identify users by id';
+$string['send_username_desc'] = 'Statements will identify users with their username when this box is ticked, but only if identifying users by email is disabled.';
$string['shortcourseid'] = 'Send short course name';
$string['shortcourseid_desc'] = 'Statements will contain the shortname for a course as a short course id extension';
diff --git a/settings.php b/settings.php
index b1f79ff..1266ff6 100644
--- a/settings.php
+++ b/settings.php
@@ -47,9 +47,9 @@ if ($hassiteconfig) {
get_string('shortcourseid', 'logstore_xapi'),
get_string('shortcourseid_desc', 'logstore_xapi'), 0));
- $settings->add(new admin_setting_configcheckbox('logstore_xapi/username',
- get_string('username', 'logstore_xapi'),
- get_string('username_desc', 'logstore_xapi'), 0));
+ $settings->add(new admin_setting_configcheckbox('logstore_xapi/send_username',
+ get_string('send_username', 'logstore_xapi'),
+ get_string('send_username_desc', 'logstore_xapi'), 0));
// Filters.
$settings->add(new admin_setting_heading('filters',
--
GitLab