X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=philter%2Fphilter%2Finclude%2Femails.inc.php;h=1cc1eafe5b206ff6e869dc35044dbc34c806ef18;hb=0cff7bb626480c7502f06993a418c75d13afe3ce;hp=15935eb62b8358ccdd657653018cacb2ec2da1c2;hpb=4956445bb7da02adee93a10bcc6d038d1f676cb2;p=old-projects.git

diff --git a/philter/philter/include/emails.inc.php b/philter/philter/include/emails.inc.php
index 15935eb..1cc1eaf 100644
--- a/philter/philter/include/emails.inc.php
+++ b/philter/philter/include/emails.inc.php
@@ -99,8 +99,8 @@ class EmailPool {
     function to_form() {
         $res = "<form id=\"emails\" action=\"{$_SERVER['REQUEST_URI']}\" method=\"post\">\n"
             .  "<table class=\"bicol\" cellpadding=\"1\" cellspacing=\"1\" width=\"95%\" align=\"center\">\n"
-            .  "<tr><th>Email</th>\n"
-            .  "    <th>Active</th>\n"
+            .  "<tr><th>"._i18n('email')."</th>\n"
+            .  "    <th>"._i18n('active')."</th>\n"
             .  "    <th>&nbsp;</th>\n"
             .  "</tr>\n";
 
@@ -112,25 +112,28 @@ class EmailPool {
                 .   "<td align=\"center\" width=\"10%\">\n"
                 .   "    <input type=\"checkbox\" name=\"emails[$id][active]\""
                 .   ($email->is_active() ? " checked=\"checked\"" : "")." /></td>\n"
-                .   "<td align=\"center\"><input type=\"button\" name=\"d$id\" "
-                .   "value=\"Del\" onclick=\"del_onclick(this)\" /></td>\n"
+                .   "<td align=\"center\"><input type=\"button\" "
+                .   "value=\""._i18n('del')."\" onclick=\"del_onclick($id)\" /></td>\n"
                 .   "</tr>\n";
             $pair = !$pair;
         }
 
         $res .= "</table>\n"
-            .   "<center>\n"
-            .   "    <input id=\"emailsDel\" type=\"hidden\" name=\"emails[del]\" value=\"\" />\n"
-            .   "    <input type=\"submit\" name=\"emails[apply]\" value=\"Apply changes\" />\n"
-            .   "</center>\n"
+            .   "<br /><center>\n"
+            .   "    <input id=\"emailsDel\" type=\"hidden\" name=\"emails[del]\" value=\"-1\" />\n"
+            .   "    <input type=\"submit\" name=\"emails[apply]\" value=\""
+            .   _i18n('apply_changes')."\" />\n"
+            .   "</center><br />\n"
             .   "</form>\n";
 
-        $val = 'your email ...';
+        $val = _i18n('your_email');
         
         $res .= "<form action=\"{$_SERVER['REQUEST_URI']}\" method=\"post\">\n"
+            .   _i18n('pool_help2')
             .   "<input type=\"text\" name=\"emails[new]\" size=\"50\" value='$val' "
             .   "    onfocus=\"text_onfocus(this,'$val')\" onblur=\"text_onblur(this,'$val')\" />\n"
-            .   "<input type=\"submit\" name=\"emails[add]\" value=\"Add\" />\n"
+            .   "<input type=\"submit\" name=\"emails[add]\" value=\"".
+                _i18n('add')."\" />\n"
             .   "</form>\n";
         
         return $res;
@@ -183,13 +186,17 @@ class EmailPool {
                 $philter->set_error($_POST['emails']['new']." is not a valid email");
                 return false;
             }
-        } elseif(!empty($_POST['emails']['del'])) {      // delete one email
+        } elseif(isset($_POST['emails']['del']) && $_POST['emails']['del'] != -1) {      // delete one email
             $del_id = $_POST['emails']['del'];
             // we compute a list of all actives emails
             $allow = false;
-            foreach($this->emails as $id=>$mail)
-                if($del_id!=$id && $mail->is_active())
+
+            foreach($this->emails as $id=>$mail) {
+                if($del_id!=$id && $mail->is_active()) {
                     $allow = true;
+                    break;
+                }
+            }
             
             if($allow && isset($this->emails[$del_id])) {
                 list($count) = mysql_fetch_row(mysql_query("SELECT COUNT(*) FROM actions "