diff --git a/.gitattributes b/.gitattributes index a83df368..8abd190a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -160,6 +160,7 @@ bureau/admin/lst_downsub.php -text bureau/admin/lst_owner.php -text bureau/admin/lst_subscribers.php -text bureau/admin/mail_add.php -text +bureau/admin/mail_del.php -text bureau/admin/mail_doadd.php -text bureau/admin/mail_dodel.php -text bureau/admin/mail_doedit.php -text diff --git a/bureau/admin/mail_del.php b/bureau/admin/mail_del.php new file mode 100644 index 00000000..2e02cc6b --- /dev/null +++ b/bureau/admin/mail_del.php @@ -0,0 +1,62 @@ + + + +

:

+

+ +
+ +

+"; + echo $val."
"; +} + +?> +

+

" /> - "/> +

+ +
+ + \ No newline at end of file diff --git a/bureau/admin/mail_dodel.php b/bureau/admin/mail_dodel.php index b8541af3..28992d3e 100644 --- a/bureau/admin/mail_dodel.php +++ b/bureau/admin/mail_dodel.php @@ -33,14 +33,31 @@ if (!is_array($d)) { $d[]=$d; } +include("head.php"); +?> + + + +

:

+ +

+del_mail($val)) { $error.=sprintf(_("The mailbox %s does not exist!")."
",$val); echo $error; + } else { + $error.=sprintf(_("The mailbox %s has been deleted!")."
",$val); + echo $error; } +list($ll,$dd)=explode("@",$val); } -include("mail_list.php"); -exit(); ?> +

+

+ +

+ + \ No newline at end of file diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php index 1cbb1fe0..2b3afe36 100644 --- a/bureau/admin/mail_list.php +++ b/bureau/admin/mail_list.php @@ -80,7 +80,7 @@ else{ ?> -
+ diff --git a/bureau/class/m_hta.php b/bureau/class/m_hta.php index 8d8ad592..cdcf82c5 100644 --- a/bureau/class/m_hta.php +++ b/bureau/class/m_hta.php @@ -300,7 +300,7 @@ class m_hta { $errr=0; while (!feof($file) && !$errr) { $s=fgets($file,1024); - if (substr($s,0,14)!="ErrorDocument " && substr($s,0,12)!="RewriteRule " && substr($s,0,14)!="RewriteEngine " && trim($s)!="") { + if (substr($s,0,12)!="RewriteCond " && substr($s,0,14)!="ErrorDocument " && substr($s,0,12)!="RewriteRule " && substr($s,0,14)!="RewriteEngine " && trim($s)!="") { $errr=1; } if (strtolower(trim($s))==strtolower("authuserfile $absolute/.htpasswd")) { diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index d85bad3e..36086a26 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -2184,6 +2184,21 @@ msgstr "" msgid "Domain can be installed, force NO DNS hosting)" msgstr "" +msgid "The mailbox %s has been deleted!" +msgstr "La boîte aux lettres %s a été effacée !" + +msgid "Deleting mail accounts" +msgstr "Effacement des comptes email" + +msgid "Please confirm the deletion of the following mail accounts:" +msgstr "Confirmez la suppression des comptes emails suivants :" + +msgid "Don't delete accounts and go back to the mail list" +msgstr "Ne rien effacer, retourner à la liste des emails" + +msgid "Back to the mail account list" +msgstr "Retour à la liste des emails" + #~ msgid "2 months" #~ msgstr "2 mois"