Changeset 3105:5411dc9bea4a

Timestamp:

09/29/15 17:22:58 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Users (lists) are now sorted in lexical order as far as possible, addresses #1850

Files:

• admin/posts.php (modified) (1 diff)
• admin/users.php (modified) (1 diff)
• inc/admin/actions/class.dcactionposts.php (modified) (1 diff)
• inc/core/class.dc.rs.extensions.php (modified) (2 diffs)

admin/posts.php

@@ -47 +47 @@
 {
      # Filter form we'll put in html_block
+     $users_combo = dcAdminCombos::getUsersCombo($users);
+     dcUtils::lexicalKeySort($users_combo);
      $users_combo = array_merge(
           array('-' => ''),
-          dcAdminCombos::getUsersCombo($users)
+          $users_combo
      );
 

admin/users.php

@@ -84 +84 @@
      $rs = $core->getUsers($params);
      $counter = $core->getUsers($params,1);
-     $user_list = new adminUserList($core,$rs,$counter->f(0));
+     $rsStatic = $rs->toStatic();
+     if ($sortby != 'nb_post') {
+          // Sort user list using lexical order if necessary
+          $rsStatic->extend('rsExtUser');
+          $rsStatic = $rsStatic->toExtStatic();
+          $rsStatic->lexicalSort($sortby,$order);
+     }
+     $user_list = new adminUserList($core,$rsStatic,$counter->f(0));
 } catch (Exception $e) {
      $core->error->add($e->getMessage());

inc/admin/actions/class.dcactionposts.php

@@ -345 +345 @@
                          );
                     $rs = $core->getUsers($params);
-                    while ($rs->fetch())
+                    $rsStatic = $rs->toStatic();
+                    $rsStatic->extend('rsExtUser');
+                    $rsStatic = $rsStatic->toExtStatic();
+                    $rsStatic->lexicalSort('user_id');
+                    while ($rsStatic->fetch())
                     {
-                         $usersList .= ($usersList != '' ? ',' : '').'"'.$rs->user_id.'"';
+                         $usersList .= ($usersList != '' ? ',' : '').'"'.$rsStatic->user_id.'"';
                     }
                }

inc/core/class.dc.rs.extensions.php

@@ -846 +846 @@
 class rsExtUser
 {
+     private static $sortfield;
+     private static $sortsign;
      /**
      Returns a user option.
@@ -877 +879 @@
           return array();
      }
+
+     /**
+     Converts this record to a {@link extStaticRecord} instance.
+
+     @param    rs   Invisible parameter
+      */
+     public static function toExtStatic($rs)
+     {
+          if ($rs instanceof extStaticRecord) {
+               return $rs;
+          }
+          return new extStaticRecord($rs);
+     }
 }
+
+class extStaticRecord extends staticRecord
+{
+     private $sortfield;
+     private $sortsign;
+
+     public function __construct($rs)
+     {
+          parent::__construct($rs->__data,$rs->__info);
+     }
+
+     /**
+     Lexically sort.
+
+     @param    field     <b>string<b>   sort field
+     @param  order  <b>string<b>   sort order
+      */
+     public function lexicalSort($field,$order='asc')
+     {
+          $this->sortfield = $field;
+          $this->sortsign = strtolower($order) == 'asc' ? 1 : -1;
+
+          usort($this->__data,array($this,'lexicalSortCallback'));
+
+          $this->sortfield = null;
+          $this->sortsign = null;
+     }
+     private function lexicalSortCallback($a,$b)
+     {
+          $a = $a[$this->sortfield];
+          $b = $b[$this->sortfield];
+
+          # Integer values
+          if ($a == (string) (integer) $a && $b == (string) (integer) $b) {
+               $a = (integer) $a;
+               $b = (integer) $b;
+               return ($a - $b) * $this->sortsign;
+          }
+
+          return strcoll(strtolower(dcUtils::removeDiacritics($a)),strtolower(dcUtils::removeDiacritics($b))) * $this->sortsign;
+     }
+}