WebSVN – Moodle – Diff – /mod/glossary/lib.php

 // Glossary displayformats.
 define('GLOSSARY_CONTINUOUS', 'continuous');
 define('GLOSSARY_DICTIONARY', 'dictionary');
 define('GLOSSARY_FULLWITHOUTAUTHOR', 'fullwithoutauthor');
-require_once(__DIR__ . '/deprecatedlib.php');
 /// STANDARD FUNCTIONS ///////////////////////////////////////////////////////////
 /**
  * @global object
  * @param object $glossary
     return grade_update('mod/glossary', $glossary->course, 'mod', 'glossary', $glossary->id, 0, NULL, array('deleted'=>1));
+}
-/**
- * @deprecated since Moodle 3.8
- */
-function glossary_scale_used() {
-    throw new coding_exception('glossary_scale_used() can not be used anymore. Plugins can implement ' .
-        '<modname>_scale_used_anywhere, all implementations of <modname>_scale_used are now ignored');
-}
 /**
  * Checks if scale is being used by any instance of glossary
+ *
  * This is used to find out if scale used anywhere
     $icons   = '';
     if ($printicons) {
         $icons   = glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode, $hook,'html');
+    }
     if ($aliases || $icons || !empty($entry->rating)) {
-        echo '<table>';
+        echo '<table class="table-reboot">';
         if ( $aliases ) {
             $id = "keyword-{$entry->id}";
-            echo '<tr valign="top"><td class="aliases">' .
+            echo '<tr valign="top"><td class="aliases hstack gap-2">' .
                 '<label for="' . $id . '">' . get_string('aliases', 'glossary') . ': </label>' .
                 $aliases . '</td></tr>';
+        }
         if ($icons) {
             echo '<tr valign="top"><td class="icons">'.$icons.'</td></tr>';
 function  glossary_print_entry_approval($cm, $entry, $mode, $align="right", $insidetable=true) {
     global $CFG, $OUTPUT;
     if ($mode == 'approval' and !$entry->approved) {
         if ($insidetable) {
-            echo '<table class="glossaryapproval" align="'.$align.'"><tr><td align="'.$align.'">';
+            echo '<table class="glossaryapproval table-reboot" align="' . $align . '"><tr><td align="' . $align . '">';
+        }
         echo $OUTPUT->action_icon(
             new moodle_url('approve.php', array('eid' => $entry->id, 'mode' => $mode, 'sesskey' => sesskey())),
             new pix_icon('t/approve', get_string('approve','glossary'), '',
     foreach ($searchterms as $searchterm) {
         $i++;
+        // Initially we aren't going to perform NOT LIKE searches, only MSSQL
-        $NOT = false; /// Initially we aren't going to perform NOT LIKE searches, only MSSQL and Oracle
+        // will use it to simulate the "-" operator with LIKE clause.
-                   /// will use it to simulate the "-" operator with LIKE clause
+        $NOT = false;
-    /// Under Oracle and MSSQL, trim the + and - operators and perform
+        // Under MSSQL, trim the + and - operators and perform
-    /// simpler LIKE (or NOT LIKE) queries
+        // simpler LIKE (or NOT LIKE) queries
         if (!$DB->sql_regex_supported()) {
     glossary_print_alphabet_links($cm, $glossary, $mode, $hook,$sortkey, $sortorder);
     glossary_print_all_links($cm, $glossary, $mode, $hook);
-    glossary_print_sorting_links($cm, $mode, 'CREATION', 'asc');
+    glossary_print_sorting_links($cm, $mode, $sortkey, $sortorder);
+}
 /**
     // Prepare format_string/text options
     $fmtoptions = array(
         'context' => $context);
-     echo '<table border="0" width="100%">';
+     echo '<table class="table-reboot" border="0" width="100%">';
      echo '<tr>';
     $asc    = get_string("ascending","glossary");
     $desc   = get_string("descending","glossary");
     $bopen  = '<b>';
     $bclose = '</b>';
-     $neworder = '';
+    $neworder = '';
-     $currentorder = '';
+    $currentorder = '';
+    $currentsort = '';
+    if ($sortkey === '') {
+        $sortkey = 'CREATION';
+    }
      $currentsort = '';
      if ( $sortorder ) {
          if ( $sortorder == 'asc' ) {
              $currentorder = $asc;
              $neworder = '&amp;sortorder=desc';
              $newordertitle = $desc;
              $neworder = '&amp;sortorder=desc';
              $icon = " " . $OUTPUT->pix_icon('asc', $newordertitle, 'glossary');
+         }
+     }
-     $ficon     = '';
-     $fneworder = '';
-     $fbtag     = '';
-     $fendbtag  = '';
-     $sicon     = '';
-     $sneworder = '';
-     $sbtag      = '';
-     $fbtag      = '';
-     $fendbtag      = '';
-     $sendbtag      = '';
+    $ficon     = '';
+    $fneworder = '';
+    $sicon     = '';
+    $sneworder = '';
+    $sbtag      = '';
+    $fbtag      = '';
+    $fendbtag      = '';
-     $sendbtag  = '';
+    $sendbtag  = '';
      if ( $sortkey == 'CREATION' or $sortkey == 'FIRSTNAME' ) {
          $ficon       = $icon;
  */
 function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) {
     global $USER, $CFG, $DB;
     echo '<div class="boxaligncenter">';
-    echo '<table class="glossarypopup" cellspacing="0"><tr>';
+    echo '<table class="glossarypopup table-reboot" cellspacing="0"><tr>';
     echo '<td>';
     if ( $entries ) {
         foreach ( $entries as $entry ) {
             if (! $glossary = $DB->get_record('glossary', array('id'=>$entry->glossaryid))) {
                 if ( $entry->approved and $permissiongranted ) {
                     $co .= glossary_start_tag("ENTRY",3,true);
                     $co .= glossary_full_tag("CONCEPT",4,false,trim($entry->concept));
                     $co .= glossary_full_tag("DEFINITION",4,false,$entry->definition);
                     $co .= glossary_full_tag("FORMAT",4,false,$entry->definitionformat); // note: use old name for BC reasons
+                    $co .= glossary_full_tag('DEFINITIONTRUST', 4, false, $entry->definitiontrust);
                     $co .= glossary_full_tag("USEDYNALINK",4,false,$entry->usedynalink);
                     $co .= glossary_full_tag("CASESENSITIVE",4,false,$entry->casesensitive);
                     $co .= glossary_full_tag("FULLMATCH",4,false,$entry->fullmatch);
                     $co .= glossary_full_tag("TEACHERENTRY",4,false,$entry->teacherentry);
  * whether the course reset functionality affects the glossary.
  * @param MoodleQuickForm $mform form passed by reference
  */
 function glossary_reset_course_form_definition(&$mform) {
     $mform->addElement('header', 'glossaryheader', get_string('modulenameplural', 'glossary'));
+    $mform->addElement('static', 'glossarydelete', get_string('delete'));
     $mform->addElement('checkbox', 'reset_glossary_all', get_string('resetglossariesall','glossary'));
     $mform->addElement('select', 'reset_glossary_types', get_string('resetglossaries', 'glossary'),
-                       array('main'=>get_string('mainglossary', 'glossary'), 'secondary'=>get_string('secondaryglossary', 'glossary')), array('multiple' => 'multiple'));
-    $mform->setAdvanced('reset_glossary_types');
+                       array('main'=>get_string('mainglossary', 'glossary'), 'secondary'=>get_string('secondaryglossary', 'glossary')), array('multiple' => 'multiple'));
-    $mform->disabledIf('reset_glossary_types', 'reset_glossary_all', 'checked');
+    $mform->hideIf('reset_glossary_types', 'reset_glossary_all', 'checked');
     $mform->addElement('checkbox', 'reset_glossary_notenrolled', get_string('deletenotenrolled', 'glossary'));
-    $mform->disabledIf('reset_glossary_notenrolled', 'reset_glossary_all', 'checked');
+    $mform->hideIf('reset_glossary_notenrolled', 'reset_glossary_all', 'checked');
     $mform->addElement('checkbox', 'reset_glossary_ratings', get_string('deleteallratings'));
-    $mform->disabledIf('reset_glossary_ratings', 'reset_glossary_all', 'checked');
+    $mform->hideIf('reset_glossary_ratings', 'reset_glossary_all', 'checked');
     $mform->addElement('checkbox', 'reset_glossary_comments', get_string('deleteallcomments'));
-    $mform->disabledIf('reset_glossary_comments', 'reset_glossary_all', 'checked');
+    $mform->hideIf('reset_glossary_comments', 'reset_glossary_all', 'checked');
     $mform->addElement('checkbox', 'reset_glossary_tags', get_string('removeallglossarytags', 'glossary'));
 function glossary_reset_userdata($data) {
     global $CFG, $DB;
     require_once($CFG->dirroot.'/rating/lib.php');
     $componentstr = get_string('modulenameplural', 'glossary');
-    $status = array();
+    $status = [];
     $allentriessql = "SELECT e.id
                         FROM {glossary_entries} e
                              JOIN {glossary} g ON e.glossaryid = g.id
                        WHERE g.course = ?";
     $allglossariessql = "SELECT g.id
                            FROM {glossary} g
                           WHERE g.course = ?";
-    $params = array($data->courseid);
+    $params = [$data->courseid];
     $fs = get_file_storage();
     $rm = new rating_manager();
     $ratingdeloptions = new stdClass;
     $ratingdeloptions->component = 'mod_glossary';
     $ratingdeloptions->ratingarea = 'entry';
-    // delete entries if requested
+    // Delete entries if requested.
     if (!empty($data->reset_glossary_all)
          or (!empty($data->reset_glossary_types) and in_array('main', $data->reset_glossary_types) and in_array('secondary', $data->reset_glossary_types))) {
         $params[] = 'glossary_entry';
         $DB->delete_records_select('comments', "itemid IN ($allentriessql) AND commentarea=?", $params);
         $DB->delete_records_select('glossary_alias',    "entryid IN ($allentriessql)", $params);
         $DB->delete_records_select('glossary_entries', "glossaryid IN ($allglossariessql)", $params);
-        // now get rid of all attachments
+        // Now get rid of all attachments.
         if ($glossaries = $DB->get_records_sql($allglossariessql, $params)) {
             foreach ($glossaries as $glossaryid=>$unused) {
                 if (!$cm = get_coursemodule_from_instance('glossary', $glossaryid)) {
                     continue;
                 }
                 $context = context_module::instance($cm->id);
                 $fs->delete_area_files($context->id, 'mod_glossary', 'attachment');
+                // Delete ratings.
+                $ratingdeloptions->contextid = $context->id;
-                //delete ratings
+                $rm->delete_ratings($ratingdeloptions);
+                core_tag_tag::delete_instances('mod_glossary', null, $context->id);
                 $ratingdeloptions->contextid = $context->id;
-                $rm->delete_ratings($ratingdeloptions);
+        }
-                core_tag_tag::delete_instances('mod_glossary', null, $context->id);
+        // Remove all grades from gradebook.
         if (empty($data->reset_gradebook_grades)) {
             glossary_reset_gradebook($data->courseid);
+        }
         // remove all grades from gradebook
                         continue;
+                    }
                     $context = context_module::instance($cm->id);
                     $fs->delete_area_files($context->id, 'mod_glossary', 'attachment');
-                    //delete ratings
+                    // Delete ratings.
                     $ratingdeloptions->contextid = $context->id;
                     $rm->delete_ratings($ratingdeloptions);
                     core_tag_tag::delete_instances('mod_glossary', null, $context->id);
                 }
+            }
-            // remove all grades from gradebook
+            // Remove all grades from gradebook.
+            if (empty($data->reset_gradebook_grades)) {
+                glossary_reset_gradebook($data->courseid, 'main');
-            if (empty($data->reset_gradebook_grades)) {
+            }
+            $status[] = [
-                glossary_reset_gradebook($data->courseid, 'main');
+                'component' => $componentstr,
                 'item' => get_string('resetglossaries', 'glossary').': '.get_string('mainglossary', 'glossary'),
                 'error' => false,
-            $status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossaries', 'glossary').': '.get_string('mainglossary', 'glossary'), 'error'=>false);
+            ];
         } else if (in_array('secondary', $data->reset_glossary_types)) {
             $params[] = 'glossary_entry';
             $DB->delete_records_select('comments', "itemid IN ($secondaryentriessql) AND commentarea=?", $params);
             $DB->delete_records_select('glossary_entries', "glossaryid IN ($secondaryglossariessql)", $params);
                         continue;
+                    }
                     $context = context_module::instance($cm->id);
                     $fs->delete_area_files($context->id, 'mod_glossary', 'attachment');
-                    //delete ratings
+                    // Delete ratings.
                     $ratingdeloptions->contextid = $context->id;
                     $rm->delete_ratings($ratingdeloptions);
                     core_tag_tag::delete_instances('mod_glossary', null, $context->id);
                 }
+            }
-            // remove all grades from gradebook
+            // Remove all grades from gradebook.
+            if (empty($data->reset_gradebook_grades)) {
+                glossary_reset_gradebook($data->courseid, 'secondary');
-            if (empty($data->reset_gradebook_grades)) {
+            }
+            $status[] = [
-                glossary_reset_gradebook($data->courseid, 'secondary');
+                'component' => $componentstr,
                 'item' => get_string('resetglossaries', 'glossary').': '.get_string('secondaryglossary', 'glossary'),
+                'error' => false,
-            $status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossaries', 'glossary').': '.get_string('secondaryglossary', 'glossary'), 'error'=>false);
+            ];
+        }
+    }
-    // remove entries by users not enrolled into course
+    // Remove entries by users not enrolled into course.
     if (!empty($data->reset_glossary_notenrolled)) {
         $entriessql = "SELECT e.id, e.userid, e.glossaryid, u.id AS userexists, u.deleted AS userdeleted
                          FROM {glossary_entries} e
                               JOIN {glossary} g ON e.glossaryid = g.id
                               LEFT JOIN {user} u ON e.userid = u.id
                         WHERE g.course = ? AND e.userid > 0";
-        $course_context = context_course::instance($data->courseid);
+        $coursecontext = context_course::instance($data->courseid);
-        $notenrolled = array();
+        $notenrolled = [];
         $rs = $DB->get_recordset_sql($entriessql, $params);
         if ($rs->valid()) {
             foreach ($rs as $entry) {
-                if (array_key_exists($entry->userid, $notenrolled) or !$entry->userexists or $entry->userdeleted
+                if (array_key_exists($entry->userid, $notenrolled) || !$entry->userexists || $entry->userdeleted
                         $ratingdeloptions->contextid = $context->id;
                         $rm->delete_ratings($ratingdeloptions);
+                    }
+                }
+            }
+            $status[] = [
+                'component' => $componentstr,
-            $status[] = array('component'=>$componentstr, 'item'=>get_string('deletenotenrolled', 'glossary'), 'error'=>false);
+                'item' => get_string('deletenotenrolled', 'glossary'),
+                'error' => false,
+            ];
+        }
         $rs->close();
+    }
-    // remove all ratings
+    // Remove all ratings.
     if (!empty($data->reset_glossary_ratings)) {
-        //remove ratings
+        // Remove ratings.
         if ($glossaries = $DB->get_records_sql($allglossariessql, $params)) {
             foreach ($glossaries as $glossaryid=>$unused) {
                 if (!$cm = get_coursemodule_from_instance('glossary', $glossaryid)) {
                     continue;
+                }
                 $context = context_module::instance($cm->id);
-                //delete ratings
+                // Delete ratings.
                 $ratingdeloptions->contextid = $context->id;
                 $rm->delete_ratings($ratingdeloptions);
             }
+        }
-        // remove all grades from gradebook
+        // Remove all grades from gradebook.
+        if (empty($data->reset_gradebook_grades)) {
+            glossary_reset_gradebook($data->courseid);
-        if (empty($data->reset_gradebook_grades)) {
+        }
+        $status[] = [
+            'component' => $componentstr,
-            glossary_reset_gradebook($data->courseid);
+            'item' => get_string('deleteallratings'),
-        }
+            'error' => false,
-        $status[] = array('component'=>$componentstr, 'item'=>get_string('deleteallratings'), 'error'=>false);
+        ];
+    }
+    // Remove comments.
+    if (!empty($data->reset_glossary_comments)) {
-    // remove comments
+        $params[] = 'glossary_entry';
+        $DB->delete_records_select('comments', "itemid IN ($allentriessql) AND commentarea= ? ", $params);
+        $status[] = [
-    if (!empty($data->reset_glossary_comments)) {
+            'component' => $componentstr,
-        $params[] = 'glossary_entry';
+            'item' => get_string('deleteallcomments'),
-        $DB->delete_records_select('comments', "itemid IN ($allentriessql) AND commentarea= ? ", $params);
+            'error' => false,
-        $status[] = array('component'=>$componentstr, 'item'=>get_string('deleteallcomments'), 'error'=>false);
+        ];
                 $context = context_module::instance($cm->id);
                 core_tag_tag::delete_instances('mod_glossary', null, $context->id);
+            }
+        }
+        $status[] = [
+            'component' => $componentstr,
+            'item' => get_string('removeallglossarytags', 'glossary'),
+            'error' => false,
-        $status[] = array('component' => $componentstr, 'item' => get_string('tagsdeleted', 'glossary'), 'error' => false);
+        ];
     }
-    /// updating dates - shift may be negative too
+    // Updating dates - shift may be negative too.
     if ($data->timeshift) {
         // Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
+        // See MDL-9367.
+        shift_course_mod_dates('glossary', ['assesstimestart', 'assesstimefinish'], $data->timeshift, $data->courseid);
-        // See MDL-9367.
+        $status[] = [
+            'component' => $componentstr,
+            'item' => get_string('date'),
-        shift_course_mod_dates('glossary', array('assesstimestart', 'assesstimefinish'), $data->timeshift, $data->courseid);
+            'error' => false,
-        $status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged'), 'error'=>false);
+        ];
+    }
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_letter($glossary, $context, $letter, $from, $limit, $options = array()) {
-    $qb = new mod_glossary_entry_query_builder($glossary);
-    if ($letter != 'ALL' && $letter != 'SPECIAL' && core_text::strlen($letter)) {
-        $qb->filter_by_concept_letter($letter);
-    }
-    if ($letter == 'SPECIAL') {
-        $qb->filter_by_concept_non_letter();
     $qb = new mod_glossary_entry_query_builder($glossary);
     if (!empty($options['includenotapproved']) && has_capability('mod/glossary:approve', $context)) {
         $qb->filter_by_non_approved(mod_glossary_entry_query_builder::NON_APPROVED_ALL);
     $qb->add_field('*', 'entries');
     $qb->join_user();
     $qb->add_user_fields();
     $qb->order_by('concept', 'entries');
     $qb->order_by('id', 'entries', 'ASC'); // Sort on ID to avoid random ordering when entries share an ordering value.
-    $qb->limit($from, $limit);
-    // Fetching the entries.
-    $count = $qb->count_records();
+    // Fetching the entries. Those are all entries.
+    $entries = $qb->get_records();
+    // Now sorting out the array.
+    $filteredentries = [];
+    if ($letter != 'ALL' && $letter != 'SPECIAL' && core_text::strlen($letter)) {
+        // Build a new array with the filtered entries.
+        foreach ($entries as $key => $entry) {
+            if (strtoupper(substr(format_string($entry->concept), 0, 1)) === strtoupper($letter)) {
+                // Add it when starting with the correct letter.
+                $filteredentries[$key] = $entry;
+            }
+        }
+        $entries = $filteredentries;
+    }
+    if ($letter == 'SPECIAL') {
+        // Build a new array with the filtered entries.
+        foreach ($entries as $key => $entry) {
+            if (!ctype_alpha(substr(format_string($entry->concept), 0, 1))) {
+                // Add it when starting with a non-letter character.
+                $filteredentries[$key] = $entry;
+            }
+        }
+        $entries = $filteredentries;
+    }
+    if ($letter == 'ALL') {
+        // No filtering needed.
+        $filteredentries = $entries;
+    }
+    // Now sort the array in regard to the current language.
+    usort($filteredentries, function($a, $b) {
+        return format_string($a->concept) <=> format_string($b->concept);
+    });
+    // Size of the overall array.
+    $count = count($entries);
+    // Now applying limit.
+    if (isset($limit)) {
+        if (isset($from)) {
+            $entries = array_slice($filteredentries, $from, $limit);
+        } else {
+            $entries = array_slice($filteredentries);
+        }
+    } else {
+        $entries = $filteredentries;
     $entries = $qb->get_records();
     return array($entries, $count);
+}
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_date($glossary, $context, $order, $sort, $from, $limit, $options = array()) {
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_category($glossary, $context, $categoryid, $from, $limit, $options = array()) {
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_author($glossary, $context, $letter, $field, $sort, $from, $limit, $options = array()) {
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_author_id($glossary, $context, $authorid, $order, $sort, $from, $limit, $options = array()) {
  * @param  int $limit Number of records to fetch.
  * @param  int $from Fetch records from.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes self even if all of their entries require approval.
  *                          When true, also includes authors only having entries pending approval.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_authors($glossary, $context, $limit, $from, $options = array()) {
     global $DB, $USER;
  * Returns the categories of a glossary.
+ *
  * @param  object $glossary The glossary.
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
- * @return array The first element being the recordset, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_categories($glossary, $from, $limit) {
     global $DB;
     $conditions = array();
     foreach ($terms as $searchterm) {
         $i++;
-        $not = false; // Initially we aren't going to perform NOT LIKE searches, only MSSQL and Oracle
+        $not = false; // Initially we aren't going to perform NOT LIKE searches, only MSSQL
                       // will use it to simulate the "-" operator with LIKE clause.
             // With fullsearch enabled, look also within definitions.
             $concat = $DB->sql_concat('ge.concept', "' '", 'ge.definition', "' '", "COALESCE(al.alias, :emptychar{$i})");
+        }
         $params['emptychar' . $i] = '';
-        // Under Oracle and MSSQL, trim the + and - operators and perform simpler LIKE (or NOT LIKE) queries.
+        // Under MSSQL, trim the + and - operators and perform simpler LIKE (or NOT LIKE) queries.
         if (!$DB->sql_regex_supported()) {
             if (substr($searchterm, 0, 1) === '-') {
                 $not = true;
+            }
  * @param  int $from Fetch records from.
  * @param  int $limit Number of records to fetch.
  * @param  array $options Accepts:
  *                        - (bool) includenotapproved. When false, includes the non-approved entries created by
  *                          the current user. When true, also includes the ones that the user has the permission to approve.
- * @return array The first element being the array of results, the second the number of entries.
+ * @return array The first element being the recordset (taking into account the limit), the second the number of entries the overall
+ *               array has.
  * @since Moodle 3.1
  */
 function glossary_get_entries_by_search($glossary, $context, $query, $fullsearch, $order, $sort, $from, $limit,
                                         $options = array()) {
     global $DB, $USER;
     } else {
         $qb->filter_by_non_approved(mod_glossary_entry_query_builder::NON_APPROVED_SELF);
+    }
+    $qb->add_field('*', 'entries');
-    $qb->add_field('*', 'entries');
+    $qb->add_field('alias', 'alias');
     $qb->join_alias();
     $qb->join_user();
     $qb->add_user_fields();
     $qb->filter_by_term($term);
-    $qb->order_by('concept', 'entries');
-    $qb->order_by('id', 'entries');     // Sort on ID to avoid random ordering when entries share an ordering value.
+    $qb->order_by('concept', 'entries');
-    $qb->limit($from, $limit);
     $qb->order_by('id', 'entries');     // Sort on ID to avoid random ordering when entries share an ordering value.
+    // Fetching the entries. Those are all entries.
+    $entries = $qb->get_records();
+    // Now sorting out the array.
+    $filteredentries = [];
+    // Now sorting out the array.
+    foreach ($entries as $key => $entry) {
+        if (strtoupper(format_string($entry->concept)) === strtoupper($term)) {
+            // Add it when matching concept or alias.
+            $filteredentries[$key] = $entry;
+        }
+        if ((isset($entry->alias)) && (strtoupper(format_string($entry->alias)) === strtoupper($term))) {
+            // Add it when matching concept or alias.
+            $filteredentries[$key] = $entry;
+        }
+    }
+    $entries = $filteredentries;
+    // Check whether concept or alias match the term.
+    // Now sort the array in regard to the current language.
+    usort($filteredentries, function($a, $b) {
+        return format_string($a->concept) <=> format_string($b->concept);
+    });
+    // Size of the overall array.
+    $count = count($entries);
+    // Now applying limit.
+    if (isset($limit)) {
+        if (isset($from)) {
+            $entries = array_slice($filteredentries, $from, $limit);
+        } else {
+            $entries = array_slice($filteredentries);
+        }
-    // Fetching the entries.
+    } else {
-    $count = $qb->count_records();
+        $entries = $filteredentries;
     $entries = $qb->get_records();
  * @since Moodle 3.1
  */
 function glossary_get_entries_to_approve($glossary, $context, $letter, $order, $sort, $from, $limit) {
-    $qb = new mod_glossary_entry_query_builder($glossary);
-    if ($letter != 'ALL' && $letter != 'SPECIAL' && core_text::strlen($letter)) {
-        $qb->filter_by_concept_letter($letter);
-    }
-    if ($letter == 'SPECIAL') {
-        $qb->filter_by_concept_non_letter();
     $qb = new mod_glossary_entry_query_builder($glossary);
     $qb->add_field('*', 'entries');
     $qb->join_user();
+    $qb->add_user_fields();
+    $qb->filter_by_non_approved(mod_glossary_entry_query_builder::NON_APPROVED_ONLY);
+    // Fetching the entries. Those are all non approved entries.
+    $entries = $qb->get_records();
+    // Size of the overall array.
+    $count = count($entries);
+    // If a some filter is set, restrict by that filter.
+    $filteredentries = [];
+    if ($letter != 'ALL' && $letter != 'SPECIAL' && core_text::strlen($letter)) {
+        // Build a new array with the filtered entries.
+        foreach ($entries as $key => $entry) {
+            if (strtoupper(substr(format_string($entry->concept), 0, 1)) === strtoupper($letter)) {
+                // Add it when starting with the correct letter.
+                $filteredentries[$key] = $entry;
+            }
+        }
+    } else if ($letter == 'SPECIAL') {
+        // Build a new array with the filtered entries.
+        foreach ($entries as $key => $entry) {
+            if (!ctype_alpha(substr(format_string($entry->concept), 0, 1))) {
+                // Add it when starting with a non-letter character.
+                $filteredentries[$key] = $entry;
+            }
+        }
+    } else {
+        // No filtering needed (This means CONCEPT).
+        $filteredentries = $entries;
+    }
     $qb->add_user_fields();
+    // Now sort the array in regard to the current language.
+    if ($order == 'CREATION') {
+        if (strcasecmp($sort, 'DESC') === 0) {
+            usort($filteredentries, function($a, $b) {
+                return $b->timecreated <=> $a->timecreated;
+            });
-    $qb->filter_by_non_approved(mod_glossary_entry_query_builder::NON_APPROVED_ONLY);
+        } else {
+            usort($filteredentries, function($a, $b) {
+                return $a->timecreated <=> $b->timecreated;
-    if ($order == 'CREATION') {
+            });
+        }
+    } else if ($order == 'UPDATE') {
-        $qb->order_by('timecreated', 'entries', $sort);
+        if (strcasecmp($sort, 'DESC') === 0) {
+            usort($filteredentries, function($a, $b) {
+                return $b->timemodified <=> $a->timemodified;
+            });
+        } else {
+            usort($filteredentries, function($a, $b) {
+                return $a->timemodified <=> $b->timemodified;
-    } else if ($order == 'UPDATE') {
+            });
+        }
-        $qb->order_by('timemodified', 'entries', $sort);
+    } else {
+        // This means CONCEPT.
+        if (strcasecmp($sort, 'DESC') === 0) {
+            usort($filteredentries, function($a, $b) {
+                return format_string($b->concept) <=> format_string($a->concept);
+            });
+        } else {
+            usort($filteredentries, function($a, $b) {
+                return format_string($a->concept) <=> format_string($b->concept);
-    } else {
+            });
-        $qb->order_by('concept', 'entries', $sort);
-    }
-    $qb->order_by('id', 'entries', $sort); // Sort on ID to avoid random ordering when entries share an ordering value.
+        }
+    }
-    $qb->limit($from, $limit);
+    // Now applying limit.
+    if (isset($limit)) {
+        $count = count($filteredentries);
+        if (isset($from)) {
+            $filteredentries = array_slice($filteredentries, $from, $limit);
+        } else {
-    // Fetching the entries.
+            $filteredentries = array_slice($filteredentries, 0, $limit);
     $count = $qb->count_records();
     $entries = $qb->get_records();
-    return array($entries, $count);
+    return [$filteredentries, $count];
+ *
  * @return array
  */
 function mod_glossary_get_fontawesome_icon_map() {
     return [
+        'mod_glossary:asc' => 'fa-sort-down',
+        'mod_glossary:desc' => 'fa-sort-up',
-        'mod_glossary:export' => 'fa-download',
+        'mod_glossary:export' => 'fa-arrow-turn-up',
-        'mod_glossary:minus' => 'fa-minus'
+        'mod_glossary:minus' => 'fa-minus',
     ];
+}
 /**

Proyectos de Subversion Moodle

(root)/mod/glossary/lib.php – Rev 1 → 1441