X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=philter%2Fphilter%2Finclude%2Femails.inc.php;h=f699f2ca1c5cf497806260209d667b3a33b8f1b7;hb=deccde633d03e7c8cf186f47851684c932f88ddc;hp=dee810f541fcda2306af2e900bd13205068adfe7;hpb=dd8de1ec2684f9cd9616e97bbbdda114bc813097;p=old-projects.git

diff --git a/philter/philter/include/emails.inc.php b/philter/philter/include/emails.inc.php
index dee810f..f699f2c 100644
--- a/philter/philter/include/emails.inc.php
+++ b/philter/philter/include/emails.inc.php
@@ -37,6 +37,8 @@ class Email {
      * @return  true if the string is a valid email, false else
      */
     function Check($_string) {
+        if(function_exists('isvalid_email_redirection'))
+            return isvalid_email_redirection($_string);
         return preg_match("/^[\w\-.]+(\+[\w\-.]+)?@[\w\-.]+\.[a-zA-Z]{2,44}$/", $_string);
     }
 
@@ -54,7 +56,7 @@ class Email {
     function toggle_flag($_flag) {
         $flags = explode(",", $this->flags);
         $key = array_search($_flag,$flags);
-        if($key===false)
+        if($key===NULL || $key===false)
             $flags[]=$_flag;
         else
             unset($flags[$key]);
@@ -97,31 +99,76 @@ class EmailPool {
      * @return  the string containing the form
      */
     function to_form() {
-        $res = "<form action=\"{$_SERVER['REQUEST_URI']}\" method=\"post\">\n"
-            .  "<table class=\"bicol\" width=\"100%\">\n";
+        $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>"._i18n('email')."</th>\n"
+            .  "    <th>"._i18n('active')."</th>\n"
+            .  "    <th>&nbsp;</th>\n"
+            .  "</tr>\n";
 
         $pair = true;
+
         foreach($this->emails as $id => $email) {
-            $res .= "<tr class=\"".($pair?"pair":"impair")."\"><td>\n"
-                .   "        <input type=\"checkbox\" name=\"emails[$id][active]\""
-                    . ($email->is_active() ? " checked=\"checked\"" : "")." /> ".$email->email."\n"
-                .   "</td><td><input type=\"submit\" name=\"emails[$id][del]\" value=\"Del\" /></td>\n"
+            $res .= "<tr class=\"".($pair?"pair":"impair")."\">\n"
+                .   "<td>".$email->email."</td>\n"
+                .   "<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\" "
+                .   "value=\""._i18n('del')."\" onclick=\"del_onclick($id)\" /></td>\n"
                 .   "</tr>\n";
             $pair = !$pair;
         }
 
-        $res .= "<tr><td colspan=\"2\">\n"
-            .   "    <input type=\"submit\" name=\"emails[apply]\" value=\"Apply changes\" /></td>\n"
-            .   "</tr>\n";
+        $res .= "</table>\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 ...';
-        $res .= "<tr><td colspan=\"2\">\n"
-            .   "   <input type=\"text\" name=\"emails[new]\" size=\"60\" value='$val' "
-            .   "onfocus=\"text_onfocus(this,'$val')\" onblur=\"text_onblur(this,'$val')\" />\n"
-            .   "   <input type=\"submit\" name=\"emails[add]\" value=\"Add\" /></td>\n"
-            .   "</td></tr>\n";
+        $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=\"".
+                _i18n('add')."\" />\n"
+            .   "</form>\n";
         
-        $res .= "</table>\n</form>\n";
+        return $res;
+    }
+
+    /** create the part of the small form for the mail pool.
+     * @return  the string containing the form
+     */
+    function to_small_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>"._i18n('email')."</th>\n"
+            .  "</tr>\n";
+
+        $pair = true;
+
+        foreach($this->emails as $id => $email) {
+            
+            $res .= "<tr class=\"".($pair?"pair":"impair")."\">\n"
+                .   "<td>".($email->is_active() ? "<strong>" : "")
+                    .$email->email.($email->is_active() ? "</strong>" : "")."</td>\n"
+                .   "</tr>\n";
+            $pair = !$pair;
+        }
+
+        $val = _i18n('your_email');
+        $res .= "<tr><th>\n"
+            .   "<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=\""._i18n('add')."\" />\n"
+            .   "</th></tr>\n"
+            .   "</table>\n"
+            .   "</form>\n";
 
         return $res;
     }
@@ -160,7 +207,7 @@ class EmailPool {
                 // we check that the email is not already there
                 foreach($this->emails as $id=>$key)
                     if($key->email == $new_mail) {
-                        $philter->set_error("$new_mail is already in the Email Pool");
+                        $philter->set_error("$new_mail "._i18n('pool_err_already'));
                         return false;
                     }
                 
@@ -170,7 +217,35 @@ class EmailPool {
                 $this->emails[$mid]->commit($this->uid, $mid);
                 uasort($this->emails, "email_cmp");
             } else {
-                $philter->set_error($_POST['emails']['new']." is not a valid email");
+                $philter->set_error($_POST['emails']['new'].' '._i18n('pool_err_not_valid'));
+                return false;
+            }
+        } 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()) {
+                    $allow = true;
+                    break;
+                }
+            }
+            
+            if($allow && isset($this->emails[$del_id])) {
+                list($count) = mysql_fetch_row(mysql_query("SELECT COUNT(*) FROM actions "
+                            ."WHERE uid='{$this->uid}' AND pid='"
+                            .FwdPlugin::rtti()."' AND data='$del_id'"));
+                if($count) {
+                    $philter->set_error(_i18n('pool_err_active'));
+                    return false;
+                } else {
+                    mysql_query("DELETE FROM emails WHERE uid='{$this->uid}' "
+                            ."AND email='{$this->emails[$del_id]->email}'");
+                    unset($this->emails[$del_id]);
+                }
+            } else {
+                $philter->set_error(_i18n('pool_err_need_one'));
                 return false;
             }
         } elseif(isset($_POST['emails']['apply'])) {    // apply actives changes
@@ -182,44 +257,47 @@ class EmailPool {
                 }
             
             if(!$one_active) {
-                $philter->set_error("you must have at least one active email !");
+                $philter->set_error(_i18n('pool_err_need_one'));
                 return false;
             }
 
-            foreach($this->emails as $id=>$key)
+            foreach($this->emails as $id=>$key) {
                 if(isset($_POST['emails'][$id]['active']) xor $this->emails[$id]->is_active()) {
                     $this->emails[$id]->toggle_flag('active');
                     $this->emails[$id]->commit($this->uid, $id);
                 }
-        } else {                                        // delete one email
-            // we compute a list of all actives emails
-            $actives = array();
-            foreach($this->emails as $id=>$mail)
-                if($mail->is_active())
-                    $actives[$id] = true;
-            
-            foreach($this->emails as $id=>$key)
-                if(isset($_POST['emails'][$id]['del'])) {
-                    if(count($this->emails)>0 && (count($actives)>1 || empty($actives[$id]))) {
-                        list($count) = mysql_fetch_row(mysql_query("SELECT COUNT(*) FROM actions "
-                                    ."WHERE uid='{$this->uid}' AND pid='"
-                                    .FwdPlugin::rtti()."' AND data='$id'"));
-                        if($count) {
-                            $philter->set_error("This email is still in use and can't be deleted !");
-                            return false;
-                        } else {
-                            mysql_query("DELETE FROM emails WHERE uid='{$this->uid}' "
-                                    ."AND email='{$this->emails[$id]->email}'");
-                            unset($this->emails[$id]);
-                            unset($actives[$id]);
-                        }
-                    } else {
-                        $philter->set_error("you must have at least one active email !");
+            }
+        return true;
+        }
+    }
+
+    /** handle the data from the small form
+     * @return  true if all is ok, false and sets $philter->error() else
+     */
+    function handle_small_form() {
+        global $philter;
+        
+        if(isset($_POST['emails']['add'])) {            // add an email to the pool
+            if(Email::Check($_POST['emails']['new'])) {
+                $new_mail = strtolower($_POST['emails']['new']);
+
+                // we check that the email is not already there
+                foreach($this->emails as $id=>$key)
+                    if($key->email == $new_mail) {
+                        $philter->set_error("$new_mail "._i18n('pool_err_already'));
                         return false;
                     }
-                }
+                
+                // then we compute one free id, and we add it to the list
+                $mid = $this->new_mail_id();
+                $this->emails[$mid] = new Email($new_mail, '');
+                $this->emails[$mid]->commit($this->uid, $mid);
+                uasort($this->emails, "email_cmp");
+            } else {
+                $philter->set_error($_POST['emails']['new'].' '._i18n('pool_err_not_valid'));
+                return false;
+            }
         }
-        return true;
     }
 }