#1485511: better handling for editing non-existing identities

git-svn-id: https://svn.roundcube.net/trunk@2033 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 3 deletions

diff --git a/roundcubemail/program/steps/settings/edit_identity.inc b/roundcubemail/program/steps/settings/edit_identity.inc
index 78b204576..c8d448adb 100644
--- a/roundcubemail/program/steps/settings/edit_identity.inc
+++ b/roundcubemail/program/steps/settings/edit_identity.inc
@@ -27,6 +27,12 @@ if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
   
   if (is_array($IDENTITY_RECORD))
     $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
+  else {
+    $OUTPUT->show_message('opnotpermitted', 'error');
+    // go to identities page
+    rcmail_overwrite_action('identities');
+    return;
+  }
 }
 // add-identity
 else {
@@ -65,9 +71,6 @@ function rcube_identity_form($attrib)
                                     "theme_advanced_buttons3 : '',".
 				    "gecko_spellcheck : true });");
 
-  if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
-    return rcube_label('notfound');
-
   // add some labels to client
   $OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting');