extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implements lavatar and replace default photo avatar with generated lavatar

Browse Source
This commit is contained in:
Hadi Nategh 2018-08-13 11:56:05 +02:00
parent 29337d79d1
commit e1ee71873a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -2510,7 +2510,7 @@ window.egw_LAB.wait(function() {
// Enable history // Enable history
$this->setup_history($content, $sel_options); $this->setup_history($content, $sel_options);
$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']); $content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'',$content['etag']);
if ($content['private']) $content['owner'] .= 'p'; if ($content['private']) $content['owner'] .= 'p';
@ -3204,6 +3204,15 @@ window.egw_LAB.wait(function() {
!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS !(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS
($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))) ($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO)))))
{ {
if (is_array($contact))
{
echo Api\avatar::lavatar(array(
'id' => $contact['id'],
'firstname' => $contact['n_given'],
'lastname' => $contact['n_family'])
);
exit();
}
Egw::redirect(Api\Image::find('addressbook','photo')); Egw::redirect(Api\Image::find('addressbook','photo'));
} }
// use an etag over the image mapp // use an etag over the image mapp

2
api/src/Contacts.php
View File

@ -764,7 +764,7 @@ class Contacts extends Contacts\Storage
function photo_src($id,$jpeg,$default='',$etag=null) function photo_src($id,$jpeg,$default='',$etag=null)
{ {
//error_log(__METHOD__."($id, ..., etag=$etag) ". function_backtrace()); //error_log(__METHOD__."($id, ..., etag=$etag) ". function_backtrace());
return $jpeg ? array( return $jpeg || !$default ? array(
'menuaction' => 'addressbook.addressbook_ui.photo', 'menuaction' => 'addressbook.addressbook_ui.photo',
'contact_id' => $id, 'contact_id' => $id,
)+(isset($etag) ? array( )+(isset($etag) ? array(