[jan] Sort public keys in preferences by name.

horde · Jul 25, 2017 · 4a993ac · 4a993ac
1 parent f8edd99
commit 4a993ac
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v7.0.0-git
 ----------
 
+[jan] Sort public keys in preferences by name.
 [jan] Allow to specify a secondary S/MIME certificate for signatures only.
 [jan] Find logged replies in other than default sent-mail folders too.
 [mjr] Fix SyntaxHighlighter MIME viewer not rendering part after the initial

diff --git a/imp/lib/Prefs/Special/PgpPublicKey.php b/imp/lib/Prefs/Special/PgpPublicKey.php
@@ -57,6 +57,13 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $view->addHelper('Text');
 
         if (!empty($pubkey_list)) {
+            uasort(
+                $pubkey_list,
+                function ($a, $b)
+                {
+                    return strcoll($a['name'], $b['name']);
+                }
+            );
             $plist = array();
             $self_url = $ui->selfUrl(array(
                 'special' => true,

diff --git a/imp/lib/Prefs/Special/SmimePublicKey.php b/imp/lib/Prefs/Special/SmimePublicKey.php
@@ -58,6 +58,13 @@ public function display(Horde_Core_Prefs_Ui $ui)
         $view->addHelper('Text');
 
         if (!empty($pubkey_list)) {
+            uasort(
+                $pubkey_list,
+                function ($a, $b)
+                {
+                    return strcoll($a['name'], $b['name']);
+                }
+            );
             $plist = array();
             $self_url = $ui->selfUrl(array('special' => true, 'token' => true));
 

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Sort public keys in preferences by name.
 * [jan] Allow to specify a secondary S/MIME certificate for signatures only.
 * [jan] Find logged replies in other than default sent-mail folders too.
 * [mjr] Fix SyntaxHighlighter MIME viewer not rendering part after the initial view of a part (Bug 14337).
@@ -4012,6 +4013,7 @@
    </stability>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Sort public keys in preferences by name.
 * [jan] Allow to specify a secondary S/MIME certificate for signatures only.
 * [jan] Find logged replies in other than default sent-mail folders too.
 * [mjr] Fix SyntaxHighlighter MIME viewer not rendering part after the initial view of a part (Bug 14337).