TW17194639 Using plugin config settings. (#15)

brickfield · Jul 5, 2021 · 71e522c · 71e522c
1 parent a9ea3ad
commit 71e522c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/classes/board.php b/classes/board.php
@@ -581,15 +581,15 @@ public static function board_note_update_attachment($noteid, $attachment) {
      * @return array
      */
     public static function board_add_note($columnid, $heading, $content, $attachment) {
-        global $DB, $USER, $CFG;
+        global $DB, $USER;
 
         $context = static::context_for_column($columnid);
         if ($context) {
             require_capability('mod/board:view', $context);
         }
 
         $heading = empty($heading) ? null : substr($heading, 0, 100);
-        $content = empty($content) ? "" : substr($content, 0, $CFG->post_max_length);
+        $content = empty($content) ? "" : substr($content, 0, get_config('mod_board', 'post_max_length'));
         $content = clean_text($content, FORMAT_HTML);
 
         $boardid = $DB->get_field('board_columns', 'boardid', array('id' => $columnid));
@@ -673,12 +673,12 @@ public static function board_add_note_log($boardid, $groupid, $heading, $content
      * @return array
      */
     public static function board_update_note($id, $heading, $content, $attachment) {
-        global $DB, $USER, $CFG;
+        global $DB, $USER;
 
         static::require_capability_for_note($id);
 
         $heading = empty($heading) ? null : substr($heading, 0, 100);
-        $content = empty($content) ? "" : substr($content, 0, $CFG->post_max_length);
+        $content = empty($content) ? "" : substr($content, 0, get_config('mod_board', 'post_max_length'));
         $content = clean_text($content, FORMAT_HTML);
 
         $note = static::get_note($id);

diff --git a/settings.php b/settings.php
@@ -17,26 +17,26 @@
 defined('MOODLE_INTERNAL') || die;
 
 if ($ADMIN->fulltree) {
-    $settings->add(new admin_setting_description('mod_board' . '/logo', '',
+    $settings->add(new admin_setting_description('mod_board/logo', '',
         html_writer::img($OUTPUT->image_url('brickfield-logo-small', 'mod_board'), 'logo',
             ['style' => 'display: block; margin: -50px auto -30px auto; float: right;'])));
 
-    $settings->add(new admin_setting_configtext('new_column_icon', get_string('new_column_icon', 'mod_board'),
+    $settings->add(new admin_setting_configtext('mod_board/new_column_icon', get_string('new_column_icon', 'mod_board'),
                        get_string('new_column_icon_desc', 'mod_board'), 'fa-plus', PARAM_RAW_TRIMMED));
 
-    $settings->add(new admin_setting_configtext('new_note_icon', get_string('new_note_icon', 'mod_board'),
+    $settings->add(new admin_setting_configtext('mod_board/new_note_icon', get_string('new_note_icon', 'mod_board'),
                        get_string('new_note_icon_desc', 'mod_board'), 'fa-plus', PARAM_RAW_TRIMMED));
 
     $options = array(
         1 => get_string('media_selection_buttons', 'mod_board'),
         2 => get_string('media_selection_dropdown', 'mod_board')
     );
-    $settings->add(new admin_setting_configselect('media_selection', get_string('media_selection', 'mod_board'),
+    $settings->add(new admin_setting_configselect('mod_board/media_selection', get_string('media_selection', 'mod_board'),
                        get_string('media_selection_desc', 'mod_board'), 1, $options));
 
-    $settings->add(new admin_setting_configtext('post_max_length', get_string('post_max_length', 'mod_board'),
+    $settings->add(new admin_setting_configtext('mod_board/post_max_length', get_string('post_max_length', 'mod_board'),
                        get_string('post_max_length_desc', 'mod_board'), 250, PARAM_INT));
 
-    $settings->add(new admin_setting_configtext('history_refresh', get_string('history_refresh', 'mod_board'),
+    $settings->add(new admin_setting_configtext('mod_board/history_refresh', get_string('history_refresh', 'mod_board'),
                        get_string('history_refresh_desc', 'mod_board'), 60, PARAM_INT));
 }
diff --git a/view.php b/view.php
@@ -43,15 +43,16 @@
 $pageurl = new moodle_url('/mod/board/view.php', array('id' => $cm->id));
 $PAGE->set_url($pageurl);
 
+$config = get_config('mod_board');
 $PAGE->requires->js_call_amd('mod_board/main', 'initialize', array('board' => $board, 'options' => array(
     'isEditor' => board::board_is_editor($board->id),
     'userId' => $USER->id,
     'readonly' => board::board_readonly($board->id),
-    'columnicon' => $CFG->new_column_icon,
-    'noteicon' => $CFG->new_note_icon,
-    'mediaselection' => $CFG->media_selection,
-    'post_max_length' => $CFG->post_max_length,
-    'history_refresh' => $CFG->history_refresh,
+    'columnicon' => $config->new_column_icon,
+    'noteicon' => $config->new_note_icon,
+    'mediaselection' => $config->media_selection,
+    'post_max_length' => $config->post_max_length,
+    'history_refresh' => $config->history_refresh,
     'file' => array(
         'extensions' => explode(',', ACCEPTED_FILE_EXTENSIONS),
         'size_min' => ACCEPTED_FILE_MIN_SIZE,