X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=dbfa7392096ef58f60d32e9c53710321c2af3c05;hb=67d7487d7667a7f518b4bc067ef250b9738c2570;hp=3979152cb0f8311225a2910232f2ebe15f91a0a1;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git

diff --git a/include/emails.inc.php b/include/emails.inc.php
index 3979152..dbfa739 100644
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -39,9 +39,9 @@ function fix_bestalias($uid)
     }
     XDB::execute("UPDATE  aliases
                                SET  flags=CONCAT(flags,',','bestalias')
-			     WHERE  id={?} AND type!='homonyme'
-		          ORDER BY  !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias)
-		             LIMIT  1", $uid);
+                 WHERE  id={?} AND type!='homonyme'
+                  ORDER BY  !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias)
+                     LIMIT  1", $uid);
 }
 
 // }}}
@@ -77,14 +77,17 @@ class Bogo
 
     function Bogo($uid)
     {
-	$res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid);
-	if ($res->numRows()) {
-            $this->state = $res->fetchOneCell();
-	} else {
-	    $this->state = 'tag_and_drop_spams';
-	    $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags)
-					      VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid);
-	}
+        if (!$uid) {
+            return;
+        }
+        $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid);
+        if ($res->numRows()) {
+                $this->state = $res->fetchOneCell();
+        } else {
+            $this->state = 'tag_and_drop_spams';
+            $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags)
+                                    VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid);
+        }
     }
 
     // }}}
@@ -92,8 +95,8 @@ class Bogo
 
     function change($uid, $state)
     {
-	$this->state = is_int($state) ? $this->_states[$state] : $state;
-	XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"',
+    $this->state = is_int($state) ? $this->_states[$state] : $state;
+    XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"',
                      $this->state, $uid);
     }
 
@@ -115,15 +118,20 @@ class Email
     
     var $email;
     var $active;
+    var $broken;
     var $rewrite;
     var $panne;
+    var $last;
+    var $panne_level;
 
     // }}}
     // {{{ constructor
 
     function Email($row)
     {
-        list($this->email, $this->active, $this->rewrite, $this->panne) = $row;
+        list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row;
+        $this->active = ($flags == 'active');
+        $this->broken = ($flags == 'panne');
     }
 
     // }}}
@@ -132,10 +140,13 @@ class Email
     function activate($uid)
     {
         if (!$this->active) {
-            XDB::execute("UPDATE  emails SET flags = 'active'
-                                     WHERE  uid={?} AND email={?}", $uid, $this->email);
-	    $_SESSION['log']->log("email_on", $this->email.($uid!=Session::getInt('uid') ? "(admin on $uid)" : ""));
+            XDB::execute("UPDATE  emails
+                             SET  panne_level = IF(flags = 'panne', panne_level - 1, panne_level),
+                                  flags = 'active'
+                           WHERE  uid={?} AND email={?}", $uid, $this->email);
+        $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : ""));
             $this->active = true;
+            $this->broken = false;
         }
     }
 
@@ -146,8 +157,8 @@ class Email
     {
         if ($this->active) {
             XDB::execute("UPDATE  emails SET flags =''
-				     WHERE  uid={?} AND email={?}", $uid, $this->email);
-	    $_SESSION['log']->log("email_off",$this->email.($uid!=Session::getInt('uid') ? "(admin on $uid)" : "") );
+                     WHERE  uid={?} AND email={?}", $uid, $this->email);
+            $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") );
             $this->active = false;
         }
     }
@@ -157,12 +168,15 @@ class Email
 
     function rewrite($rew, $uid)
     {
-	if ($this->rewrite == $rew) {
+        if ($this->rewrite == $rew) {
             return;
         }
-	XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email);
-	$this->rewrite = $rew;
-	return;
+        if (!$rew || !isvalid_email($rew)) {
+            $rew = '';
+        }
+        XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email);
+        $this->rewrite = $rew;
+        return;
     }
 
     // }}}
@@ -185,15 +199,15 @@ class Redirect
 
     function Redirect($_uid)
     {
-	$this->uid=$_uid;
+        $this->uid=$_uid;
         $res = XDB::iterRow("
-	    SELECT email, flags='active', rewrite, panne
-	      FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid);
-	$this->emails=Array();
+            SELECT email, flags, rewrite, panne, last, panne_level
+              FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid);
+        $this->emails=Array();
         while ($row = $res->next()) {
-	    $this->emails[] = new Email($row);
+            $this->emails[] = new Email($row);
         }
-	$this->bogo = new Bogo($_uid);
+        $this->bogo = new Bogo($_uid);
     }
 
     // }}}
