clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cache: serialize the cache content directly in the cache class

This commit is contained in:
rabuzarus 2016-11-04 16:44:49 +01:00
parent 8de5d6d198
commit 5459b00499
8 changed files with 775 additions and 712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

343
include/Photo.php
View File

@ -1,11 +1,16 @@
<?php
/**
* @file include/Photo.php
* @brief This file contains the Photo class for image processing
*/
require_once("include/photos.php");
if(! class_exists("Photo")) {
class Photo {
private $image;
/**
/*
* Put back gd stuff, not everybody have Imagick
*/
private $imagick;
@ -16,14 +21,13 @@ class Photo {
private $types;
/**
* supported mimetypes and corresponding file extensions
* @brief supported mimetypes and corresponding file extensions
*/
static function supportedTypes() {
if (class_exists('Imagick')) {
/**
* Imagick::queryFormats won't help us a lot there...
* At least, not yet, other parts of friendica uses this array
*/
// Imagick::queryFormats won't help us a lot there...
// At least, not yet, other parts of friendica uses this array
$t = array(
'image/jpeg' => 'jpg',
'image/png' => 'png',
@ -32,7 +36,9 @@ class Photo {
} else {
$t = array();
$t['image/jpeg'] ='jpg';
if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
if (imagetypes() & IMG_PNG) {
$t['image/png'] = 'png';
}
}
return $t;
@ -71,7 +77,7 @@ class Photo {
}
/**
* Maps Mime types to Imagick formats
* @brief Maps Mime types to Imagick formats
*/
public function get_FormatsMap() {
$m = array(
@ -93,7 +99,7 @@ class Photo {
return false;
}
/**
/*
* Setup the image to the format it will be saved to
*/
$map = $this->get_FormatsMap();
@ -103,15 +109,16 @@ class Photo {
// Always coalesce, if it is not a multi-frame image it won't hurt anyway
$this->image = $this->image->coalesceImages();
/**
/*
* setup the compression here, so we'll do it only once
*/
switch($this->getType()){
case "image/png":
$quality = get_config('system','png_quality');
if((! $quality) || ($quality > 9))
if ((! $quality) || ($quality > 9)) {
$quality = PNG_QUALITY;
/**
}
/*
* From http://www.imagemagick.org/script/command-line-options.php#quality:
*
* 'For the MNG and PNG image formats, the quality value sets
@ -124,8 +131,9 @@ class Photo {
break;
case "image/jpeg":
$quality = get_config('system','jpeg_quality');
if((! $quality) || ($quality > 100))
if ((! $quality) || ($quality > 100)) {
$quality = JPEG_QUALITY;
}
$this->image->setCompressionQuality($quality);
}
@ -139,7 +147,7 @@ class Photo {
$this->valid = false;
$this->image = @imagecreatefromstring($data);
if($this->image !== FALSE) {
if ($this->image !== false) {
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
$this->valid = true;
@ -153,32 +161,38 @@ class Photo {
}
public function is_valid() {
if($this->is_imagick())
return ($this->image !== FALSE);
if ($this->is_imagick()) {
return ($this->image !== false);
}
return $this->valid;
}
public function getWidth() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if($this->is_imagick())
if ($this->is_imagick()) {
return $this->image->getImageWidth();
}
return $this->width;
}
public function getHeight() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if($this->is_imagick())
if ($this->is_imagick()) {
return $this->image->getImageHeight();
}
return $this->height;
}
public function getImage() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
/* Clean it */
@ -189,30 +203,34 @@ class Photo {
}
public function getType() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
return $this->type;
}
public function getExt() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
return $this->types[$this->getType()];
}
public function scaleImage($max) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
$width = $this->getWidth();
$height = $this->getHeight();
$dest_width = $dest_height = 0;
if((! $width)|| (! $height))
return FALSE;
if ((! $width)|| (! $height)) {
return false;
}
if ($width > $max && $height > $max) {
@ -222,25 +240,19 @@ class Photo {
if ((($height * 9) / 16) > $width) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
} elseif ($width > $height) {
// else constrain both dimensions
elseif($width > $height) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
else {
} else {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max;
}
}
else {
} else {
if ( $width > $max ) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
else {
} else {
if ( $height > $max ) {
// very tall image (greater than 16:9)
@ -249,13 +261,11 @@ class Photo {
if ((($height * 9) / 16) > $width) {
$dest_width = $width;
$dest_height = $height;
}
else {
} else {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max;
}
}
else {
} else {
$dest_width = $width;
$dest_height = $height;
}
@ -264,7 +274,7 @@ class Photo {
if ($this->is_imagick()) {
/**
/*
* If it is not animated, there will be only one iteration here,
* so don't bother checking
*/
@ -289,18 +299,22 @@ class Photo {
$dest = imagecreatetruecolor( $dest_width, $dest_height );
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
if ($this->type=='image/png') {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
if($this->image)
if ($this->image) {
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function rotate($degrees) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
$this->image->setFirstIterator();
@ -316,14 +330,19 @@ class Photo {
}
public function flip($horiz = true, $vert = false) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
$this->image->setFirstIterator();
do {
if($horiz) $this->image->flipImage();
if($vert) $this->image->flopImage();
if ($horiz) {
$this->image->flipImage();
}
if ($vert) {
$this->image->flopImage();
}
} while ($this->image->nextImage());
return;
}
@ -361,19 +380,22 @@ class Photo {
}
$this->image->setImageOrientation(imagick::ORIENTATION_TOPLEFT);
return TRUE;
return true;
}
// based off comment on http://php.net/manual/en/function.imagerotate.php
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
if ( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') ) {
return;
}
$exif = @exif_read_data($filename,null,true);
if(! $exif)
if (! $exif) {
return;
}
$ort = $exif['IFD0']['Orientation'];
@ -421,8 +443,9 @@ class Photo {
public function scaleImageUp($min) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
$width = $this->getWidth();
@ -430,46 +453,47 @@ class Photo {
$dest_width = $dest_height = 0;
if((! $width)|| (! $height))
return FALSE;
if ((! $width)|| (! $height)) {
return false;
}
if ($width < $min && $height < $min) {
if ($width > $height) {
$dest_width = $min;
$dest_height = intval(( $height * $min ) / $width);
}
else {
} else {
$dest_width = intval(( $width * $min ) / $height);
$dest_height = $min;
}
}
else {
} else {
if ( $width < $min ) {
$dest_width = $min;
$dest_height = intval(( $height * $min ) / $width);
}
else {
} else {
if ( $height < $min ) {
$dest_width = intval(( $width * $min ) / $height);
$dest_height = $min;
}
else {
} else {
$dest_width = $width;
$dest_height = $height;
}
}
}
if($this->is_imagick())
if ($this->is_imagick()) {
return $this->scaleImage($dest_width,$dest_height);
}
$dest = imagecreatetruecolor( $dest_width, $dest_height );
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
if ($this->type=='image/png') {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
if($this->image)
if ($this->image) {
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
@ -478,8 +502,9 @@ class Photo {
public function scaleImageSquare($dim) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
$this->image->setFirstIterator();
@ -492,10 +517,13 @@ class Photo {
$dest = imagecreatetruecolor( $dim, $dim );
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
if ($this->type=='image/png') {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
if($this->image)
if ($this->image) {
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
@ -503,14 +531,15 @@ class Photo {
public function cropImage($max,$x,$y,$w,$h) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
$this->image->setFirstIterator();
do {
$this->image->cropImage($w, $h, $x, $y);
/**
/*
* We need to remove the canva,
* or the image is not resized to the crop:
* http://php.net/manual/en/imagick.cropimage.php#97232
@ -523,18 +552,22 @@ class Photo {
$dest = imagecreatetruecolor( $max, $max );
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
if ($this->type=='image/png') {
imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
if($this->image)
if ($this->image) {
imagedestroy($this->image);
}
$this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
public function saveImage($path) {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
$string = $this->imageString();
@ -546,8 +579,9 @@ class Photo {
}
public function imageString() {
if(!$this->is_valid())
return FALSE;
if (!$this->is_valid()) {
return false;
}
if ($this->is_imagick()) {
/* Clean it */
@ -566,14 +600,16 @@ class Photo {
switch($this->getType()){
case "image/png":
$quality = get_config('system','png_quality');
if((! $quality) || ($quality > 9))
if ((! $quality) || ($quality > 9)) {
$quality = PNG_QUALITY;
}
imagepng($this->image,NULL, $quality);
break;
case "image/jpeg":
$quality = get_config('system','jpeg_quality');
if((! $quality) || ($quality > 100))
if ((! $quality) || ($quality > 100)) {
$quality = JPEG_QUALITY;
}
imagejpeg($this->image,NULL,$quality);
}
$string = ob_get_contents();
@ -586,23 +622,24 @@ class Photo {
public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
$r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
$r = q("SELECT `guid` FROM `photo` WHERE `resource-id` = '%s' AND `guid` != '' LIMIT 1",
dbesc($rid)
);
if(count($r))
if (dbm::is_result($r)) {
$guid = $r[0]['guid'];
else
} else {
$guid = get_guid();
}
$x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
$x = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `contact-id` = %d AND `scale` = %d LIMIT 1",
dbesc($rid),
intval($uid),
intval($cid),
intval($scale)
);
if(count($x)) {
if (dbm::is_result($x)) {
$r = q("UPDATE `photo`
set `uid` = %d,
SET `uid` = %d,
`contact-id` = %d,
`guid` = '%s',
`resource-id` = '%s',
@ -621,7 +658,7 @@ class Photo {
`allow_gid` = '%s',
`deny_cid` = '%s',
`deny_gid` = '%s'
where id = %d",
WHERE `id` = %d",
intval($uid),
intval($cid),
@ -644,8 +681,7 @@ class Photo {
dbesc($deny_gid),
intval($x[0]['id'])
);
}
else {
} else {
$r = q("INSERT INTO `photo`
( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
@ -678,7 +714,7 @@ class Photo {
return $r;
}
}}
}
/**
@ -717,7 +753,9 @@ function guess_image_type($filename, $fromcurl=false) {
$types = Photo::supportedTypes();
$type = "image/jpeg";
foreach ($types as $m=>$e){
if ($ext==$e) $type = $m;
if ($ext==$e) {
$type = $m;
}
}
}
}
@ -739,10 +777,11 @@ function guess_image_type($filename, $fromcurl=false) {
function update_contact_avatar($avatar,$uid,$cid, $force = false) {
$r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
if (!$r)
if (!dbm::is_result($r)) {
return false;
else
} else {
$data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
}
if (($r[0]["avatar"] != $avatar) OR $force) {
$photos = import_profile_photo($avatar,$uid,$cid, true);
@ -762,11 +801,11 @@ function import_profile_photo($photo,$uid,$cid, $quit_on_error = false) {
$a = get_app();
$r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
$r = q("SELECT `resource-id` FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `scale` = 4 AND `album` = 'Contact Photos' LIMIT 1",
intval($uid),
intval($cid)
);
if(count($r) && strlen($r[0]['resource-id'])) {
if (dbm::is_result($r) && strlen($r[0]['resource-id'])) {
$hash = $r[0]['resource-id'];
} else {
$hash = photo_new_resource();
@ -777,8 +816,9 @@ function import_profile_photo($photo,$uid,$cid, $quit_on_error = false) {
$filename = basename($photo);
$img_str = fetch_url($photo,true);
if ($quit_on_error AND ($img_str == ""))
if ($quit_on_error AND ($img_str == "")) {
return false;
}
$type = guess_image_type($photo,true);
$img = new Photo($img_str, $type);
@ -802,17 +842,20 @@ function import_profile_photo($photo,$uid,$cid, $quit_on_error = false) {
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
if($r === false)
if ($r === false) {
$photo_failure = true;
}
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
} else
} else {
$photo_failure = true;
}
if($photo_failure AND $quit_on_error)
if ($photo_failure AND $quit_on_error) {
return false;
}
if ($photo_failure) {
$photo = $a->get_baseurl() . '/images/person-175.jpg';
@ -829,17 +872,13 @@ function get_photo_info($url) {
$data = Cache::get($url);
// Unserialise to be able to check in the next step if the cached data is alright.
if (!is_null($data))
$data = unserialize($data);
if (is_null($data) OR !$data) {
$img_str = fetch_url($url, true, $redirects, 4);
$filesize = strlen($img_str);
if (function_exists("getimagesizefromstring"))
if (function_exists("getimagesizefromstring")) {
$data = getimagesizefromstring($img_str);
else {
} else {
$tempfile = tempnam(get_temppath(), "cache");
$a = get_app();
@ -851,10 +890,11 @@ function get_photo_info($url) {
unlink($tempfile);
}
if ($data)
if ($data) {
$data["size"] = $filesize;
}
Cache::set($url, serialize($data));
Cache::set($url, $data);
}
return $data;
@ -864,8 +904,9 @@ function scale_image($width, $height, $max) {
$dest_width = $dest_height = 0;
if((!$width) || (!$height))
return FALSE;
if ((!$width) || (!$height)) {
return false;
}
if ($width > $max && $height > $max) {
@ -911,10 +952,10 @@ function scale_image($width, $height, $max) {
function store_photo($a, $uid, $imagedata = "", $url = "") {
$r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
intval($uid));
if(!count($r)) {
if (!dbm::is_result($r)) {
logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
return(array());
}
@ -982,10 +1023,12 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
unlink($tempfile);
$max_length = get_config('system','max_image_length');
if(! $max_length)
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
if($max_length > 0)
}
if ($max_length > 0) {
$ph->scaleImage($max_length);
}
$width = $ph->getWidth();
$height = $ph->getHeight();
@ -1009,44 +1052,50 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
$image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
"full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
if($width > 800 || $height > 800)
if ($width > 800 || $height > 800) {
$image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
}
if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
if($r)
if ($r) {
$image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
}
}
if ($width > 320 || $height > 320) {
$ph->scaleImage(320);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
if($r)
if ($r) {
$image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
}
}
if ($width > 160 AND $height > 160) {
$x = 0;
$y = 0;
$min = $ph->getWidth();
if ($min > 160)
if ($min > 160) {
$x = ($min - 160) / 2;
}
if ($ph->getHeight() < $min) {
$min = $ph->getHeight();
if ($min > 160)
if ($min > 160) {
$y = ($min - 160) / 2;
}
}
$min = 160;
$ph->cropImage(160, $x, $y, $min, $min);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
if($r)
if ($r) {
$image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
}
}
// Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
$image["preview"] = $image["full"];
@ -1059,39 +1108,9 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
//if (isset($image["small"]))
// $image["preview"] = $image["small"];
if (isset($image["medium"]))
if (isset($image["medium"])) {
$image["preview"] = $image["medium"];
}
return($image);
}
/**
* @brief Fetch the photo albums that are available for a viewer
*
* The query in this function is cost intensive, so it is cached.
*
* @param int $uid User id of the photos
* @param bool $update Update the cache
*
* @return array Returns array of the photo albums
*/
function photo_albums($uid, $update = false) {
$sql_extra = permissions_sql($uid);
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
$albums = Cache::get($key);
if (is_null($albums) OR $update) {
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
$albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
FROM `photo` USE INDEX (`uid_album_created`)
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
intval($uid),
dbesc('Contact Photos'),
dbesc(t('Contact Photos'))
);
Cache::set($key, $albums, CACHE_DAY);
}
return $albums;
}

3
include/Probe.php
View File

@ -217,7 +217,6 @@ class Probe {
if ($cache) {
$result = Cache::get("probe_url:".$network.":".$uri);
if (!is_null($result)) {
$result = unserialize($result);
return $result;
}
}
@ -257,7 +256,7 @@ class Probe {
// Only store into the cache if the value seems to be valid
if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY);
Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
/// @todo temporary fix - we need a real contact update function that updates only changing fields
/// The biggest problem is the avatar picture that could have a reduced image size.

8
include/cache.php
View File

@ -99,8 +99,8 @@ class Cache {
dbesc($key)
);
if (count($r)) {
return $r[0]['v'];
if (dbm::is_result($r)) {
return unserialize($r[0]['v']);
}
return null;
@ -109,6 +109,8 @@ class Cache {
/**
* @brief Put data in the cache according to the key
*
* The input $value can have multiple formats.
*
* @param string $key The key to the cached data
* @param mixed $valie The value that is about to be stored
* @param integer $duration The cache lifespan
@ -126,7 +128,7 @@ class Cache {
/// @todo store the cache data in the same way like the config data
q("REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
dbesc($key),
dbesc($value),
dbesc(serialize($value)),
intval($duration),
dbesc(datetime_convert()));
}

4
include/cron.php
View File

@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
}
require_once("boot.php");
require_once("include/photos.php");
function cron_run(&$argv, &$argc){
@ -162,8 +163,9 @@ function cron_run(&$argv, &$argc){
*/
function cron_update_photo_albums() {
$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
if (!dbm::is_result($r))
if (!dbm::is_result($r)) {
return;
}
foreach ($r AS $user) {
photo_albums($user['uid'], true);

7
include/gprobe.php
View File

@ -39,14 +39,13 @@ function gprobe_run(&$argv, &$argc){
logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
if (!count($r)) {
if (!dbm::is_result($r)) {
// Is it a DDoS attempt?
$urlparts = parse_url($url);
$result = Cache::get("gprobe:".$urlparts["host"]);
if (!is_null($result)) {
$result = unserialize($result);
if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
return;
@ -56,7 +55,7 @@ function gprobe_run(&$argv, &$argc){
$arr = probe_url($url);
if (is_null($result))
Cache::set("gprobe:".$urlparts["host"],serialize($arr));
Cache::set("gprobe:".$urlparts["host"], $arr);
if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
update_gcontact($arr);
@ -65,7 +64,7 @@ function gprobe_run(&$argv, &$argc){
dbesc(normalise_link($url))
);
}
if(count($r)) {
if(dbm::is_result($r)) {
// Check for accessibility and do a poco discovery
if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));

37
include/oembed.php
View File

@ -6,7 +6,15 @@ function oembed_replacecb($matches){
return $s;
}
/**
* @brief Get data from an URL to embed its content.
*
* @param string $embedurl The URL from which the data should be fetched.
* @param bool $no_rich_type If set to true rich type content won't be fetched.
*
* @return bool|object Returns object with embed content or false if no embedable
* content exists
*/
function oembed_fetch_url($embedurl, $no_rich_type = false){
$embedurl = trim($embedurl, "'");
$embedurl = trim($embedurl, '"');
@ -16,11 +24,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
dbesc(normalise_link($embedurl)));
if ($r)
if (dbm::is_result($r)) {
$txt = $r[0]["content"];
else
} else {
$txt = Cache::get($a->videowidth . $embedurl);
}
// These media files should now be caught in bbcode.php
// left here as a fallback in case this is called from another source
@ -34,7 +42,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
if (!in_array($ext, $noexts)){
// try oembed autodiscovery
$redirects = 0;
$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
if ($html_text) {
$dom = @DOMDocument::loadHTML($html_text);
if ($dom) {
@ -70,16 +78,17 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$txt=trim($txt);
if ($txt[0]!="{")
if ($txt[0]!="{") {
$txt='{"type":"error"}';
else { //save in cache
} else { //save in cache
$j = json_decode($txt);
if ($j->type != "error")
if ($j->type != "error") {
q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
dbesc(normalise_link($embedurl)),
dbesc($txt), dbesc(datetime_convert()),
dbesc($txt), dbesc(datetime_convert()));
}
Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
}
@ -87,13 +96,15 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$j = json_decode($txt);
if (!is_object($j))
if (!is_object($j)) {
return false;
}
// Always embed the SSL version
if (isset($j->html))
if (isset($j->html)) {
$j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
}
$j->embedurl = $embedurl;
@ -109,11 +120,13 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
//$j->height = $data["images"][0]["height"];
}
if (isset($data["title"]))
if (isset($data["title"])) {
$j->title = $data["title"];
}
if (isset($data["text"]))
if (isset($data["text"])) {
$j->description = $data["text"];
}
if (is_array($data["images"])) {
$j->thumbnail_url = $data["images"][0]["src"];

31
include/photos.php
View File

@ -25,3 +25,34 @@ function gps2Num($coordPart) {
return floatval($parts[0]) / floatval($parts[1]);
}
/**
* @brief Fetch the photo albums that are available for a viewer
*
* The query in this function is cost intensive, so it is cached.
*
* @param int $uid User id of the photos
* @param bool $update Update the cache
*
* @return array Returns array of the photo albums
*/
function photo_albums($uid, $update = false) {
$sql_extra = permissions_sql($uid);
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
$albums = Cache::get($key);
if (is_null($albums) OR $update) {
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
$albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
FROM `photo` USE INDEX (`uid_album_created`)
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
intval($uid),
dbesc('Contact Photos'),
dbesc(t('Contact Photos'))
);
Cache::set($key, $albums, CACHE_DAY);
}
return $albums;
}

2
mod/photos.php
View File

@ -21,8 +21,6 @@ function photos_init(&$a) {
nav_set_selected('home');
$o = '';
if ($a->argc > 1) {
$nick = $a->argv[1];
$user = qu("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",