extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mail: Prefer client-side lavatar over server-side in mail list

Browse Source
This commit is contained in:
nathan 2023-01-27 15:10:25 -07:00
parent f503743956
commit d94c10b09f
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mail/inc/class.mail_ui.inc.php
View File

@ -2132,18 +2132,26 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if ($_folderType) if ($_folderType)
{ {
$fromcontact = self::getContactFromAddress($data['fromaddress']); $fromcontact = self::getContactFromAddress($data['fromaddress']);
if (!empty($fromcontact)) if(!empty($fromcontact) && $fromcontact[0]['photo'])
{ {
$data['fromavatar'] = self::getContactFromAddress($data['fromaddress'])[0]['photo']; $data['fromavatar'] = $fromcontact[0]['photo'];
} }
} }
$data['address'] = ($_folderType ? $data["toaddress"] : $data["fromaddress"]); $data['address'] = ($_folderType ? $data["toaddress"] : $data["fromaddress"]);
$data['lavatar'] = ['fname' => $data['address']];
$contact = self::getContactFromAddress($data['address']); $contact = self::getContactFromAddress($data['address']);
if (!empty($contact)) if(!empty($contact))
{ {
$data['avatar'] = $contact[0]['photo']; $data['lavatar'] = ['fname' => $contact[0]['n_given'], 'lname' => $contact[0]['n_family']];
if (!$_folderType) $data['fromavatar'] = $data['avatar']; if($contact[0]['photo'])
{
$data['avatar'] = $contact[0]['photo'];
}
if(!$_folderType)
{
$data['fromavatar'] = $data['avatar'];
}
} }
if (in_array("bodypreview", $cols)&&$header['bodypreview']) if (in_array("bodypreview", $cols)&&$header['bodypreview'])
@ -2372,7 +2380,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
return $GLOBALS['egw']->contacts->search( return $GLOBALS['egw']->contacts->search(
array('contact_email' => $email[0], 'contact_email_home' => $email[0]), array('contact_email' => $email[0], 'contact_email_home' => $email[0]),
array('contact_id', 'email', 'email_home', 'n_fn'), array('contact_id', 'email', 'email_home', 'n_fn', 'n_given', 'n_family'),
'', '', '', false, 'OR', false '', '', '', false, 'OR', false
); );
} }

16
mail/templates/default/index.rows.horizental.xet
View File

@ -31,18 +31,20 @@
<nextmatch-header statustext="security" label="Security" id="security"/> <nextmatch-header statustext="security" label="Security" id="security"/>
</row> </row>
<row class="$row_cont[class]"> <row class="$row_cont[class]">
<et2-lavatar image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"></et2-lavatar> <et2-lavatar image="$row_cont[avatar]" fname="$row_cont[lavatar][fname]"
<et2-description span="1" class="status_img"></et2-description> lname="$row_cont[lavatar][lname]" size="2.75em" shape="rounded"></et2-lavatar>
<et2-description span="1" class="status_img"></et2-description>
<html id="${row}[attachments]"/> <html id="${row}[attachments]"/>
<et2-vbox> <et2-vbox>
<et2-description id="${row}[subject]" noLang="1"></et2-description> <et2-description id="${row}[subject]" noLang="1"></et2-description>
<et2-description id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description> <et2-description id="${row}[bodypreview]" class="et2_label bodypreview"
noLang="1"></et2-description>
</et2-vbox> </et2-vbox>
<et2-hbox> <et2-hbox>
<et2-date-time align="center" id="${row}[date]" readonly="true"></et2-date-time> <et2-date-time align="center" id="${row}[date]" readonly="true"></et2-date-time>
</et2-hbox> </et2-hbox>
<et2-date-time-today align="center" id="${row}[modified]" readonly="true"></et2-date-time-today> <et2-date-time-today align="center" id="${row}[modified]" readonly="true"></et2-date-time-today>
<et2-url-email id="${row}[address]" readonly="true"></et2-url-email> <et2-url-email id="${row}[address]" readonly="true"></et2-url-email>
<et2-url-email id="${row}[toaddress]" readonly="true"></et2-url-email> <et2-url-email id="${row}[toaddress]" readonly="true"></et2-url-email>
<et2-url-email id="${row}[fromaddress]" readonly="true"></et2-url-email> <et2-url-email id="${row}[fromaddress]" readonly="true"></et2-url-email>
<vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/> <vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>

3
mail/templates/default/index.rows.vertical.xet
View File

@ -20,7 +20,8 @@
</row> </row>
<row class="$row_cont[class]"> <row class="$row_cont[class]">
<et2-hbox class="$row_cont[class] mobile_cat_col"> <et2-hbox class="$row_cont[class] mobile_cat_col">
<et2-lavatar image="$row_cont[avatar]" fname="$row_cont[address]" size="2.75em" shape="rounded"></et2-lavatar> <et2-lavatar image="$row_cont[avatar]" fname="$row_cont[lavatar][fname]"
lname="$row_cont[lavatar][lname]" size="2.75em" shape="rounded"></et2-lavatar>
<et2-vbox> <et2-vbox>
<et2-url-email id="${row}[address]" class="$row_cont[class]" readonly="true"></et2-url-email> <et2-url-email id="${row}[address]" class="$row_cont[class]" readonly="true"></et2-url-email>
<et2-hbox> <et2-hbox>