From 40b34dc0e31d079b7a1b3b052041ea7f5d09d878 Mon Sep 17 00:00:00 2001
From: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Date: Mon, 28 Apr 2014 10:01:05 +1200
Subject: [PATCH] MDL-45079 badges: Remove user email address from badge page

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
---
 badges/renderer.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/badges/renderer.php b/badges/renderer.php
index 94c4e243fb2..65bef40162c 100644
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -323,11 +323,6 @@ class core_badges_renderer extends plugin_renderer_base {
             $datatable->data[] = array(get_string('name'), get_string('error:userdeleted', 'badges', $strdata));
         } else {
             $datatable->data[] = array(get_string('name'), fullname($userinfo));
-            if (empty($userinfo->backpackemail)) {
-                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->accountemail));
-            } else {
-                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->backpackemail));
-            }
         }
 
         $datatable->data[] = array($this->output->heading(get_string('issuerdetails', 'badges'), 3), '');
@@ -414,13 +409,11 @@ class core_badges_renderer extends plugin_renderer_base {
         $datatable->data[] = array($this->output->heading(get_string('recipientdetails', 'badges'), 3), '');
         // Technically, we should alway have a user at this point, but added an extra check just in case.
         if ($userinfo) {
-            $datatable->data[] = array(get_string('name'), fullname($userinfo));
+            $notify = '';
             if (!$ibadge->valid) {
                 $notify = $this->output->notification(get_string('recipientvalidationproblem', 'badges'), 'notifynotice');
-                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->email) . $notify);
-            } else {
-                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->email));
             }
+            $datatable->data[] = array(get_string('name'), fullname($userinfo). $notify);
         } else {
             $notify = $this->output->notification(get_string('recipientidentificationproblem', 'badges'), 'notifynotice');
             $datatable->data[] = array(get_string('name'), $notify);
@@ -945,10 +938,8 @@ class issued_badge implements renderable {
         if ($rec) {
             // Get a recipient from database.
             $namefields = get_all_user_name_fields(true, 'u');
-            $user = $DB->get_record_sql("SELECT u.id, $namefields, u.deleted,
-                                                u.email AS accountemail, b.email AS backpackemail
-                        FROM {user} u LEFT JOIN {badge_backpack} b ON u.id = b.userid
-                        WHERE u.id = :userid", array('userid' => $rec->userid));
+            $user = $DB->get_record_sql("SELECT u.id, $namefields, u.deleted, u.email
+                        FROM {user} u WHERE u.id = :userid", array('userid' => $rec->userid));
             $this->recipient = $user;
             $this->visible = $rec->visible;
             $this->badgeid = $rec->badgeid;