X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=4209f19faf3b6473dea8bea65f13468ac695472d;hb=b65169f172b0b06c7731cfc67aaea15081fc0d31;hp=d76b821a6d14b682b7dbeef20452205b69a23b20;hpb=06a548e57db2a5f848e7b0f6110d219eaa114f00;p=platal.git

diff --git a/modules/profile.php b/modules/profile.php
index d76b821..4209f19 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -56,18 +56,18 @@ class ProfileModule extends PLModule
             'groupes-x/logo'             => $this->make_hook('xnetlogo',                   AUTH_PUBLIC),
 
             'vcard'                      => $this->make_hook('vcard',                      AUTH_COOKIE, 'user', NO_HTTPS),
-            'admin/binets'               => $this->make_hook('admin_binets',               AUTH_MDP, 'admin'),
-            'admin/medals'               => $this->make_hook('admin_medals',               AUTH_MDP, 'admin'),
-            'admin/education'            => $this->make_hook('admin_education',            AUTH_MDP, 'admin'),
-            'admin/education_field'      => $this->make_hook('admin_education_field',      AUTH_MDP, 'admin'),
-            'admin/education_degree'     => $this->make_hook('admin_education_degree',     AUTH_MDP, 'admin'),
-            'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP, 'admin'),
-            'admin/sections'             => $this->make_hook('admin_sections',             AUTH_MDP, 'admin'),
-            'admin/networking'           => $this->make_hook('admin_networking',           AUTH_MDP, 'admin'),
-            'admin/trombino'             => $this->make_hook('admin_trombino',             AUTH_MDP, 'admin'),
-            'admin/corps_enum'           => $this->make_hook('admin_corps_enum',           AUTH_MDP, 'admin'),
-            'admin/corps_rank'           => $this->make_hook('admin_corps_rank',           AUTH_MDP, 'admin'),
-            'admin/names'                => $this->make_hook('admin_names',                AUTH_MDP, 'admin'),
+            'admin/binets'               => $this->make_hook('admin_binets',               AUTH_MDP,    'admin'),
+            'admin/medals'               => $this->make_hook('admin_medals',               AUTH_MDP,    'admin'),
+            'admin/education'            => $this->make_hook('admin_education',            AUTH_MDP,    'admin'),
+            'admin/education_field'      => $this->make_hook('admin_education_field',      AUTH_MDP,    'admin'),
+            'admin/education_degree'     => $this->make_hook('admin_education_degree',     AUTH_MDP,    'admin'),
+            'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP,    'admin'),
+            'admin/sections'             => $this->make_hook('admin_sections',             AUTH_MDP,    'admin'),
+            'admin/networking'           => $this->make_hook('admin_networking',           AUTH_MDP,    'admin'),
+            'admin/trombino'             => $this->make_hook('admin_trombino',             AUTH_MDP,    'admin'),
+            'admin/corps_enum'           => $this->make_hook('admin_corps_enum',           AUTH_MDP,    'admin'),
+            'admin/corps_rank'           => $this->make_hook('admin_corps_rank',           AUTH_MDP,    'admin'),
+            'admin/names'                => $this->make_hook('admin_names',                AUTH_MDP,    'admin'),
         );
     }
 
@@ -285,7 +285,7 @@ class ProfileModule extends PLModule
 
         // Determines and displays the virtual alias.
         if (!is_null($owner) && $profile->alias_pub == 'public') {
-            $page->assign('virtualalias', $owner->emailAliases());
+            $page->assign('virtualalias', $owner->emailAlias());
         }
 
         $page->assign_by_ref('profile', $profile);
@@ -427,12 +427,12 @@ class ProfileModule extends PLModule
         require_once "education.func.inc.php";
     }
 
-    function handler_ajax_medal($page, $id)
+    function handler_ajax_medal($page, $i, $id)
     {
         pl_content_headers("text/html");
         $page->changeTpl('profile/deco.medal.tpl', NO_SKIN);
-        $page->assign('id', $id);
-        $page->assign('medal', array('valid' => 0, 'grade' => 0));
+        $page->assign('id', $i);
+        $page->assign('medal', array('id' => $id, 'grade' => 0, 'valid' => 0));
     }
 
     function handler_ajax_job($page, $id)
@@ -667,7 +667,7 @@ class ProfileModule extends PLModule
         }
 
         $vcard = new VCard();
-        $vcard->addProfile(Profile::get($x));
+        $vcard->addProfile(Profile::get($x, Profile::FETCH_ALL));
         $vcard->show();
     }