Merge branch 'MDL-74710-400' of https://github.com/ilyatregubov/moodle …

…into MOODLE_400_STABLE
moodle · Jun 7, 2022 · 264d428 · 264d428
2 parents a91c937 + 72bdc37
commit 264d428
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/mod/bigbluebuttonbn/classes/settings.php b/mod/bigbluebuttonbn/classes/settings.php
@@ -50,6 +50,9 @@ class settings {
     /** @var string The name of the section */
     private $section;
 
+    /** @var string The parent name */
+    private $parent = "modbigbluebuttonbnfolder";
+
     /** @var string The section name prefix */
     private $sectionnameprefix = "mod_bigbluebuttonbn";
 
@@ -66,15 +69,15 @@ public function __construct(admin_category $admin, \core\plugininfo\mod $module,
         $this->section = $categoryname;
 
         $modbigbluebuttobnfolder = new admin_category(
-            $categoryname,
+            $this->parent,
             new lang_string('pluginname', 'mod_bigbluebuttonbn'),
             $module->is_enabled() === false
         );
 
         $admin->add('modsettings', $modbigbluebuttobnfolder);
 
         $mainsettings = $this->add_general_settings();
-        $admin->add($categoryname, $mainsettings);
+        $admin->add($this->parent, $mainsettings);
     }
 
     /**
@@ -132,7 +135,7 @@ protected function add_conditional_element(string $name, admin_setting $item, ad
      */
     protected function add_general_settings(): admin_settingpage {
         $settingsgeneral = new admin_settingpage(
-            "{$this->sectionnameprefix}_general",
+            $this->section,
             get_string('config_general', 'bigbluebuttonbn'),
             'moodle/site:config',
             !((boolean) setting_validator::section_general_shown()) && ($this->moduleenabled)
@@ -319,7 +322,7 @@ protected function add_record_settings(): void {
                 $recordingsetting
             );
         }
-        $this->admin->add($this->section, $recordingsetting);
+        $this->admin->add($this->parent, $recordingsetting);
     }
 
     /**
@@ -364,7 +367,7 @@ protected function add_importrecordings_settings(): void {
                 $importrecordingsettings
             );
         }
-        $this->admin->add($this->section, $importrecordingsettings);
+        $this->admin->add($this->parent, $importrecordingsettings);
     }
 
     /**
@@ -475,7 +478,7 @@ protected function add_showrecordings_settings(): void {
                 $showrecordingsettings
             );
         }
-        $this->admin->add($this->section, $showrecordingsettings);
+        $this->admin->add($this->parent, $showrecordingsettings);
     }
 
     /**
@@ -544,7 +547,7 @@ protected function add_waitmoderator_settings(): void {
                 $waitmoderatorsettings
             );
         }
-        $this->admin->add($this->section, $waitmoderatorsettings);
+        $this->admin->add($this->parent, $waitmoderatorsettings);
     }
 
     /**
@@ -578,7 +581,7 @@ protected function add_voicebridge_settings(): void {
                 $voicebridgesettings
             );
         }
-        $this->admin->add($this->section, $voicebridgesettings);
+        $this->admin->add($this->parent, $voicebridgesettings);
     }
 
     /**
@@ -632,7 +635,7 @@ protected function add_preupload_settings(): void {
 
             $preuploadsettings->add($filemanager);
         }
-        $this->admin->add($this->section, $preuploadsettings);
+        $this->admin->add($this->parent, $preuploadsettings);
     }
 
     /**
@@ -678,7 +681,7 @@ protected function add_userlimit_settings(): void {
                 $userlimitsettings
             );
         }
-        $this->admin->add($this->section, $userlimitsettings);
+        $this->admin->add($this->parent, $userlimitsettings);
     }
 
     /**
@@ -719,7 +722,7 @@ protected function add_participants_settings(): void {
                 $participantsettings
             );
         }
-        $this->admin->add($this->section, $participantsettings);
+        $this->admin->add($this->parent, $participantsettings);
     }
 
     /**
@@ -764,7 +767,7 @@ protected function add_muteonstart_settings(): void {
                 $muteonstartsetting
             );
         }
-        $this->admin->add($this->section, $muteonstartsetting);
+        $this->admin->add($this->parent, $muteonstartsetting);
     }
 
     /**
@@ -787,7 +790,7 @@ protected function add_lock_settings(): void {
             $this->add_lock_setting_from_name('hideuserlist', $lockingsetting);
             $this->add_lock_setting_from_name('lockonjoin', $lockingsetting);
         }
-        $this->admin->add($this->section, $lockingsetting);
+        $this->admin->add($this->parent, $lockingsetting);
     }
 
     /**
@@ -857,7 +860,7 @@ protected function add_extended_settings(): void {
                 $extendedcapabilitiessetting
             );
         }
-        $this->admin->add($this->section, $extendedcapabilitiessetting);
+        $this->admin->add($this->parent, $extendedcapabilitiessetting);
         // Configuration for extended BN capabilities should go here.
     }
 
@@ -893,7 +896,7 @@ protected function add_experimental_settings(): void {
                 $experimentalfeaturessetting
             );
         }
-        $this->admin->add($this->section, $experimentalfeaturessetting);
+        $this->admin->add($this->parent, $experimentalfeaturessetting);
     }
 
     /**