From fe6080a465a267e7b5542c8f4f23d13c483df642 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Tue, 25 Oct 2011 00:25:17 +0200
Subject: [PATCH] Better fix for virtualalias visibility.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 classes/profile.php                    | 2 +-
 modules/email.php                      | 6 +++---
 templates/emails/alias.tpl             | 2 +-
 upgrade/1.1.4/10_virtual_alias_pub.sql | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 upgrade/1.1.4/10_virtual_alias_pub.sql

diff --git a/classes/profile.php b/classes/profile.php
index 953d1d9..d46b864 100644
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -483,7 +483,7 @@ class Profile implements PlExportable
 
         XDB::execute("UPDATE  profiles
                          SET  cv = NULL, freetext = NULL, freetext_pub = 'private',
-                              medals_pub = 'private', alias_pub = 'private',
+                              medals_pub = 'private', alias_pub = 'hidden',
                               email_directory = NULL
                        WHERE  pid = {?}",
                      $this->id());
diff --git a/modules/email.php b/modules/email.php
index 86c2a7e..331eacf 100644
--- a/modules/email.php
+++ b/modules/email.php
@@ -152,7 +152,7 @@ class EmailModule extends PLModule
                                                  INNER JOIN  email_virtual_domains AS d ON (s.domain = d.id)
                                                       WHERE  s.uid = {?} AND s.type = \'alias_aux\'',
                                                     $user->id());
-        $visibility = $user->hasProfile() && ($user->profile(true)->alias_pub == 'public');
+        $visibility = $user->hasProfile() && $user->profile()->isVisible($user->profile()->alias_pub);
         $page->assign('current', $alias);
         $page->assign('user', $user);
         $page->assign('mail_public', $visibility);
@@ -163,11 +163,11 @@ class EmailModule extends PLModule
             // Retrieves user request.
             $new_alias  = Env::v('alias');
             $reason = Env::v('reason');
-            $public = (Env::v('public', 'off') == 'on') ? 'public' : 'private';
+            $public = (Env::v('public', 'off') == 'on') ? 'private' : 'hidden';
 
             $page->assign('r_alias', $new_alias);
             $page->assign('r_reason', $reason);
-            if ($public == 'public') {
+            if ($public == 'private') {
                 $page->assign('r_public', true);
             }
 
diff --git a/templates/emails/alias.tpl b/templates/emails/alias.tpl
index 8eb7b75..9ebb6bf 100644
--- a/templates/emails/alias.tpl
+++ b/templates/emails/alias.tpl
@@ -41,7 +41,7 @@
     <tr>
       <td class="orange">
         <input type="checkbox" {if $mail_public}checked="checked"{/if}
-            onclick="$.xget('{$globals->baseurl}/emails/alias/set/'+(this.checked?'public':'private')+'?token={xsrf_token}');
+            onclick="$.xget('{$globals->baseurl}/emails/alias/set/'+(this.checked?'private':'hidden')+'?token={xsrf_token}');
                 $('#mail_public').html((this.checked?'public et apparaît donc sur ta fiche':'privé et n\'apparaît nulle part sur le site') + '.');
             " />
       </td>
diff --git a/upgrade/1.1.4/10_virtual_alias_pub.sql b/upgrade/1.1.4/10_virtual_alias_pub.sql
new file mode 100644
index 0000000..4151e8a
--- /dev/null
+++ b/upgrade/1.1.4/10_virtual_alias_pub.sql
@@ -0,0 +1,4 @@
+UPDATE profiles SET alias_pub = 'hidden' WHERE alias_pub = 'private';
+UPDATE profiles SET alias_pub = 'private' WHERE alias_pub = 'public';
+
+-- vim:set syntax=mysql:
-- 
2.1.4