ct.pl delete_contact: Fehler abgefangen.

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 2eb6c242fde9651ce6d6b0a5deece9e4544d34a0..5a579e92afbd067c2ab436572c39eeeb1d5f3fa9 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -734,18 +734,23 @@ sub delete_contact {
   $::lxdebug->enter_sub;
   $::auth->assert('customer_vendor_edit');
 
   $::lxdebug->enter_sub;
   $::auth->assert('customer_vendor_edit');
 

-  CT->get_contact(\%::myconfig, $::form);
+  if (!$::form->{cp_id}) {
+    flash('error', $::locale->text('No contact selected to delete'));
+  } else {

 
 

-  my $contact = SL::DB::Manager::Contact->find_by(cp_id => $::form->{cp_id});
+    CT->get_contact(\%::myconfig, $::form);

 
 

-  if ($contact->used) {
-    $contact->detach;
-    flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
-  } else {
-    $contact->delete;
-    flash('info', $::locale->text('Contact deleted.'));
+    my $contact = SL::DB::Manager::Contact->find_by(cp_id => $::form->{cp_id});
+
+    if ($contact->used) {
+      $contact->detach;
+      flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
+    } else {
+      $contact->delete;
+      flash('info', $::locale->text('Contact deleted.'));
+    }
+    delete $::form->{$_} for grep /^cp_/, keys %$::form;

   }
   }

-  delete $::form->{$_} for grep /^cp_/, keys %$::form;

 
   edit();
 
 
   edit();