X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=22642d873ea1de9252c4ab57458154986035262e;hb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;hp=ab54a400114f03a7c876e42d98901a2182f46484;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index ab54a40..22642d8 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ xdb->query("SELECT COUNT(*) FROM aliases WHERE id={?} AND FIND_IN_SET('bestalias',flags) AND type!='homonyme'", $uid); + $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE id={?} AND FIND_IN_SET('bestalias',flags) AND type!='homonyme'", $uid); if ($n = $res->fetchOneCell()) { return; } - $globals->xdb->execute("UPDATE aliases + 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); } // }}} @@ -50,15 +49,17 @@ function fix_bestalias($uid) function valide_email($str) { - $em = trim(rtrim($str)); - $em = str_replace('<', '', $em); - $em = str_replace('>', '', $em); - list($ident, $dom) = explode('@', $em); - if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { - list($ident1) = explode('_', $ident); - list($ident) = explode('+', $ident1); - } - return $ident . '@' . $dom; + global $globals; + + $em = trim(rtrim($str)); + $em = str_replace('<', '', $em); + $em = str_replace('>', '', $em); + list($ident, $dom) = explode('@', $em); + if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { + list($ident1) = explode('_', $ident); + list($ident) = explode('+', $ident1); + } + return $ident . '@' . $dom; } // }}} @@ -67,24 +68,26 @@ function valide_email($str) class Bogo { // {{{ properties - + var $state; - var $_states = Array('let_spams', 'tag_spams', 'drop_spams'); + var $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); // }}} // {{{ constructor - + function Bogo($uid) { - global $globals; - $res = $globals->xdb->query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); - if ($res->numRows()) { - $this->state = $res->fetchOneCell(); - } else { - $this->state = 'tag_spams'; - $res = $globals->xdb->query("INSERT INTO emails (uid,email,rewrite,panne,flags) - VALUES ({?},'tag_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,9 +95,9 @@ class Bogo function change($uid, $state) { - global $globals; - $this->state = is_int($state) ? $this->_states[$state] : $state; - $globals->xdb->execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', $this->state, $uid); + $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'); } // }}} @@ -131,12 +139,14 @@ class Email function activate($uid) { - global $globals; if (!$this->active) { - $globals->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; } } @@ -145,11 +155,10 @@ class Email function deactivate($uid) { - global $globals; if ($this->active) { - $globals->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)" : "") ); + XDB::execute("UPDATE emails SET flags ='' + WHERE uid={?} AND email={?}", $uid, $this->email); + $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") ); $this->active = false; } } @@ -159,13 +168,12 @@ class Email function rewrite($rew, $uid) { - global $globals; - if ($this->rewrite == $rew) { + if ($this->rewrite == $rew) { return; } - $globals->xdb->execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email); - $this->rewrite = $rew; - return; + XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email); + $this->rewrite = $rew; + return; } // }}} @@ -188,16 +196,15 @@ class Redirect function Redirect($_uid) { - global $globals; - $this->uid=$_uid; - $res = $globals->xdb->iterRow(" - SELECT email, flags='active', rewrite, panne - FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid); - $this->emails=Array(); + $this->uid=$_uid; + $res = XDB::iterRow(" + 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,17 +225,16 @@ class Redirect function delete_email($email) { - global $globals; if (!$this->other_active($email)) { return ERROR_INACTIVE_REDIRECTION; } - $globals->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) { + XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $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]); } - } + } return SUCCESS; } @@ -237,7 +243,6 @@ class Redirect function add_email($email) { - global $globals; $email_stripped = strtolower(trim($email)); if (!isvalid_email($email_stripped)) { return ERROR_INVALID_EMAIL; @@ -245,16 +250,36 @@ class Redirect if (!isvalid_email_redirection($email_stripped)) { return ERROR_LOOP_EMAIL; } - $globals->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})" : "")); + XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email); + 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')); + + // 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); + $mailer = new PlMailer(); + $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(); + } return SUCCESS; } @@ -263,17 +288,47 @@ class Redirect function modify_email($emails_actifs,$emails_rewrite) { - global $globals; - 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); + } + } + + function modify_one_email($email, $activate) { + $allinactive = true; + $thisone = false; + foreach ($this->emails as $i=>$mail) { + if ($mail->email == $email) { + $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); + 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); + return; + } + } + } // }}} }