From: Pierre Habouzit (MadCoder Date: Tue, 11 Jan 2005 06:18:04 +0000 (+0000) Subject: correct Pascal's commit a little X-Git-Tag: xorg/old~480 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=3fd4550a6e1e11aca7f3ec793210ab16ddaf080b;p=platal.git correct Pascal's commit a little git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-275 --- diff --git a/ChangeLog b/ChangeLog index 65a07af..b32d8ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,9 @@ Bug/Wish : * Core : - #245: Use PEAR::Date to avoid 1970-2038 php limitations. -MC + * Emails : + - #229: Possibility to show our melix address. -Car + * Misc : - #65: broken links. -MC diff --git a/htdocs/alias.php b/htdocs/alias.php index 0363a7b..e4b14ec 100644 --- a/htdocs/alias.php +++ b/htdocs/alias.php @@ -31,12 +31,12 @@ $page->assign('demande', AliasReq::get_unique_request($uid)); //Récupération des alias éventuellement existants $res = $globals->xdb->query( - "SELECT alias, visibility - FROM virtual + "SELECT alias, emails_alias_pub + FROM auth_user_quick, virtual INNER JOIN virtual_redirect USING(vid) WHERE ( redirect={?} OR redirect= {?} ) - AND alias LIKE '%@{$globals->mail->alias_dom}'", - $forlife.'@'.$globals->mail->domain, $forlife.'@'.$globals->mail->domain2); + AND alias LIKE '%@{$globals->mail->alias_dom}' AND user_id = {?}", + $forlife.'@'.$globals->mail->domain, $forlife.'@'.$globals->mail->domain2, Session::getInt('uid')); list($alias, $visibility) = $res->fetchOneRow(); $page->assign('actuel', $alias); @@ -84,18 +84,18 @@ if (Env::has('alias') and Env::has('raison')) { // montrer son alias elseif ((Env::get('visible') == 'public') && ($visibility != 'public')) { - $globals->xdb->execute("UPDATE virtual SET visibility = 'public' WHERE alias = {?}", $alias); - $visibility = 'public'; + $globals->xdb->execute("UPDATE auth_user_quick SET emails_alias_pub = 'public' WHERE user_id = {?}", Session::getInt('uid')); + $visibility = 'public'; } // cacher son alias elseif ((Env::get('visible') == 'private') && ($visibility != 'private')) { - $globals->xdb->execute("UPDATE virtual SET visibility = 'private' WHERE alias = {?}", $alias); - $visibility = 'private'; + $globals->xdb->execute("UPDATE auth_user_quick SET emails_alias_pub = 'private' WHERE user_id = {?}", Session::getInt('uid')); + $visibility = 'private'; } if ($visibility == 'public') { - $page->assign('mail_public', true); + $page->assign('mail_public', true); } $page->run(); diff --git a/htdocs/fiche.php b/htdocs/fiche.php index 3f3ac10..acf01d2 100644 --- a/htdocs/fiche.php +++ b/htdocs/fiche.php @@ -81,10 +81,10 @@ $res = $globals->xdb->query( "SELECT alias FROM virtual INNER JOIN virtual_redirect USING(vid) + INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) - AND alias LIKE '%@{$globals->mail->alias_dom}' - AND visibility = 'public'", - $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); + AND alias LIKE '%@{$globals->mail->alias_dom}'", + Session::getInt('uid'), $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); $page->run(); diff --git a/htdocs/vcard.php b/htdocs/vcard.php index e29b4cc..79a115e 100644 --- a/htdocs/vcard.php +++ b/htdocs/vcard.php @@ -45,10 +45,10 @@ $res = $globals->xdb->query( "SELECT alias FROM virtual INNER JOIN virtual_redirect USING(vid) + INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) - AND alias LIKE '%@{$globals->mail->alias_dom}' - AND visibility = 'public'", - $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); + AND alias LIKE '%@{$globals->mail->alias_dom}'", + Session::getInt('uid'), $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $user['virtualalias'] = $res->fetchOneCell(); $page->assign_by_ref('vcard', $user); diff --git a/templates/alias.tpl b/templates/alias.tpl index 1adfba4..b3e39ff 100644 --- a/templates/alias.tpl +++ b/templates/alias.tpl @@ -34,21 +34,19 @@ {if $actuel} -

- Ton alias est actuellement : {$actuel}. Il est pour l'instant - {if $mail_public} - public et apparaît donc sur ta fiche. -

-

- Cacher mon alias -

- {else} - privé et n'apparaît nulle part sur le site. -

-

- Rendre mon alias public -

- {/if} +
+ + + + + +
+ + + Ton alias est actuellement : {$actuel}. Il est pour l'instant + {if $mail_public}public et apparaît donc sur ta fiche.{else}privé et n'apparaît nulle part sur le site{/if} +
+
{else}

diff --git a/templates/fiche.tpl b/templates/fiche.tpl index ab18528..3896d02 100644 --- a/templates/fiche.tpl +++ b/templates/fiche.tpl @@ -61,13 +61,13 @@ function chgMainWinLoc( strPage ) { {elseif !$x.inscrit} Le compte de cette personne n'est pas actif (personne non inscrite ou exclue). {else} + {if $virtualalias} + {$virtualalias}
+ {/if} {$x.bestalias}@polytechnique.org {if $bestalias neq $x.forlife}
{$x.forlife}@polytechnique.org {/if} - {if $virtualalias}
- {$virtualalias} - {/if} {/if}

diff --git a/upgrade/0.9.4/30_melix.sql b/upgrade/0.9.4/30_melix.sql new file mode 100644 index 0000000..79ac536 --- /dev/null +++ b/upgrade/0.9.4/30_melix.sql @@ -0,0 +1 @@ +alter table auth_user_quick add column emails_alias_pub enum('public', 'private') not null default 'private';