rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-02 14:24:10 +01:00
Code Issues Releases Activity

Contacts: Use new backend for photo.php

Browse Source
This commit is contained in:
Thomas Tanghus 2013-03-23 02:02:21 +01:00
parent 3f30356ffd
commit 318180f9a0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
photo.php
View File

@ -21,6 +21,8 @@ function getStandardImage() {
} }
$id = isset($_GET['id']) ? $_GET['id'] : null; $id = isset($_GET['id']) ? $_GET['id'] : null;
$parent = isset($_GET['parent']) ? $_GET['parent'] : null;
$backend = isset($_GET['backend']) ? $_GET['backend'] : null;
$etag = null; $etag = null;
$caching = null; $caching = null;
$max_size = 170; $max_size = 170;
@ -35,7 +37,8 @@ if(!extension_loaded('gd') || !function_exists('gd_info')) {
getStandardImage(); getStandardImage();
} }
$contact = OCA\Contacts\App::getContactVCard($id); $app = new OCA\Contacts\App();
$contact = $app->getContact($backend, $parent, $id);
$image = new OC_Image(); $image = new OC_Image();
if (!$image) { if (!$image) {
getStandardImage(); getStandardImage();
@ -58,10 +61,10 @@ if (is_null($contact)) {
$etag = md5($contact->LOGO); $etag = md5($contact->LOGO);
} }
if ($image->valid()) { if ($image->valid()) {
$modified = OCA\Contacts\App::lastModified($contact); $modified = $contact->lastModified();
// Force refresh if modified within the last minute. // Force refresh if modified within the last minute.
if(!is_null($modified)) { if(!is_null($modified)) {
$caching = (time() - $modified->format('U') > 60) ? null : 0; $caching = (time() - $modified > 60) ? null : 0;
} }
OCP\Response::enableCaching($caching); OCP\Response::enableCaching($caching);
if(!is_null($modified)) { if(!is_null($modified)) {