From 488f1cdabb905add975e6d3f14b2322d4a99a3fd Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 27 Aug 2012 22:27:52 +0200
Subject: [PATCH] Hide email if setting was "on"

---
 main/inc/ajax/user_manager.ajax.php | 10 +++++++---
 main/inc/lib/course.lib.php         |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php
index 177405e7d3..409389bd4d 100644
--- a/main/inc/ajax/user_manager.ajax.php
+++ b/main/inc/ajax/user_manager.ajax.php
@@ -19,9 +19,13 @@ switch ($action) {
             echo '<img src="'.$user_info['avatar'].'" /> ';
             echo '</div>';
             echo '</div>';
-            echo '<div class="span2">';
-            
-            echo '<h3>'.$user_info['complete_name'].'</h3> '.$user_info['mail'].' '.$user_info['official_code'];
+            echo '<div class="span3">';            
+            if (api_get_setting('show_email_addresses') == 'false') {
+                $user_info['mail'] = ' ';
+            } else {
+                $user_info['mail'] = ' '.$user_info['mail'].' ';
+            }
+            echo '<h3>'.$user_info['complete_name'].'</h3>'.$user_info['mail'].$user_info['official_code'];
             echo '<br/><br/><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_info['user_id'].'">'.get_lang('ViewSharedProfile').'</a>';
             echo '</div>';
             echo '</div>';
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index cf5e30fb2f..71a9172498 100644
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1364,7 +1364,7 @@ class CourseManager {
             foreach($teacher_list as $teacher) {
                 $teacher_name = api_get_person_name($teacher['firstname'], $teacher['lastname']);
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&resizable=0&height=350&user_id='.$teacher['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&resizable=0&height=300&user_id='.$teacher['user_id'];
                     $teacher_name = Display::url($teacher_name, $url, array('class' => 'ajax'));
                 }
                  $list[]= $teacher_name;
@@ -1423,7 +1423,7 @@ class CourseManager {
             foreach ($coachs_course as $coach_course) {
                 $coach_name = api_get_person_name($coach_course['firstname'], $coach_course['lastname']);
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&resizable=0&height=350&user_id='.$coach_course['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&resizable=0&height=300&user_id='.$coach_course['user_id'];
                     $coach_name = Display::url($coach_name, $url, array('class' => 'ajax'));
                 }
                 $course_coachs[] = $coach_name;