From 5a1fbe704957bb1138138e40a2c5fe60e132af3a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 15 Oct 2019 14:06:33 +0200
Subject: [PATCH] Use letter avatar when user have no personal avatar is set in
 addressbook

---
 addressbook/templates/default/app.css   |  1 +
 addressbook/templates/default/index.xet |  2 +-
 addressbook/templates/pixelegg/app.css  |  3 ++
 api/js/etemplate/et2_widget_image.js    | 52 ++++++++++++++++++++++++-
 api/src/Contacts.php                    |  5 ++-
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 74dbfa1a66..b68cf3ab3a 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -86,6 +86,7 @@ input.et2_radiobox {
 	height: auto;
 }
 #addressbook-index .avatar img.iphoto {border:none;box-shadow: none;}
+#addressbook-index .avatar span {margin-right: 0;}
 #addressbook-index_org_view, #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
 	top: 0;
 	padding-top: 0;
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 6a91bc81ec..269f23137c 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -109,7 +109,7 @@
 					<listbox type="select-cat" id="${row}[cat_id]" readonly="true" rows="2"/>
 					<box>
 						<hbox class="avatar">
-							<image src="${row}[photo]" class="iphoto"/>
+							<lavatar src="${row}[photo]" contact_id="$row_cont[id]" class="iphoto" lname="$row_cont[n_family]" fname="$row_cont[n_given]"/>
 						</hbox>
 					</box>
 					<date id="${row}[bday]" readonly="true" options="Y-m-d"/>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 9e64ca680b..b2bce95028 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -103,6 +103,9 @@ input.et2_radiobox {
   border: none;
   box-shadow: none;
 }
+#addressbook-index .avatar span {
+  margin-right: 0;
+}
 #addressbook-index_org_view,
 #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
   top: 0;
diff --git a/api/js/etemplate/et2_widget_image.js b/api/js/etemplate/et2_widget_image.js
index 190aea3851..4370c1a6d9 100644
--- a/api/js/etemplate/et2_widget_image.js
+++ b/api/js/etemplate/et2_widget_image.js
@@ -583,6 +583,52 @@ var et2_avatar_ro = (function(){ "use strict"; return et2_avatar.extend(
 });}).call(this);
 et2_register_widget(et2_avatar_ro, ["avatar_ro"]);
 
+/**
+ * Letter Avatar widget to display user profile picture (given url) or
+ * user letter avatar based on user's firstname lastname.
+ *
+ * It will use client-side lavatar if all the following conditions are met:
+ *  - contact_id, lname and fname are all set.
+ *  - the given src url includes flag of lavatar=1 which means there's
+ *    no personal avatar set for the contact yet.
+ *
+ * @augments et2_baseWidget
+ */
+var et2_lavatar = (function(){ "use strict"; return et2_image.extend(
+{
+	attributes: {
+		lname: {
+			name: "last name",
+			type: "string",
+			default: "",
+			description:""
+		},
+		fname: {
+			name: "first name",
+			type: "string",
+			default: "",
+			description: ""
+		},
+
+		contact_id: {
+			name: "contact id",
+			type: "string",
+			default: "",
+			description: ""
+		}
+	},
+
+	set_src: function(_url){
+		if (_url && decodeURIComponent(_url).match("lavatar=1") && (this.options.fname || this.options.lname) && this.options.contact_id)
+		{
+			this.set_src(et2_avatar.lavatar(this.options.fname, this.options.lname, this.options.contact_id));
+			return false;
+		}
+		this._super.apply(this,arguments);
+	}
+});}).call(this);
+et2_register_widget(et2_lavatar, ["lavatar"]);
+
 jQuery.extend(et2_avatar,
 {
 	/**
@@ -643,7 +689,7 @@ jQuery.extend(et2_avatar,
 		};
 		var bg = getBgColor(str);
 		var size = et2_avatar.LAVATAR_SIZE * (window.devicePixelRatio ? window.devicePixelRatio : 1);
-		var text = _fname[0].toUpperCase()+_lname[0].toUpperCase();
+		var text = (_fname ? _fname[0].toUpperCase() : "")+(_lname ? _lname[0].toUpperCase() : "");
 		var canvas = document.createElement('canvas');
 		canvas.width = size;
 		canvas.height = size;
@@ -654,6 +700,8 @@ jQuery.extend(et2_avatar,
 		context.textAlign = "center";
 		context.fillStyle = et2_avatar.LAVATAR_TEXT_COLOR;
 		context.fillText(text, size / 2, size / 1.5);
-		return canvas.toDataURL();
+		var dataURL = canvas.toDataURL();
+		canvas.remove();
+		return dataURL;
 	}
 });
\ No newline at end of file
diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index 35fc441b7c..607bfc40bf 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -765,9 +765,10 @@ class Contacts extends Contacts\Storage
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg || !$default ? Egw::link('/api/avatar.php', array(
-			'contact_id' => $id
+			'contact_id' => $id,
+			'lavatar' => !$jpeg ? true : false
 		)+(isset($etag) ? array(
-			'etag'       => $etag,
+			'etag'       => $etag
 		) : array())) : $default;
 	}