From 90f55162a15f43c0cc8ff540463d5590f4ffc99c Mon Sep 17 00:00:00 2001
From: Alex Bogdanovski <alex@erudika.com>
Date: Wed, 20 Sep 2017 14:27:39 +0300
Subject: [PATCH] fixed broken profile pictures of deleted users, show notice
 of user object deleted

---
 .../scoold/controllers/ErrorController.java    | 18 +++++++++---------
 .../scoold/controllers/ProfileController.java  |  2 +-
 .../java/com/erudika/scoold/core/Feedback.java |  2 --
 .../java/com/erudika/scoold/core/Question.java |  2 --
 .../com/erudika/scoold/utils/ScooldUtils.java  |  8 ++++++++
 src/main/resources/templates/feedback.vm       |  6 ++++--
 src/main/resources/templates/macro.vm          |  5 ++++-
 src/main/resources/templates/profile.vm        |  4 ++++
 src/main/resources/templates/question.vm       |  2 +-
 src/main/resources/templates/questions.vm      |  4 +++-
 10 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/erudika/scoold/controllers/ErrorController.java b/src/main/java/com/erudika/scoold/controllers/ErrorController.java
index c94e6f06..76adb0b7 100755
--- a/src/main/java/com/erudika/scoold/controllers/ErrorController.java
+++ b/src/main/java/com/erudika/scoold/controllers/ErrorController.java
@@ -1,12 +1,3 @@
-package com.erudika.scoold.controllers;
-
-import com.erudika.scoold.utils.ScooldUtils;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 /*
  * Copyright 2013-2017 Erudika. https://erudika.com
@@ -25,6 +16,15 @@
  *
  * For issues and patches go to: https://github.com/erudika
  */
