From: Vincent Zanotti Date: Sun, 24 Aug 2008 15:15:24 +0000 (+0200) Subject: Switches email related classes to the new User model. X-Git-Tag: xorg/0.10.0~86^2~27 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=12a587df92f7bc9efeb91c1a2d27f763070b8609;p=platal.git Switches email related classes to the new User model. Signed-off-by: Vincent Zanotti --- diff --git a/include/emails.inc.php b/include/emails.inc.php index 792d099..f285f08 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -27,12 +27,12 @@ define("ERROR_LOOP_EMAIL", 4); // function fix_bestalias() {{{1 // Checks for an existing 'bestalias' among the the current user's aliases, and // eventually selects a new bestalias when required. -function fix_bestalias($uid) +function fix_bestalias(User &$user) { $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE id = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'", - $uid); + $user->id()); if ($res->fetchOneCell()) { return; } @@ -41,7 +41,7 @@ function fix_bestalias($uid) SET flags=CONCAT(flags,',','bestalias') WHERE id={?} AND type!='homonyme' ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) - LIMIT 1", $uid); + LIMIT 1", $user->id()); } // function valide_email() {{{1 @@ -80,26 +80,28 @@ class Bogo { // properties {{{2 - private $uid; + private $user; private $state; private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); // constructor {{{2 - public function __construct($uid) + public function __construct(User &$user) { - if (!$uid) { + if (!$user) { return; } - $this->uid = $uid; - $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); + $this->user = &$user; + $res = XDB::query('SELECT email FROM emails WHERE uid = {?} AND flags = "filter"', $user->id()); 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); + $res = XDB::query( + "INSERT INTO emails (uid, email, rewrite, panne, flags) + VALUES ({?}, 'tag_and_drop_spams', '', '0000-00-00', 'filter')", + $user->id()); } } @@ -108,8 +110,8 @@ class Bogo public function change($state) { $this->state = is_int($state) ? $this->_states[$state] : $state; - XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', - $this->state, $this->uid); + XDB::execute('UPDATE emails SET email = {?} WHERE uid = {?} AND flags = "filter"', + $this->state, $this->user->id()); } // pubic function level() {{{2 @@ -126,7 +128,7 @@ class Bogo // Storage emails (Polytechnique.org). abstract class Email { - protected $uid; + protected $user; // Basic email properties; $sufficient indicates if the email can be used as // an unique redirection; $email contains the delivery email address. @@ -174,9 +176,9 @@ class EmailRedirection extends Email { // constructor {{{2 - public function __construct($uid, $row) + public function __construct(User &$user, $row) { - $this->uid = $uid; + $this->user = &$user; $this->sufficient = true; list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; @@ -194,8 +196,8 @@ class EmailRedirection extends Email XDB::execute("UPDATE emails SET panne_level = IF(flags = 'panne', panne_level - 1, panne_level), flags = 'active' - WHERE uid={?} AND email={?}", $this->uid, $this->email); - S::logger()->log("email_on", $this->email.($this->uid!=S::v('uid') ? "(admin on {$this->uid})" : "")); + WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email); + S::logger()->log("email_on", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "")); $this->active = true; $this->broken = false; } @@ -207,8 +209,8 @@ class EmailRedirection extends Email { if ($this->active) { XDB::execute("UPDATE emails SET flags ='' - WHERE uid={?} AND email={?}", $this->uid, $this->email); - S::logger()->log("email_off",$this->email.($this->uid != S::v('uid') ? "(admin on {$this->uid})" : "") ); + WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email); + S::logger()->log("email_off", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "") ); $this->active = false; } } @@ -223,7 +225,7 @@ class EmailRedirection extends Email if (!$rewrite || !isvalid_email($rewrite)) { $rewrite = ''; } - XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rewrite, $this->uid, $this->email); + XDB::execute('UPDATE emails SET rewrite = {?} WHERE uid = {?} AND email = {?}', $rewrite, $this->user->id(), $this->email); $this->rewrite = $rewrite; return; } @@ -241,7 +243,7 @@ class EmailRedirection extends Email return XDB::execute("UPDATE emails SET panne_level = 0, panne = 0, last = 0 WHERE uid = {?} AND email = {?}", - $this->uid, $this->email); + $this->user->id(), $this->email); } // public function has_rewrite() {{{2 @@ -281,7 +283,7 @@ class EmailStorage extends Email { $res = XDB::query("SELECT mail_storage FROM auth_user_md5 - WHERE user_id = {?}", $this->uid); + WHERE user_id = {?}", $this->user->id()); return new PlFlagSet($res->fetchOneCell()); } @@ -290,11 +292,11 @@ class EmailStorage extends Email { XDB::execute("UPDATE auth_user_md5 SET mail_storage = {?} - WHERE user_id = {?}", $storages, $this->uid); + WHERE user_id = {?}", $storages, $this->user->id()); } // Returns the list of allowed storages for the @p user. - static public function get_allowed_storages($uid) + static public function get_allowed_storages(User &$user) { global $globals; $storages = array(); @@ -302,7 +304,7 @@ class EmailStorage extends Email // Google Apps storage is available for users with valid Google Apps account. require_once 'googleapps.inc.php'; if ($globals->mailstorage->googleapps_domain && - GoogleAppsAccount::account_status($uid) == 'active') { + GoogleAppsAccount::account_status($user->id()) == 'active') { $storages[] = 'googleapps'; } @@ -316,9 +318,9 @@ class EmailStorage extends Email } - public function __construct($uid, $name) + public function __construct(User &$user, $name) { - $this->uid = $uid; + $this->user = &$user; $this->email = $name; $this->display_email = (isset($this->display_names[$name]) ? $this->display_names[$name] : $name); @@ -373,30 +375,30 @@ class Redirect // properties {{{2 private $flag_active = 'active'; - private $uid; + private $user; public $emails; public $bogo; // constructor {{{2 - public function __construct($_uid) + public function __construct(User &$user) { - $this->uid = $_uid; - $this->bogo = new Bogo($_uid); + $this->user = &$user; + $this->bogo = new Bogo($user); // Adds third-party email redirections. $res = XDB::iterRow("SELECT email, flags, rewrite, panne, last, panne_level FROM emails - WHERE uid = {?} AND flags != 'filter'", $_uid); + WHERE uid = {?} AND flags != 'filter'", $user->id()); $this->emails = Array(); while ($row = $res->next()) { - $this->emails[] = new EmailRedirection($_uid, $row); + $this->emails[] = new EmailRedirection($user, $row); } // Adds local email storage backends. - foreach (EmailStorage::get_allowed_storages($_uid) as $storage) { - $this->emails[] = new EmailStorage($_uid, $storage); + foreach (EmailStorage::get_allowed_storages($user) as $storage) { + $this->emails[] = new EmailStorage($user, $storage); } } @@ -419,8 +421,8 @@ class Redirect if (!$this->other_active($email)) { return ERROR_INACTIVE_REDIRECTION; } - XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email); - S::logger()->log('email_del',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : "")); + XDB::execute('DELETE FROM emails WHERE uid = {?} AND email = {?}', $this->user->id(), $email); + S::logger()->log('email_del', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); foreach ($this->emails as $i => $mail) { if ($email == $mail->email) { unset($this->emails[$i]); @@ -441,19 +443,19 @@ class Redirect if (!isvalid_email_redirection($email_stripped)) { return ERROR_LOOP_EMAIL; } - XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email); + XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->user->id(), $email); if ($logger = S::v('log', null)) { // may be absent --> step4.php - S::logger()->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : "")); + S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); } foreach ($this->emails as $mail) { if ($mail->email == $email_stripped) { return SUCCESS; } } - $this->emails[] = new EmailRedirection($this->uid, array($email, 'active', '', '0000-00-00', '0000-00-00', 0)); + $this->emails[] = new EmailRedirection($this->user, 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_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->user->login()); check_redirect($this); return SUCCESS; } @@ -533,7 +535,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'disable' - WHERE flags = 'active' AND uid = {?}", $this->uid); + WHERE flags = 'active' AND uid = {?}", $this->user->id); foreach ($this->emails as &$mail) { if ($mail->active && $mail->has_disable()) { $mail->disabled = true; @@ -549,7 +551,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'active' - WHERE flags = 'disable' AND uid = {?}", $this->uid); + WHERE flags = 'disable' AND uid = {?}", $this->user->id); foreach ($this->emails as &$mail) { if ($mail->disabled) { $mail->active = true; @@ -613,7 +615,7 @@ class Redirect public function get_uid() { - return $this->uid; + return $this->user->id(); } } diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php index c0a944e..fb9d52c 100644 --- a/include/googleapps.inc.php +++ b/include/googleapps.inc.php @@ -35,7 +35,7 @@ function post_queue_u_create($job) { $account = new GoogleAppsAccount($user); if ($account->activate_mail_redirection) { require_once('emails.inc.php'); - $storage = new EmailStorage($user->id(), 'googleapps'); + $storage = new EmailStorage($user, 'googleapps'); $storage->activate(); } @@ -74,7 +74,7 @@ function post_queue_u_update($job) { if ($account->active()) { // Re-adds the email redirection (if the user did request it). if ($account->activate_mail_redirection) { - $storage = new EmailStorage($user->id, 'googleapps'); + $storage = new EmailStorage($user, 'googleapps'); $storage->activate(); } diff --git a/include/security.inc.php b/include/security.inc.php index e0b1d14..683dd10 100644 --- a/include/security.inc.php +++ b/include/security.inc.php @@ -80,7 +80,7 @@ function check_redirect($red = null) { require_once 'emails.inc.php'; if (is_null($red)) { - $red = new Redirect(S::v('uid')); + $red = new Redirect(S::user()); } if ($red->get_uid() == S::v('uid')) { $_SESSION['no_redirect'] = !$red->other_active(''); diff --git a/modules/admin.php b/modules/admin.php index 96ec608..3e63e39 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -401,7 +401,7 @@ class AdminModule extends PLModule FROM auth_user_md5 WHERE user_id = {?}"; $mr = XDB::query($userinfo_query, $user->id())->fetchOneAssoc(); - $redirect = ($registered ? new Redirect($user->id()) : null); + $redirect = ($registered ? new Redirect($user) : null); // Processes admin requests, if any. foreach($_POST as $key => $val) { @@ -495,7 +495,7 @@ class AdminModule extends PLModule SET rewrite = '' WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", $user->id(), $val); - fix_bestalias($user->id()); + fix_bestalias($user); $page->trigSuccess("L'alias '$val' a été supprimé"); } break; @@ -511,7 +511,7 @@ class AdminModule extends PLModule // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the // validity of the bestalias. - fix_bestalias($user->id()); + fix_bestalias($user); break; // Profile edition. diff --git a/modules/email.php b/modules/email.php index f86c85b..eefe563 100644 --- a/modules/email.php +++ b/modules/email.php @@ -76,7 +76,7 @@ class EmailModule extends PLModule $page->assign('homonyme', $homonyme->fetchOneCell()); // Affichage des redirections de l'utilisateur. - $redirect = new Redirect($uid); + $redirect = new Redirect(S::user()); $page->assign('mails', $redirect->active_emails()); // on regarde si l'utilisateur a un alias et si oui on l'affiche ! @@ -208,7 +208,7 @@ class EmailModule extends PLModule $page->assign('eleve', S::i('promo') >= date("Y") - 5); - $redirect = new Redirect(S::v('uid')); + $redirect = new Redirect(S::user()); // FS#703 : $_GET is urldecoded twice, hence // + (the data) => %2B (in the url) => + (first decoding) => ' ' (second decoding) @@ -282,7 +282,7 @@ class EmailModule extends PLModule $page->changeTpl('emails/antispam.tpl'); - $bogo = new Bogo(S::v('uid')); + $bogo = new Bogo(S::user()); if (isset($statut_filtre)) { $bogo->change($statut_filtre + 0); } @@ -458,7 +458,7 @@ class EmailModule extends PLModule } // Sends the test email. - $redirect = new Redirect($user->id()); + $redirect = new Redirect($user); $mailer = new PlMailer('emails/test.mail.tpl'); $mailer->assign('email', $user->bestEmail()); @@ -472,30 +472,31 @@ class EmailModule extends PLModule function handler_imap_in(&$page, $hash = null, $login = null) { $page->changeTpl('emails/imap_register.tpl'); - $id = null; + $user = null; if (!empty($hash) || !empty($login)) { - $req = XDB::query("SELECT u.prenom, FIND_IN_SET('femme', u.flags) AS sexe, a.id - FROM aliases AS a - INNER JOIN newsletter_ins AS ni ON (a.id = ni.user_id) - INNER JOIN auth_user_md5 AS u ON (u.user_id = a.id) - WHERE a.alias = {?} AND ni.hash = {?}", $login, $hash); - list($prenom, $sexe, $id) = $req->fetchOneRow(); + $user = User::getSilent($login); + if ($user) { + $req = XDB::query("SELECT 1 FROM newsletter_ins WHERE user_id = {?} AND hash = {?}", $user->id(), $hash); + if ($req->numRows() == 0) { + $user = null; + } + } } require_once('emails.inc.php'); $page->assign('ok', false); - if (S::logged() && (is_null($id) || $id == S::i('uid'))) { - $storage = new EmailStorage(S::i('uid'), 'imap'); + if (S::logged() && (is_null($user) || $user->id() == S::i('uid'))) { + $storage = new EmailStorage(S::user(), 'imap'); $storage->activate(); $page->assign('ok', true); $page->assign('prenom', S::v('prenom')); $page->assign('sexe', S::v('femme')); - } else if (!S::logged() && $id) { - $storage = new EmailStorage($id, 'imap'); + } else if (!S::logged() && $user) { + $storage = new EmailStorage($user, 'imap'); $storage->activate(); $page->assign('ok', true); - $page->assign('prenom', $prenom); - $page->assign('sexe', $sexe); + $page->assign('prenom', $user->displayName()); + $page->assign('sexe', $user->isFemale()); } } diff --git a/modules/googleapps.php b/modules/googleapps.php index c2c4e53..0a22f86 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -51,7 +51,7 @@ class GoogleAppsModule extends PLModule $page->assign('redirect_unique', true); if ($account->active()) { - $redirect = new Redirect(S::v('uid')); + $redirect = new Redirect(S::user()); $page->assign('redirect_unique', !$redirect->other_active('googleapps')); $storage = new EmailStorage(S::v('uid'), 'googleapps'); diff --git a/modules/register.php b/modules/register.php index cdfbe5b..2fdcdd9 100644 --- a/modules/register.php +++ b/modules/register.php @@ -297,7 +297,8 @@ class RegisterModule extends PLModule } require_once('emails.inc.php'); - $redirect = new Redirect($uid); + $user = User::getSilent($uid); + $redirect = new Redirect($user); $redirect->add_email($email); // on cree un objet logger et on log l'inscription