Merge commit 'origin/master' into fusionax

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 036452e..95c71bd 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -100,7 +100,7 @@ class XnetListsModule extends ListsModule
                            USING  x4dat.virtual AS v
                        LEFT JOIN  x4dat.virtual_redirect AS r USING(vid)
                            WHERE  v.alias={?}', $alias);
-            $page->trigSuccess(Post::v('del_alias')." supprimé !");
+            $page->trigSuccess(Post::v('del_alias')." supprimé !");
         }
 
         $listes = $this->client->get_lists();
@@ -141,7 +141,7 @@ class XnetListsModule extends ListsModule
         }
 
         if (!Post::has('liste')) {
-            $page->trigError('champs «adresse souhaitée» vide');
+            $page->trigError('Le champs « adresse souhaitée » est vide.');
             return;
         }
 
@@ -272,20 +272,20 @@ class XnetListsModule extends ListsModule
                 if (list($alias, $blias) = $res->fetchOneRow()) {
                     $alias = empty($blias) ? $alias : $blias;
                     XDB::query(
-                        "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
-                              SELECT  vid, {?}
-                                FROM  x4dat.virtual
-                               WHERE  alias={?}", "$alias@m4x.org", $lfull);
+                        "INSERT IGNORE INTO  x4dat.virtual_redirect (vid,redirect)
+                                     SELECT  vid, {?}
+                                       FROM  x4dat.virtual
+                                      WHERE  alias={?}", "$alias@m4x.org", $lfull);
                    $page->trigSuccess("$alias@m4x.org ajouté");
                 } else {
                     $page->trigError("$mbox@{$globals->mail->domain} n'existe pas.");
                 }
             } else {
                 XDB::query(
-                        "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
-                              SELECT  vid,{?}
-                                FROM  x4dat.virtual
-                               WHERE  alias={?}", "$mbox@$dom", $lfull);
+                        "INSERT IGNORE INTO  x4dat.virtual_redirect (vid,redirect)
+                                     SELECT  vid,{?}
+                                       FROM  x4dat.virtual
+                                      WHERE  alias={?}", "$mbox@$dom", $lfull);
                 $page->trigSuccess("$mbox@$dom ajouté");
             }
         }
@@ -336,7 +336,7 @@ class XnetListsModule extends ListsModule
         }
 
         if (!Post::has('liste')) {
-            $page->trigError('champs «adresse souhaitée» vide');
+            $page->trigError('Le champs « adresse souhaitée » est vide.');
             return;
         }
         $liste = Post::v('liste');