+package com.erudika.scoold.controllers;
+
+import com.erudika.scoold.utils.ScooldUtils;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  *
diff --git a/src/main/java/com/erudika/scoold/controllers/ProfileController.java b/src/main/java/com/erudika/scoold/controllers/ProfileController.java
index af7227ce..dd17c58b 100755
--- a/src/main/java/com/erudika/scoold/controllers/ProfileController.java
+++ b/src/main/java/com/erudika/scoold/controllers/ProfileController.java
@@ -92,7 +92,7 @@ public String get(@PathVariable(required = false) String id, HttpServletRequest
 		model.addAttribute("isMyProfile", isMyProfile);
 		model.addAttribute("badgesCount", showUser.getBadgesMap().size());
 		model.addAttribute("canEdit", isMyProfile || canEditProfile(authUser, id));
-		model.addAttribute("gravatarPicture", utils.getGravatar(showUser.getUser().getEmail()));
+		model.addAttribute("gravatarPicture", utils.getGravatar(showUser));
 		model.addAttribute("itemcount1", itemcount1);
 		model.addAttribute("itemcount2", itemcount2);
 		model.addAttribute("questionslist", questionslist);
diff --git a/src/main/java/com/erudika/scoold/core/Feedback.java b/src/main/java/com/erudika/scoold/core/Feedback.java
index f7be46ed..3f01bd7c 100755
--- a/src/main/java/com/erudika/scoold/core/Feedback.java
+++ b/src/main/java/com/erudika/scoold/core/Feedback.java
@@ -17,8 +17,6 @@
  */
 package com.erudika.scoold.core;
 
-import java.io.Serializable;
-
 /**
  *
  * @author Alex Bogdanovski [alex@erudika.com]
diff --git a/src/main/java/com/erudika/scoold/core/Question.java b/src/main/java/com/erudika/scoold/core/Question.java
index 093f0a3d..e75b2726 100755
--- a/src/main/java/com/erudika/scoold/core/Question.java
+++ b/src/main/java/com/erudika/scoold/core/Question.java
@@ -17,8 +17,6 @@
  */
 package com.erudika.scoold.core;
 
-import java.io.Serializable;
-
 /**
  *
  * @author Alex Bogdanovski [alex@erudika.com]
diff --git a/src/main/java/com/erudika/scoold/utils/ScooldUtils.java b/src/main/java/com/erudika/scoold/utils/ScooldUtils.java
index 0dd89084..77eceb99 100755
--- a/src/main/java/com/erudika/scoold/utils/ScooldUtils.java
+++ b/src/main/java/com/erudika/scoold/utils/ScooldUtils.java
@@ -326,6 +326,14 @@ public String getGravatar(String email) {
 		return "https://www.gravatar.com/avatar/" + Utils.md5(email) + "?size=400&d=retro";
 	}
 
+	public String getGravatar(Profile profile) {
+		if (profile == null || profile.getUser() == null) {
+			return "https://www.gravatar.com/avatar?d=retro&size=400";
+		} else {
+			return getGravatar(profile.getUser().getEmail());
+		}
+	}
+
 	public void clearSession(HttpServletRequest req, HttpServletResponse res) {
 		if (req != null) {
 			HttpSession session = req.getSession(false);
diff --git a/src/main/resources/templates/feedback.vm b/src/main/resources/templates/feedback.vm
index 803a8949..da5faeb6 100755
--- a/src/main/resources/templates/feedback.vm
+++ b/src/main/resources/templates/feedback.vm
@@ -29,7 +29,9 @@
 					<ul id="tags-dropdown" class="dropdown-content ac-dropdown"></ul>
 					<input type="hidden" name="tags" class="ac-hidden" value="">
 				</div>
-				#getmessagebox("red white-text" $error.get("tags"))
+				<div class="pll mll">
+					#getmessagebox("red white-text" $error.get("tags"))
+				</div>
 
 				<div><i class="fa fa-save save-icon green-text hidden-save-icon"></i> &nbsp;</div>
 				<button class="btn mtl waves-effect waves-light" type="submit">
@@ -81,7 +83,7 @@
 				</div>
 				#else
 					<div class="mtl ptl center">
-						<a href="$signinlink?returnto=$!returnto" rel="nofollow" class="btn"
+						<a href="$signinlink?returnto=$!returnto" rel="nofollow" class="btn-large"
 									 title="Reply"><i class="fa fa-pencil"></i> $!lang.get("feedback.writereply")</a>
 					</div>
 				#end
diff --git a/src/main/resources/templates/macro.vm b/src/main/resources/templates/macro.vm
index 600eb62b..da9445fe 100755
--- a/src/main/resources/templates/macro.vm
+++ b/src/main/resources/templates/macro.vm
@@ -209,6 +209,9 @@
 					#if ($showFriend.groups == "mods")
 					<i class="fa fa-dot-circle-o orange-text mhs tooltipped" data-delay="0" data-tooltip="$!lang.get('mod')"></i>
 					#end
+					#if(!$showFriend.user && $isMod)
+						<small class="grey-text">$!lang.get("profile.deleted")</small>
+					#end
 					<div class="grey-text r prl tooltipped" data-position="top" data-tooltip="$!{lang.get('profile.about.lastseen')}">
 						<i class="fa fa-clock-o"></i> #formatdate($!{showFriend.lastseen} "")
 					</div>
@@ -633,7 +636,7 @@ $utils.formatDate($date, $format, $currentLocale)
 <div class="progress ajaxwait $!{hidden}"><div class="indeterminate"></div></div>
 #end
 #####################################
-#macro(profilepic $user)#if($user && $user.picture.matches("^(http:|https:|data:).*"))$!{user.picture}#else https://www.gravatar.com/avatar/?size=350&d=mm #end#end
+#macro(profilepic $user)#if($user && $user.user && $user.picture.matches("^(http:|https:|data:).*"))$!{user.picture}#else https://www.gravatar.com/avatar/?size=350&d=mm #end#end
 #####################################
 #macro(infostrip )
 	#if ($request.getParameter("success"))
diff --git a/src/main/resources/templates/profile.vm b/src/main/resources/templates/profile.vm
index 2179ca38..68a613fe 100755
--- a/src/main/resources/templates/profile.vm
+++ b/src/main/resources/templates/profile.vm
@@ -142,6 +142,10 @@
 						$!{lang.get("profile.about.lastseen")} #formatdate($!{showUser.lastseen} "")</h5>
 				#end
 
+				#if(!$showUser.user && $isMod)
+					<h5 class="grey-text text-darken-1 pvs"><i class="fa fa-warning"></i> &nbsp; $!lang.get("profile.deleted")</h5>
+				#end
+
 				#set($badges = $showUser.badgesMap)
 				#if (!$badges.isEmpty())
 					<span class="largeText grey-text text-darken-1" title=" $!lang.get('badges.title')"><i class="fa fa-star"></i>&nbsp;</span>
diff --git a/src/main/resources/templates/question.vm b/src/main/resources/templates/question.vm
index 1d86a03b..1e1d0539 100755
--- a/src/main/resources/templates/question.vm
+++ b/src/main/resources/templates/question.vm
@@ -65,7 +65,7 @@
 					</div>
 				#else
 					<div class="mtl ptl center">
-							<a href="$signinlink?returnto=$!returnto" rel="nofollow" class="btn"
+							<a href="$signinlink?returnto=$!returnto" rel="nofollow" class="btn-large"
 								 title="Answer this question"><i class="fa fa-pencil"></i> $!lang.get("posts.writeanswer")</a>
 					</div>
 				#end
diff --git a/src/main/resources/templates/questions.vm b/src/main/resources/templates/questions.vm
index 503906d1..6dabf67f 100755
--- a/src/main/resources/templates/questions.vm
+++ b/src/main/resources/templates/questions.vm
@@ -32,7 +32,9 @@
 					<ul id="tags-dropdown" class="dropdown-content ac-dropdown"></ul>
 					<input type="hidden" name="tags" class="ac-hidden" value="">
 				</div>
-				#getmessagebox("red white-text" $error.get("tags"))
+				<div class="pll mll">
+					#getmessagebox("red white-text" $error.get("tags"))
+				</div>
 
 				<a href="#" class="next-div-toggle mll pll click2hide">
 					<i class="fa fa-map-marker"></i> $!lang.get("posts.location")