[BF] Better error handling for dup alias - fixes #260

barryo · barryo · commit fedf85b19352 · 2020-05-16T11:00:48.000+01:00
diff --git a/application/controllers/MailboxController.php b/application/controllers/MailboxController.php
@@ -357,7 +357,18 @@ public function addAction()
                 );
 
                 $this->notify( 'mailbox', 'add', 'addPreflush', $this );
-                $this->getD2EM()->flush();
+
+                try {
+                    $this->getD2EM()->flush();
+                } catch( Doctrine\DBAL\Exception\UniqueConstraintViolationException $e ) {
+                    if( strpos( $e->getMessage(), 'occurred while executing \'INSERT INTO alias' ) > 0 ) {
+                        $this->addMessage(_("An alias already exists for the mailbox you are trying to create. Please delete the alias first."), OSS_Message::ERROR);
+                        return;
+                    }
+                    throw $e;
+                }
+
+
                 $this->notify( 'mailbox', 'add', 'addPostflush', $this, [ 'options' => $this->_options ] );
 
                 if( $form->getValue( 'welcome_email' ) )
