From 54185837c83bf93ff2d971b986ac13530c1e840b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Apr 2014 09:38:07 +0200
Subject: Make identity name field optional (#1489510) Get rid of unhelpful
 error message.

---
 CHANGELOG                                | 3 ++-
 program/js/app.js                        | 4 ++--
 program/lib/Roundcube/rcube_user.php     | 5 ++++-
 program/steps/settings/edit_identity.inc | 2 +-
 program/steps/settings/save_identity.inc | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 14b99a059..1ae3c2060 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Make identity name field optional (#1489510)
 - Utility script to remove user records from the local database
 - Plugin API: Added message_saved hook (#1489752)
 - Support messages import from zip archives
@@ -10,10 +11,10 @@ CHANGELOG Roundcube Webmail
 - Search across multiple folders (#1485234)
 - Improve UI integration of ACL settings
 - Drop support for PHP < 5.3.7
-- Apply user-specific replacements to group's base_dn property (#1489779)
 - Set In-Reply-To and References for forwarded messages (#1489593)
 - Removed redundant default_folders config option (#1489737)
 - Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830)
+- Apply user-specific replacements to group's base_dn property (#1489779)
 - Fix mbox files import
 - Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
 - Fix "washing" of unicoded style attributes (#1489777)
diff --git a/program/js/app.js b/program/js/app.js
index 2451a6d3d..968e63908 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -857,9 +857,9 @@ function rcube_webmail()
             else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
               (input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
             ) {
-              alert(this.get_label('noemailwarning'));
+//              alert(this.get_label('noemailwarning'));
               input.focus();
-              break;
+//              break;
             }
 
             // clear empty input fields
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index e232736c9..739b6f2a0 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -267,7 +267,10 @@ class rcube_user
             "SELECT * FROM ".$this->db->table_name('identities').
             " WHERE del <> 1 AND user_id = ?".
             ($sql_add ? " ".$sql_add : "").
-            " ORDER BY ".$this->db->quote_identifier('standard')." DESC, name ASC, identity_id ASC",
+            " ORDER BY ". $this->db->quote_identifier('standard') . " DESC, "
+                . $this->db->quote_identifier('name') . " ASC, "
+                . $this->db->quote_identifier('email') . " ASC, "
+                . $this->db->quote_identifier('identity_id') . " ASC",
             $this->ID);
 
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index f208c8a05..3f7b6a58a 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -71,7 +71,7 @@ function rcube_identity_form($attrib)
     $RCMAIL->html_editor('identity');
 
     // add some labels to client
-    $OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting', 'editorwarning');
+    $OUTPUT->add_label('noemailwarning', 'converting', 'editorwarning');
 
     $i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
     $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 1584c5f00..77245b988 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -26,8 +26,8 @@ $a_boolean_cols = array('standard', 'html_signature');
 $updated = $default_id = false;
 
 // check input
-if (IDENTITIES_LEVEL != 4 && (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))) {
-    $OUTPUT->show_message('formincomplete', 'warning');
+if (empty($_POST['_email']) && (IDENTITIES_LEVEL == 0 || IDENTITIES_LEVEL == 2)) {
+    $OUTPUT->show_message('noemailwarning', 'warning');
     $RCMAIL->overwrite_action('edit-identity');
     return;
 }
-- 
cgit v1.2.3