@@ -218,12 +232,13 @@ class Redirect
             return ERROR_INACTIVE_REDIRECTION;
         }
         XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email);
-        $_SESSION['log']->log('email_del',$email.($this->uid!=Session::getInt('uid') ? " (admin on {$this->uid})" : ""));
-	foreach ($this->emails as $i=>$mail) {
-	    if ($email==$mail->email) {
+        $_SESSION['log']->log('email_del',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
+        foreach ($this->emails as $i=>$mail) {
+            if ($email==$mail->email) {
                 unset($this->emails[$i]);
             }
-	}
+        }
+        check_redirect($this);
         return SUCCESS;
     }
 
@@ -240,15 +255,19 @@ class Redirect
             return ERROR_LOOP_EMAIL;
         }
         XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email);
-	if ($logger = Session::getMixed('log', null)) { // may be absent --> step4.php
-	    $logger->log('email_add',$email.($this->uid!=Session::getInt('uid') ? " (admin on {$this->uid})" : ""));
+        if ($logger = S::v('log', null)) { // may be absent --> step4.php
+            $logger->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : ""));
         }
-	foreach ($this->emails as $mail) {
-	    if ($mail->email == $email_stripped) {
+        foreach ($this->emails as $mail) {
+            if ($mail->email == $email_stripped) {
                 return SUCCESS;
             }
-	}
-        $this->emails[] = new Email(array($email,1,'','0000-00-00'));
+        }
+        $this->emails[] = new Email(array($email, 'active', '', '0000-00-00', '0000-00-00', 0));
+
+        // security stuff
+        check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->uid);
+        check_redirect($this);
         return SUCCESS;
     }
 
@@ -257,25 +276,87 @@ class Redirect
 
     function modify_email($emails_actifs,$emails_rewrite)
     {
-	foreach ($this->emails as $i=>$mail) {
+        foreach ($this->emails as $i=>$mail) {
             if (in_array($mail->email,$emails_actifs)) {
                 $this->emails[$i]->activate($this->uid);
-	    } else {
+            } else {
                 $this->emails[$i]->deactivate($this->uid);
-	    }
-	    $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid);
+            }
+            $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid);
         }
+        check_redirect($this);
     }
 
-    function modify_one_email($email, $activate) {
+    function modify_one_email($email, $activate) 
+    {
+        $allinactive = true;
+        $thisone = false;
         foreach ($this->emails as $i=>$mail) {
             if ($mail->email == $email) {
-                if ($activate)
-                    $this->emails[$i]->activate($this->uid);
-                else
-                    $this->emails[$i]->deactivate($this->uid);
+                $thisone = $i;
+            }
+            $allinactive &= !$mail->active || $mail->email == $email;
+        }
+        if ($thisone === false) {
+            return ERROR_INVALID_EMAIL;
+        }
+        if ($allinactive || $activate) {
+            $this->emails[$thisone]->activate($this->uid);
+        } else {
+            $this->emails[$thisone]->deactivate($this->uid);
+        }
+        check_redirect($this);
+        if ($allinactive && !$activate) {
+            return ERROR_INACTIVE_REDIRECTION;
+        } else {
+            return SUCCESS;
+        } 
+    }
+
+	function modify_one_email_redirect($email, $redirect) {
+		foreach ($this->emails as $i=>$mail) {
+			if ($mail->email == $email) {
+				$this->emails[$i]->rewrite($redirect, $this->uid);
+                check_redirect($this);
+                return;
+			}
+		}
+	}
+    // }}}
+    // {{{ function get_broken_mx()
+
+    function get_broken_mx()
+    {
+        $res = XDB::query("SELECT  host, text
+                             FROM  mx_watch
+                            WHERE  state != 'ok'");
+        if (!$res->numRows()) {
+            return array();
+        }
+        $mxs = $res->fetchAllAssoc();
+        $mails = array();
+        foreach ($this->emails as &$mail) {
+            if ($mail->active) {
+                list(,$domain) = explode('@', $mail->email);
+                getmxrr($domain, $lcl_mxs);
+                if (empty($lcl_mxs)) {
+                    $lcl_mxs = array($domain);
+                }
+                $broken = false;
+                foreach ($mxs as &$mx) {
+                    foreach ($lcl_mxs as $lcl) {
+                        if (fnmatch($mx['host'], $lcl)) {
+                            $broken = $mx['text'];
+                            break;
+                        }
+                    }
+                    if ($broken) {
+                        $mails[] = array('mail' => $mail->email, 'text' => $broken);
+                    }
+                }
             }
         }
+        return $mails;
     }
 
     // }}}
@@ -283,5 +364,5 @@ class Redirect
 
 // }}}
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>