MDLSITE-7990: Fix dropdown menu, variable interpolation and amos-view styles

Author: Daniel Ureña

classes/contributor_selector.php

@@ -64,9 +64,9 @@ public function find_users($search) {
         $countfields = "SELECT COUNT(*)";
 
         $sql = " FROM {user} u
-                WHERE ${searchsql}";
+                WHERE $searchsql";
 
-        $order = " ORDER BY ${sortsql}";
+        $order = " ORDER BY $sortsql";
 
         if (!$this->is_validating()) {
             $foundcount = $DB->count_records_sql($countfields.$sql, array_merge($searchparams));

classes/maintainer_selector.php

@@ -67,9 +67,9 @@ public function find_users($search) {
         $countfields = "SELECT COUNT(*)";
 
         $sql = " FROM {user} u
-                WHERE u.id ${permsql} AND ${searchsql}";
+                WHERE u.id $permsql AND $searchsql";
 
-        $order = " ORDER BY ${sortsql}";
+        $order = " ORDER BY $sortsql";
 
         if (!$this->is_validating()) {
             $foundcount = $DB->count_records_sql($countfields.$sql, array_merge($permparams, $searchparams));

classes/stats_manager.php

@@ -125,9 +125,9 @@ public function write_buffer() {
 
         $sql = "SELECT id, branch, lang, component, numofstrings
                   FROM {amos_stats}
-                 WHERE branch ${sqlbranches}
-                   AND lang ${sqllangs}
-                   AND component ${sqlcomponents}";
+                 WHERE branch $sqlbranches
+                   AND lang $sqllangs
+                   AND component $sqlcomponents";
 
         $current = [];
         $rs = $DB->get_recordset_sql($sql, array_merge($parambranches, $paramlangs, $paramcomponents));
@@ -324,7 +324,7 @@ public function get_language_pack_ratio_stats(?int $vercode = null): array {
 
         $sql = "SELECT lang, SUM(numofstrings) AS totalnumofstrings
                   FROM {amos_stats}
-                 WHERE component ${standardsql}
+                 WHERE component $standardsql
                    AND branch = :vercode
               GROUP BY lang
               ORDER BY totalnumofstrings DESC, MAX(timemodified), lang";

renderer.php

@@ -282,7 +282,7 @@ protected function collapsible_stage_tool($title, $content, $helpicon = '', $exp
         }
 
         $attr['aria-controls'] = html_writer::random_id('collapse_');
-        $attr['data-toggle'] = 'collapse';
+        $attr['data-bs-toggle'] = 'collapse';
         $attr['data-target'] = '#'.$attr['aria-controls'];
 
         $output = html_writer::start_div('stagetool '.$extraclasses);