Changeset ccd0486 in github

Timestamp:

Oct 24, 2008 4:10:10 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1971ddc

Parents:

ec01712

Message:

• Added option 'identities_level', removed 'multiple_identities'
• Allow deleting identities when multiple_identities=false (#1485435)

File:

• program/steps/settings/delete_identity.inc (modified) (2 diffs)

program/steps/settings/delete_identity.inc

@@ -22 +22 @@
 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)
@@ -39 +33 @@
 }
 
-
-if ($OUTPUT->ajax_call)
-  exit;
-
-
 // go to identities page
 rcmail_overwrite_action('identities');