WebSVN – Moodle – Diff – /lib/datalib.php

  * @param string $searchtext The string to search for
  * @param string $sort A field to sort by
  * @param array $exceptions A list of IDs to ignore, eg 2,4,5,8,9,10
  * @return array
  */
-function search_users($courseid, $groupid, $searchtext, $sort='', array $exceptions=null) {
+function search_users($courseid, $groupid, $searchtext, $sort='', ?array $exceptions=null) {
     global $DB;
     $fullname  = $DB->sql_fullname('u.firstname', 'u.lastname');
  * @return array an array with two elements, a fragment of SQL to go in the
  *     where clause the query, and an associative array containing any required
  *     parameters (using named placeholders).
  */
 function users_search_sql(string $search, string $u = 'u', int $searchtype = USER_SEARCH_STARTS_WITH, array $extrafields = [],
-        array $exclude = null, array $includeonly = null): array {
+        ?array $exclude = null, ?array $includeonly = null): array {
     global $DB, $CFG;
     $params = array();
     $tests = array();
  * @param array $customfieldmappings associative array of mappings for custom fields returned by \core_user\fields::get_sql.
  * @return array with two elements:
  *      string SQL fragment to use in the ORDER BY clause. For example, "firstname, lastname".
  *      array of parameters used in the SQL fragment. If $search is not given, this is guaranteed to be an empty array.
  */
-function users_order_by_sql(string $usertablealias = '', string $search = null, context $context = null,
+function users_order_by_sql(string $usertablealias = '', ?string $search = null, ?context $context = null,
         array $customfieldmappings = []) {
     global $DB, $PAGE;
     if ($usertablealias) {
     if (!$context) {
         $context = $PAGE->context;
+    }
-    $exactconditions = array();
-    $paramkey = 'usersortexact1';
+    $exactconditions = array();
     $exactconditions[] = $DB->sql_fullname($tableprefix . 'firstname', $tableprefix  . 'lastname') .
-            ' = :' . $paramkey;
-    $params[$paramkey] = $search;
+            ' = :usersortexact';
-    $paramkey++;
+    $params['usersortexact'] = $search;
     if ($customfieldmappings) {
             return $tableprefix . $field;
         }, $fieldstocheck);
+    }
     foreach ($fieldstocheck as $key => $field) {
-        $exactconditions[] = 'LOWER(' . $field . ') = LOWER(:' . $paramkey . ')';
+        $exactconditions[] = 'LOWER(' . $field . ') = LOWER(:usersortfield' . $key . ')';
-        $params[$paramkey] = $search;
-        $paramkey++;
+        $params['usersortfield' . $key] = $search;
+    }
  * @param string $recordsperpage The number of records to return per page
  * @param string $fields A comma separated list of fields to be returned from the chosen table.
  * @return array|int|bool  {@link $USER} records unless get is false in which case the integer count of the records found is returned.
  *                        False is returned if an error is encountered.
  */
-function get_users($get=true, $search='', $confirmed=false, array $exceptions=null, $sort='firstname ASC',
+function get_users($get=true, $search='', $confirmed=false, ?array $exceptions=null, $sort='firstname ASC',
-                   $firstinitial='', $lastinitial='', $page='', $recordsperpage='', $fields='*', $extraselect='', array $extraparams=null) {
+                   $firstinitial='', $lastinitial='', $page='', $recordsperpage='', $fields='*', $extraselect='', ?array $extraparams=null) {
     global $DB, $CFG;
     if ($get && !$recordsperpage) {
         debugging('Call to get_users with $get = true no $recordsperpage limit. ' .
  *   as appropriate for current user and given context
  * @return array Array of {@link $USER} records
  */
 function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperpage=0,
                            $search='', $firstinitial='', $lastinitial='', $extraselect='',
-                           array $extraparams=null, $extracontext = null) {
+                           ?array $extraparams=null, $extracontext = null) {
     global $DB, $CFG;
     $fullname  = $DB->sql_fullname();
         $NOTREGEXP = $DB->sql_regex(false);
+    }
-    $i = 0;
-    // Thanks Oracle for your non-ansi concat and type limits in coalesce. MDL-29912
-    if ($DB->get_dbfamily() == 'oracle') {
-        $concat = "(c.summary|| ' ' || c.fullname || ' ' || c.idnumber || ' ' || c.shortname)";
+    $i = 0;
-    } else {
         $concat = $DB->sql_concat("COALESCE(c.summary, '')", "' '", 'c.fullname', "' '", 'c.idnumber', "' '", 'c.shortname');
     $concat = $DB->sql_concat("COALESCE(c.summary, '')", "' '", 'c.fullname', "' '", 'c.idnumber', "' '", 'c.shortname');
     foreach ($searchterms as $searchterm) {
+        $i++;
-        $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 (empty($userid)) {
         $userid = $USER->id;
     }
-    // we can not use SELECT DISTINCT + text field (summary) because of MS SQL and Oracle, subselect used therefore
+    // We can not use SELECT DISTINCT + text field (summary) because of MS SQL, subselect used therefore.
     $sql = "SELECT c.id, c.remoteid, c.shortname, c.fullname,
                    c.hostid, c.summary, c.summaryformat, c.categoryname AS cat_name,
                    h.name AS hostname
  * @param string $table
  * @param string $field name of the field containing revision
  * @param string $select use empty string when updating all records
  * @param array $params optional select parameters
  */
-function increment_revision_number($table, $field, $select, array $params = null) {
+function increment_revision_number($table, $field, $select, ?array $params = null) {
     global $DB;
     $now = time();
     $sql = "UPDATE {{$table}}
      */
     $gettypestyle = function($item): string {
         switch (gettype($item)) {
             case 'NULL':
             case 'boolean':
-                return 'font-italic';
+                return 'fst-italic';
             case 'integer':
             case 'double':
                 return 'text-primary';
             case 'string' :
                 return 'text-success';
                 $out .= PHP_EOL . '  ' . $shortkey . ' = ';
             } else {
                 switch ($access) {
                     case 'protected':
                         // Protected is in normal font.
-                        $bootstrapstyle = ' font-weight-normal';
+                        $bootstrapstyle = ' fw-normal';
                         break;
                     case 'private':
                         // Private is italic.
-                        $bootstrapstyle = ' font-weight-normal font-italic';
+                        $bootstrapstyle = ' fw-normal fst-italic';
                         break;
                     default:
                         // Public is bold, same for array keys.
                         $bootstrapstyle = '';
                         break;

Proyectos de Subversion Moodle

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