[Svn] r2007 - trunk/roundcubemail/program/steps/settings

[trac at roundcube.net]

Author: alec
Date: 2008-10-24 03:10:10 -0500 (Fri, 24 Oct 2008)
New Revision: 2007

Modified:
   trunk/roundcubemail/program/steps/settings/delete_identity.inc
Log:
- Added option 'identities_level', removed 'multiple_identities'
- Allow deleting identities when multiple_identities=false (#1485435)


Modified: trunk/roundcubemail/program/steps/settings/delete_identity.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/delete_identity.inc	2008-10-24 07:57:21 UTC (rev 2006)
+++ trunk/roundcubemail/program/steps/settings/delete_identity.inc	2008-10-24 08:10:10 UTC (rev 2007)
@@ -21,28 +21,17 @@
 
 if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
 {
-  if ($RCMAIL->config->get('multiple_identities', true)) {
-    if ($USER->delete_identity($ids)) {
-      $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
-    }
-    else {
-      $OUTPUT->show_message('nodeletelastidentity', 'error');
-    }
+  if ($USER->delete_identity($ids)) {
+    $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
   }
   else {
-    $OUTPUT->show_message('opnotpermitted', 'error');
+    $OUTPUT->show_message('nodeletelastidentity', 'error');
   }
-  
   // send response
   if ($OUTPUT->ajax_call)
     $OUTPUT->send();
 }
 
-
-if ($OUTPUT->ajax_call)
-  exit;
-
-
 // go to identities page
 rcmail_overwrite_action('identities');
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn