Typo

[platal.git] / include / emails.inc.php

diff --git a/include/emails.inc.php b/include/emails.inc.php
index c3852d3..dbfa739 100644 (file)
--- 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   *
@@ -171,6 +171,9 @@ class Email
         if ($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;
@@ -235,6 +238,7 @@ class Redirect
                 unset($this->emails[$i]);
             }
         }
+        check_redirect($this);
         return SUCCESS;
     }
 
@@ -259,28 +263,11 @@ class Redirect
                 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
-        $res = XDB::query("SELECT state, description
-                             FROM emails_watch
-                            WHERE state != 'safe' AND email = {?}", $email);
-        if ($res->numRows()) {
-            $row = $res->fetchOneAssoc();
-            $message = "L'email $email vient d'être ajouté aux redirections de ". S::v('forlife')
-                     . ". Cette adresse est surveillée avec l'état *" . $row['state']
-                     . "* et la description :\n" . $row['description'];
-            $message = wordwrap($message);
-            require_once("diogenes/diogenes.hermes.inc.php");
-            $mailer = new HermesMailer();
-            $mailer->setFrom("webmaster@polytechnique.org");
-            $mailer->addTo("hotliners@staff.polytechnique.org");
-            $mailer->setSubject("ALERTE LORS DE L'AJOUT DE REDIRECTION de "
-                . S::v('prenom') . ' ' . S::v('nom') . '(' . S::v('promo') . ')');
-            $mailer->setTxtBody($message
-                . "\n\nInformations de connexion :\n" . var_export($_SERVER, true));
-            $mailer->send();
-        } 
+        check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->uid);
+        check_redirect($this);
         return SUCCESS;
     }
 
@@ -297,17 +284,79 @@ class Redirect
             }
             $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;
     }
 
     // }}}
@@ -315,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:
 ?>