MDL-41497 enrol_database: Added help text for using odbc dsn names in…

…stead
moodle · Aug 30, 2013 · 1d2f1fe · 1d2f1fe
1 parent dd99fdd
commit 1d2f1fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/enrol/database/lang/en/enrol_database.php b/enrol/database/lang/en/enrol_database.php
@@ -25,8 +25,9 @@
 $string['database:unenrol'] = 'Unenrol suspended users';
 $string['dbencoding'] = 'Database encoding';
 $string['dbhost'] = 'Database host';
-$string['dbhost_desc'] = 'Type database server IP address or host name';
+$string['dbhost_desc'] = 'Type database server IP address or host name. Use a system DSN name if using ODBC.';
 $string['dbname'] = 'Database name';
+$string['dbname_desc'] = 'Leave empty if using a DSN name in database host.';
 $string['dbpass'] = 'Database password';
 $string['dbsetupsql'] = 'Database setup command';
 $string['dbsetupsql_desc'] = 'SQL command for special database setup, often used to setup communication encoding - example for MySQL and PostgreSQL: <em>SET NAMES \'utf8\'</em>';

diff --git a/enrol/database/settings.php b/enrol/database/settings.php
@@ -41,7 +41,7 @@
 
     $settings->add(new admin_setting_configpasswordunmask('enrol_database/dbpass', get_string('dbpass', 'enrol_database'), '', ''));
 
-    $settings->add(new admin_setting_configtext('enrol_database/dbname', get_string('dbname', 'enrol_database'), '', ''));
+    $settings->add(new admin_setting_configtext('enrol_database/dbname', get_string('dbname', 'enrol_database'), get_string('dbname_desc', 'enrol_database'), ''));
 
     $settings->add(new admin_setting_configtext('enrol_database/dbencoding', get_string('dbencoding', 'enrol_database'), '', 'utf-8'));