]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into task/admin-block-list
authorHypolite Petovan <mrpetovan@gmail.com>
Fri, 1 Dec 2017 05:48:13 +0000 (00:48 -0500)
committerGitHub <noreply@github.com>
Fri, 1 Dec 2017 05:48:13 +0000 (00:48 -0500)
30 files changed:
include/Photo.php [deleted file]
include/api.php
include/follow.php
include/items.php
include/network.php
include/plaintext.php
include/uimport.php
include/user.php
mod/contacts.php
mod/crepair.php
mod/dfrn_confirm.php
mod/dfrn_request.php
mod/fbrowser.php
mod/install.php
mod/photo.php
mod/photos.php
mod/profile_photo.php
mod/proxy.php
mod/wall_upload.php
src/Model/GlobalContact.php
src/Object/Contact.php
src/Object/Photo.php [new file with mode: 0644]
src/ParseUrl.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/OStatus.php
src/Protocol/PortableContact.php
update.php
view/theme/frio/theme.php
view/theme/frost/theme.php

diff --git a/include/Photo.php b/include/Photo.php
deleted file mode 100644 (file)
index 761abc7..0000000
+++ /dev/null
@@ -1,1069 +0,0 @@
-<?php
-/**
- * @file include/Photo.php
- * @brief This file contains the Photo class for image processing
- */
-
-use Friendica\App;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-
-require_once("include/photos.php");
-
-class Photo {
-
-       private $image;
-
-       /*
-        * Put back gd stuff, not everybody have Imagick
-        */
-       private $imagick;
-       private $width;
-       private $height;
-       private $valid;
-       private $type;
-       private $types;
-
-       /**
-        * @brief supported mimetypes and corresponding file extensions
-        */
-       public 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
-                       $t = array(
-                               'image/jpeg' => 'jpg',
-                               'image/png' => 'png',
-                               'image/gif' => 'gif'
-                       );
-               } else {
-                       $t = array();
-                       $t['image/jpeg'] ='jpg';
-                       if (imagetypes() & IMG_PNG) {
-                               $t['image/png'] = 'png';
-                       }
-               }
-
-               return $t;
-       }
-
-       public function __construct($data, $type=null) {
-               $this->imagick = class_exists('Imagick');
-               $this->types = static::supportedTypes();
-               if (!array_key_exists($type, $this->types)){
-                       $type='image/jpeg';
-               }
-               $this->type = $type;
-
-               if ($this->is_imagick() && $this->load_data($data)) {
-                       return true;
-               } else {
-                       // Failed to load with Imagick, fallback
-                       $this->imagick = false;
-               }
-               return $this->load_data($data);
-       }
-
-       public function __destruct() {
-               if ($this->image) {
-                       if ($this->is_imagick()) {
-                               $this->image->clear();
-                               $this->image->destroy();
-                               return;
-                       }
-                       if (is_resource($this->image)) {
-                               imagedestroy($this->image);
-                       }
-               }
-       }
-
-       public function is_imagick() {
-               return $this->imagick;
-       }
-
-       /**
-        * @brief Maps Mime types to Imagick formats
-        * @return arr With with image formats (mime type as key)
-        */
-       public function get_FormatsMap() {
-               $m = array(
-                       'image/jpeg' => 'JPG',
-                       'image/png' => 'PNG',
-                       'image/gif' => 'GIF'
-               );
-               return $m;
-       }
-
-       private function load_data($data) {
-               if ($this->is_imagick()) {
-                       $this->image = new Imagick();
-                       try {
-                               $this->image->readImageBlob($data);
-                       } catch (Exception $e) {
-                               // Imagick couldn't use the data
-                               return false;
-                       }
-
-                       /*
-                        * Setup the image to the format it will be saved to
-                        */
-                       $map = $this->get_FormatsMap();
-                       $format = $map[$type];
-                       $this->image->setFormat($format);
-
-                       // 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 = Config::get('system', 'png_quality');
-                                       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
-                                        * the zlib compression level (quality / 10) and filter-type (quality % 10).
-                                        * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
-                                        * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
-                                        */
-                                       $quality = $quality * 10;
-                                       $this->image->setCompressionQuality($quality);
-                                       break;
-                               case "image/jpeg":
-                                       $quality = Config::get('system', 'jpeg_quality');
-                                       if ((! $quality) || ($quality > 100)) {
-                                               $quality = JPEG_QUALITY;
-                                       }
-                                       $this->image->setCompressionQuality($quality);
-                       }
-
-                       // The 'width' and 'height' properties are only used by non-Imagick routines.
-                       $this->width  = $this->image->getImageWidth();
-                       $this->height = $this->image->getImageHeight();
-                       $this->valid  = true;
-
-                       return true;
-               }
-
-               $this->valid = false;
-               $this->image = @imagecreatefromstring($data);
-               if ($this->image !== false) {
-                       $this->width  = imagesx($this->image);
-                       $this->height = imagesy($this->image);
-                       $this->valid  = true;
-                       imagealphablending($this->image, false);
-                       imagesavealpha($this->image, true);
-
-                       return true;
-               }
-
-               return false;
-       }
-
-       public function is_valid() {
-               if ($this->is_imagick()) {
-                       return ($this->image !== false);
-               }
-               return $this->valid;
-       }
-
-       public function getWidth() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ($this->is_imagick()) {
-                       return $this->image->getImageWidth();
-               }
-               return $this->width;
-       }
-
-       public function getHeight() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ($this->is_imagick()) {
-                       return $this->image->getImageHeight();
-               }
-               return $this->height;
-       }
-
-       public function getImage() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ($this->is_imagick()) {
-                       /* Clean it */
-                       $this->image = $this->image->deconstructImages();
-                       return $this->image;
-               }
-               return $this->image;
-       }
-
-       public function getType() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               return $this->type;
-       }
-
-       public function getExt() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               return $this->types[$this->getType()];
-       }
-
-       public function scaleImage($max) {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               $width = $this->getWidth();
-               $height = $this->getHeight();
-
-               $dest_width = $dest_height = 0;
-
-               if ((! $width)|| (! $height)) {
-                       return false;
-               }
-
-               if ($width > $max && $height > $max) {
-
-                       // very tall image (greater than 16:9)
-                       // constrain the width - let the height float.
-
-                       if ((($height * 9) / 16) > $width) {
-                               $dest_width = $max;
-                               $dest_height = intval(($height * $max) / $width);
-                       } elseif ($width > $height) {
-                               // else constrain both dimensions
-                               $dest_width = $max;
-                               $dest_height = intval(($height * $max) / $width);
-                       } else {
-                               $dest_width = intval(($width * $max) / $height);
-                               $dest_height = $max;
-                       }
-               } else {
-                       if ($width > $max) {
-                               $dest_width = $max;
-                               $dest_height = intval(($height * $max) / $width);
-                       } else {
-                               if ($height > $max) {
-
-                                       // very tall image (greater than 16:9)
-                                       // but width is OK - don't do anything
-
-                                       if ((($height * 9) / 16) > $width) {
-                                               $dest_width = $width;
-                                               $dest_height = $height;
-                                       } else {
-                                               $dest_width = intval(($width * $max) / $height);
-                                               $dest_height = $max;
-                                       }
-                               } else {
-                                       $dest_width = $width;
-                                       $dest_height = $height;
-                               }
-                       }
-               }
-
-
-               if ($this->is_imagick()) {
-                       /*
-                        * If it is not animated, there will be only one iteration here,
-                        * so don't bother checking
-                        */
-                       // Don't forget to go back to the first frame
-                       $this->image->setFirstIterator();
-                       do {
-
-                               // FIXME - implement horizantal bias for scaling as in followin GD functions
-                               // to allow very tall images to be constrained only horizontally.
-
-                               $this->image->scaleImage($dest_width, $dest_height);
-                       } while ($this->image->nextImage());
-
-                       // These may not be necessary any more
-                       $this->width  = $this->image->getImageWidth();
-                       $this->height = $this->image->getImageHeight();
-
-                       return;
-               }
-
-
-               $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
-               }
-               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-               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_imagick()) {
-                       $this->image->setFirstIterator();
-                       do {
-                               $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
-                       } while ($this->image->nextImage());
-                       return;
-               }
-
-               // if script dies at this point check memory_limit setting in php.ini
-               $this->image  = imagerotate($this->image,$degrees,0);
-               $this->width  = imagesx($this->image);
-               $this->height = imagesy($this->image);
-       }
-
-       public function flip($horiz = true, $vert = 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();
-                               }
-                       } while ($this->image->nextImage());
-                       return;
-               }
-
-               $w = imagesx($this->image);
-               $h = imagesy($this->image);
-               $flipped = imagecreate($w, $h);
-               if ($horiz) {
-                       for ($x = 0; $x < $w; $x++) {
-                               imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
-                       }
-               }
-               if ($vert) {
-                       for ($y = 0; $y < $h; $y++) {
-                               imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
-                       }
-               }
-               $this->image = $flipped;
-       }
-
-       public function orient($filename) {
-               if ($this->is_imagick()) {
-                       // based off comment on http://php.net/manual/en/imagick.getimageorientation.php
-                       $orientation = $this->image->getImageOrientation();
-                       switch ($orientation) {
-                       case imagick::ORIENTATION_BOTTOMRIGHT:
-                               $this->image->rotateimage("#000", 180);
-                               break;
-                       case imagick::ORIENTATION_RIGHTTOP:
-                               $this->image->rotateimage("#000", 90);
-                               break;
-                       case imagick::ORIENTATION_LEFTBOTTOM:
-                               $this->image->rotateimage("#000", -90);
-                               break;
-                       }
-
-                       $this->image->setImageOrientation(imagick::ORIENTATION_TOPLEFT);
-                       return true;
-               }
-               // based off comment on http://php.net/manual/en/function.imagerotate.php
-
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ((!function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) {
-                       return;
-               }
-
-               $exif = @exif_read_data($filename,null,true);
-               if (!$exif) {
-                       return;
-               }
-
-               $ort = $exif['IFD0']['Orientation'];
-
-               switch($ort)
-               {
-                       case 1: // nothing
-                               break;
-
-                       case 2: // horizontal flip
-                               $this->flip();
-                               break;
-
-                       case 3: // 180 rotate left
-                               $this->rotate(180);
-                               break;
-
-                       case 4: // vertical flip
-                               $this->flip(false, true);
-                               break;
-
-                       case 5: // vertical flip + 90 rotate right
-                               $this->flip(false, true);
-                               $this->rotate(-90);
-                               break;
-
-                       case 6: // 90 rotate right
-                               $this->rotate(-90);
-                               break;
-
-                       case 7: // horizontal flip + 90 rotate right
-                               $this->flip();
-                               $this->rotate(-90);
-                               break;
-
-                       case 8: // 90 rotate left
-                               $this->rotate(90);
-                               break;
-               }
-
-               //      logger('exif: ' . print_r($exif,true));
-               return $exif;
-
-       }
-
-
-
-       public function scaleImageUp($min) {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-
-               $width = $this->getWidth();
-               $height = $this->getHeight();
-
-               $dest_width = $dest_height = 0;
-
-               if ((!$width)|| (!$height)) {
-                       return false;
-               }
-
-               if ($width < $min && $height < $min) {
-                       if ($width > $height) {
-                               $dest_width = $min;
-                               $dest_height = intval(($height * $min) / $width);
-                       } else {
-                               $dest_width = intval(($width * $min) / $height);
-                               $dest_height = $min;
-                       }
-               } else {
-                       if ($width < $min) {
-                               $dest_width = $min;
-                               $dest_height = intval(($height * $min) / $width);
-                       } else {
-                               if ($height < $min) {
-                                       $dest_width = intval(($width * $min) / $height);
-                                       $dest_height = $min;
-                               } else {
-                                       $dest_width = $width;
-                                       $dest_height = $height;
-                               }
-                       }
-               }
-
-               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
-               }
-               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-               if ($this->image) {
-                       imagedestroy($this->image);
-               }
-               $this->image = $dest;
-               $this->width  = imagesx($this->image);
-               $this->height = imagesy($this->image);
-       }
-
-
-
-       public function scaleImageSquare($dim) {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ($this->is_imagick()) {
-                       $this->image->setFirstIterator();
-                       do {
-                               $this->image->scaleImage($dim, $dim);
-                       } while ($this->image->nextImage());
-                       return;
-               }
-
-               $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
-               }
-               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
-               if ($this->image) {
-                       imagedestroy($this->image);
-               }
-               $this->image = $dest;
-               $this->width  = imagesx($this->image);
-               $this->height = imagesy($this->image);
-       }
-
-
-       public function cropImage($max, $x, $y, $w, $h) {
-               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
-                                */
-                               $this->image->setImagePage(0, 0, 0, 0);
-                       } while ($this->image->nextImage());
-                       return $this->scaleImage($max);
-               }
-
-               $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
-               }
-               imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
-               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;
-               }
-
-               $string = $this->imageString();
-
-               $a = get_app();
-
-               $stamp1 = microtime(true);
-               file_put_contents($path, $string);
-               $a->save_timestamp($stamp1, "file");
-       }
-
-       public function imageString() {
-               if (!$this->is_valid()) {
-                       return false;
-               }
-
-               if ($this->is_imagick()) {
-                       /* Clean it */
-                       $this->image = $this->image->deconstructImages();
-                       $string = $this->image->getImagesBlob();
-                       return $string;
-               }
-
-               $quality = false;
-
-               ob_start();
-
-               // Enable interlacing
-               imageinterlace($this->image, true);
-
-               switch($this->getType()){
-                       case "image/png":
-                               $quality = Config::get('system', 'png_quality');
-                               if ((!$quality) || ($quality > 9)) {
-                                       $quality = PNG_QUALITY;
-                               }
-                               imagepng($this->image, null, $quality);
-                               break;
-                       case "image/jpeg":
-                               $quality = Config::get('system', 'jpeg_quality');
-                               if ((!$quality) || ($quality > 100)) {
-                                       $quality = JPEG_QUALITY;
-                               }
-                               imagejpeg($this->image, null, $quality);
-               }
-               $string = ob_get_contents();
-               ob_end_clean();
-
-               return $string;
-       }
-
-
-
-       public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '') {
-
-               $r = dba::select('photo', array('guid'), array("`resource-id` = ? AND `guid` != ?", $rid, ''), array('limit' => 1));
-               if (DBM::is_result($r)) {
-                       $guid = $r['guid'];
-               } else {
-                       $guid = get_guid();
-               }
-
-               $x = dba::select('photo', array('id'), array('resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale), array('limit' => 1));
-
-               $fields = array('uid' => $uid, 'contact-id' => $cid, 'guid' => $guid, 'resource-id' => $rid, 'created' => datetime_convert(), 'edited' => datetime_convert(),
-                               'filename' => basename($filename), 'type' => $this->getType(), 'album' => $album, 'height' => $this->getHeight(), 'width' => $this->getWidth(),
-                               'datasize' => strlen($this->imageString()), 'data' => $this->imageString(), 'scale' => $scale, 'profile' => $profile,
-                               'allow_cid' => $allow_cid, 'allow_gid' => $allow_gid, 'deny_cid' => $deny_cid, 'deny_gid' => $deny_gid, 'desc' => $desc);
-
-               if (DBM::is_result($x)) {
-                       $r = dba::update('photo', $fields, array('id' => $x['id']));
-               } else {
-                       $r = dba::insert('photo', $fields);
-               }
-
-               return $r;
-       }
-}
-
-
-/**
- * Guess image mimetype from filename or from Content-Type header
- *
- * @arg $filename string Image filename
- * @arg $fromcurl boolean Check Content-Type header from curl request
- */
-function guess_image_type($filename, $fromcurl=false) {
-       logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
-       $type = null;
-       if ($fromcurl) {
-               $a = get_app();
-               $headers=array();
-               $h = explode("\n",$a->get_curl_headers());
-               foreach ($h as $l) {
-                       list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-                       $headers[$k] = $v;
-               }
-               if (array_key_exists('Content-Type', $headers))
-                       $type = $headers['Content-Type'];
-       }
-       if (is_null($type)){
-               // Guessing from extension? Isn't that... dangerous?
-               if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
-                       /**
-                        * Well, this not much better,
-                        * but at least it comes from the data inside the image,
-                        * we won't be tricked by a manipulated extension
-                        */
-                       $image = new Imagick($filename);
-                       $type = $image->getImageMimeType();
-                       $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
-               } else {
-                       $ext = pathinfo($filename, PATHINFO_EXTENSION);
-                       $types = Photo::supportedTypes();
-                       $type = "image/jpeg";
-                       foreach ($types as $m => $e){
-                               if ($ext == $e) {
-                                       $type = $m;
-                               }
-                       }
-               }
-       }
-       logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
-       return $type;
-
-}
-
-/**
- * @brief Updates the avatar links in a contact only if needed
- *
- * @param string $avatar Link to avatar picture
- * @param int $uid User id of contact owner
- * @param int $cid Contact id
- * @param bool $force force picture update
- *
- * @return array Returns array of the different avatar sizes
- */
-function update_contact_avatar($avatar, $uid, $cid, $force = false) {
-       $r = q("SELECT `avatar`, `photo`, `thumb`, `micro`, `nurl` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
-       if (!DBM::is_result($r)) {
-               return false;
-       } else {
-               $data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
-       }
-
-       if (($r[0]["avatar"] != $avatar) || $force) {
-               $photos = import_profile_photo($avatar, $uid, $cid, true);
-
-               if ($photos) {
-                       q("UPDATE `contact` SET `avatar` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
-                               dbesc($avatar), dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($cid));
-
-                       // Update the public contact (contact id = 0)
-                       if ($uid != 0) {
-                               $pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
-                               if (DBM::is_result($pcontact)) {
-                                       update_contact_avatar($avatar, 0, $pcontact['id'], $force);
-                               }
-                       }
-
-                       return $photos;
-               }
-       }
-
-       return $data;
-}
-
-function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
-
-       $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 (DBM::is_result($r) && strlen($r[0]['resource-id'])) {
-               $hash = $r[0]['resource-id'];
-       } else {
-               $hash = photo_new_resource();
-       }
-
-       $photo_failure = false;
-
-       $filename = basename($photo);
-       $img_str = fetch_url($photo, true);
-
-       if ($quit_on_error && ($img_str == "")) {
-               return false;
-       }
-
-       $type = guess_image_type($photo, true);
-       $img = new Photo($img_str, $type);
-       if ($img->is_valid()) {
-
-               $img->scaleImageSquare(175);
-
-               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4);
-
-               if ($r === false)
-                       $photo_failure = true;
-
-               $img->scaleImage(80);
-
-               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5);
-
-               if ($r === false)
-                       $photo_failure = true;
-
-               $img->scaleImage(48);
-
-               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6);
-
-               if ($r === false) {
-                       $photo_failure = true;
-               }
-
-               $suffix = '?ts='.time();
-
-               $photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
-               $thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
-               $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
-
-               // Remove the cached photo
-               $a = get_app();
-               $basepath = $a->get_basepath();
-
-               if (is_dir($basepath."/photo")) {
-                       $filename = $basepath.'/photo/'.$hash.'-4.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
-                       }
-                       $filename = $basepath.'/photo/'.$hash.'-5.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
-                       }
-                       $filename = $basepath.'/photo/'.$hash.'-6.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
-                       }
-               }
-       } else {
-               $photo_failure = true;
-       }
-
-       if ($photo_failure && $quit_on_error) {
-               return false;
-       }
-
-       if ($photo_failure) {
-               $photo = System::baseUrl() . '/images/person-175.jpg';
-               $thumb = System::baseUrl() . '/images/person-80.jpg';
-               $micro = System::baseUrl() . '/images/person-48.jpg';
-       }
-
-       return(array($photo,$thumb,$micro));
-
-}
-
-function get_photo_info($url) {
-       $data = array();
-
-       $data = Cache::get($url);
-
-       if (is_null($data) || !$data || !is_array($data)) {
-               $img_str = fetch_url($url, true, $redirects, 4);
-               $filesize = strlen($img_str);
-
-               if (function_exists("getimagesizefromstring")) {
-                       $data = getimagesizefromstring($img_str);
-               } else {
-                       $tempfile = tempnam(get_temppath(), "cache");
-
-                       $a = get_app();
-                       $stamp1 = microtime(true);
-                       file_put_contents($tempfile, $img_str);
-                       $a->save_timestamp($stamp1, "file");
-
-                       $data = getimagesize($tempfile);
-                       unlink($tempfile);
-               }
-
-               if ($data) {
-                       $data["size"] = $filesize;
-               }
-
-               Cache::set($url, $data);
-       }
-
-       return $data;
-}
-
-function scale_image($width, $height, $max) {
-
-       $dest_width = $dest_height = 0;
-
-       if ((!$width) || (!$height)) {
-               return false;
-       }
-
-       if ($width > $max && $height > $max) {
-
-               // very tall image (greater than 16:9)
-               // constrain the width - let the height float.
-
-               if ((($height * 9) / 16) > $width) {
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
-               } elseif ($width > $height) {
-                       // else constrain both dimensions
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
-               } else {
-                       $dest_width = intval(($width * $max) / $height);
-                       $dest_height = $max;
-               }
-       } else {
-               if ($width > $max) {
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
-               } else {
-                       if ($height > $max) {
-
-                               // very tall image (greater than 16:9)
-                               // but width is OK - don't do anything
-
-                               if ((($height * 9) / 16) > $width) {
-                                       $dest_width = $width;
-                                       $dest_height = $height;
-                               } else {
-                                       $dest_width = intval(($width * $max) / $height);
-                                       $dest_height = $max;
-                               }
-                       } else {
-                               $dest_width = $width;
-                               $dest_height = $height;
-                       }
-               }
-       }
-       return array("width" => $dest_width, "height" => $dest_height);
-}
-
-function store_photo(App $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",
-               intval($uid));
-
-       if (!DBM::is_result($r)) {
-               logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
-               return(array());
-       }
-
-       $page_owner_nick  = $r[0]['nickname'];
-
-       /// @TODO
-       /// $default_cid      = $r[0]['id'];
-       /// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
-
-       if ((strlen($imagedata) == 0) && ($url == "")) {
-               logger("No image data and no url provided", LOGGER_DEBUG);
-               return(array());
-       } elseif (strlen($imagedata) == 0) {
-               logger("Uploading picture from ".$url, LOGGER_DEBUG);
-
-               $stamp1 = microtime(true);
-               $imagedata = @file_get_contents($url);
-               $a->save_timestamp($stamp1, "file");
-       }
-
-       $maximagesize = Config::get('system', 'maximagesize');
-
-       if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
-               logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
-               return(array());
-       }
-
-       $tempfile = tempnam(get_temppath(), "cache");
-
-       $stamp1 = microtime(true);
-       file_put_contents($tempfile, $imagedata);
-       $a->save_timestamp($stamp1, "file");
-
-       $data = getimagesize($tempfile);
-
-       if (!isset($data["mime"])) {
-               unlink($tempfile);
-               logger("File is no picture", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $ph = new Photo($imagedata, $data["mime"]);
-
-       if (!$ph->is_valid()) {
-               unlink($tempfile);
-               logger("Picture is no valid picture", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $ph->orient($tempfile);
-       unlink($tempfile);
-
-       $max_length = Config::get('system', 'max_image_length');
-       if (! $max_length) {
-               $max_length = MAX_IMAGE_LENGTH;
-       }
-       if ($max_length > 0) {
-               $ph->scaleImage($max_length);
-       }
-
-       $width = $ph->getWidth();
-       $height = $ph->getHeight();
-
-       $hash = photo_new_resource();
-
-       $smallest = 0;
-
-       // Pictures are always public by now
-       //$defperm = '<'.$default_cid.'>';
-       $defperm = "";
-       $visitor = 0;
-
-       $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
-
-       if (!$r) {
-               logger("Picture couldn't be stored", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-                       "full" => System::baseUrl()."/photo/{$hash}-0.".$ph->getExt());
-
-       if ($width > 800 || $height > 800) {
-               $image["large"] = System::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) {
-                       $image["medium"] = System::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) {
-                       $image["small"] = System::baseUrl()."/photo/{$hash}-2.".$ph->getExt();
-               }
-       }
-
-       if ($width > 160 && $height > 160) {
-               $x = 0;
-               $y = 0;
-
-               $min = $ph->getWidth();
-               if ($min > 160) {
-                       $x = ($min - 160) / 2;
-               }
-
-               if ($ph->getHeight() < $min) {
-                       $min = $ph->getHeight();
-                       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) {
-                       $image["thumb"] = System::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"];
-
-       // Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
-       //if (isset($image["thumb"]))
-       //      $image["preview"] = $image["thumb"];
-
-       // Unsure, if this should be activated or deactivated
-       //if (isset($image["small"]))
-       //      $image["preview"] = $image["small"];
-
-       if (isset($image["medium"])) {
-               $image["preview"] = $image["medium"];
-       }
-
-       return($image);
-}
index e0dc413c2a52ba4465a85ec74dd144a2bad524a3..12380f4b8403e6de3a7202d752f14a43fa451b78 100644 (file)
@@ -5,7 +5,6 @@
  *
  * @todo Automatically detect if incoming data is HTML or BBCode
  */
-
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
@@ -23,6 +22,7 @@ use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Network\HTTPException\TooManyRequestsException;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\XML;
 
@@ -32,7 +32,6 @@ require_once 'include/conversation.php';
 require_once 'include/oauth.php';
 require_once 'include/html2plain.php';
 require_once 'mod/share.php';
-require_once 'include/Photo.php';
 require_once 'mod/item.php';
 require_once 'include/security.php';
 require_once 'include/contact_selectors.php';
@@ -2377,7 +2376,7 @@ function api_get_attachments(&$body)
        $attachments = array();
 
        foreach ($images[1] as $image) {
-               $imagedata = get_photo_info($image);
+               $imagedata = Photo::getInfoFromURL($image);
 
                if ($imagedata) {
                        $attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]);
@@ -2509,7 +2508,7 @@ function api_get_entitities(&$text, $bbcode)
 
                $start = iconv_strpos($text, $url, $offset, "UTF-8");
                if (!($start === false)) {
-                       $image = get_photo_info($url);
+                       $image = Photo::getInfoFromURL($url);
                        if ($image) {
                                // If image cache is activated, then use the following sizes:
                                // thumb  (150), small (340), medium (600) and large (1024)
@@ -2517,19 +2516,19 @@ function api_get_entitities(&$text, $bbcode)
                                        $media_url = proxy_url($url);
 
                                        $sizes = array();
-                                       $scale = scale_image($image[0], $image[1], 150);
+                                       $scale = Photo::scaleImageTo($image[0], $image[1], 150);
                                        $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
                                        if (($image[0] > 150) || ($image[1] > 150)) {
-                                               $scale = scale_image($image[0], $image[1], 340);
+                                               $scale = Photo::scaleImageTo($image[0], $image[1], 340);
                                                $sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
                                        }
 
-                                       $scale = scale_image($image[0], $image[1], 600);
+                                       $scale = Photo::scaleImageTo($image[0], $image[1], 600);
                                        $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
                                        if (($image[0] > 600) || ($image[1] > 600)) {
-                                               $scale = scale_image($image[0], $image[1], 1024);
+                                               $scale = Photo::scaleImageTo($image[0], $image[1], 1024);
                                                $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
                                        }
                                } else {
@@ -3946,7 +3945,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
        }
 
        if ($filetype == "") {
-               $filetype=guess_image_type($filename);
+               $filetype=Photo::guessImageType($filename);
        }
        $imagedata = getimagesize($src);
        if ($imagedata) {
@@ -3971,7 +3970,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
        // create Photo instance with the data of the image
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                throw new InternalServerErrorException("unable to process image data");
        }
 
index 7e8b25d79755dbbad1afe346d6cf56d6701e3bf8..ac07c4085eaff752d8bc1e25643a3a952a34cdca 100644 (file)
@@ -8,13 +8,13 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 
 require_once 'include/group.php';
 require_once 'include/salmon.php';
-require_once 'include/Photo.php';
 
 function update_contact($id) {
        /*
@@ -250,7 +250,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
        }
 
        // Update the avatar
-       update_contact_avatar($ret['photo'],$uid,$contact_id);
+       Contact::updateAvatar($ret['photo'], $uid, $contact_id);
 
        // pull feed and consume it, which should subscribe to the hub.
 
index cffa127288de60037a16d7bd790d1797f59d3861..d446d2773d4c8d4bc0d6bcf24c55d8a33d124d85 100644 (file)
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file include/items.php
  */
-
 use Friendica\App;
 use Friendica\ParseUrl;
 use Friendica\Core\Config;
@@ -21,7 +19,6 @@ require_once 'include/bbcode.php';
 require_once 'include/oembed.php';
 require_once 'include/salmon.php';
 require_once 'include/crypto.php';
-require_once 'include/Photo.php';
 require_once 'include/tags.php';
 require_once 'include/files.php';
 require_once 'include/text.php';
@@ -1692,7 +1689,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                );
                if (DBM::is_result($r)) {
                        $contact_record = $r[0];
-                       update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
+                       Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
                }
 
                /// @TODO Encapsulate this into a function/method
@@ -1879,7 +1876,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                                        $height = intval($match[2]);
 
                                                        $ph = new Photo($data, $type);
-                                                       if ($ph->is_valid()) {
+                                                       if ($ph->isValid()) {
                                                                $ph->scaleImage(max($width, $height));
                                                                $data = $ph->imageString();
                                                                $type = $ph->getType();
index c11cdb2c6c50c462c10745e47ff03f5aa5fe2399..52e3409573347db9754dc7f1249fb09a95f14f5b 100644 (file)
@@ -1,13 +1,12 @@
 <?php
-
 /**
  * @file include/network.php
  */
-
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Util\XML;
 
 /**
@@ -687,7 +686,6 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
        $matches = null;
        $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
        if ($c) {
-               require_once 'include/Photo.php';
                foreach ($matches as $mtch) {
                        logger('scale_external_image: ' . $mtch[1]);
 
@@ -712,11 +710,11 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
                        }
 
                        // guess mimetype from headers or filename
-                       $type = guess_image_type($mtch[1], true);
+                       $type = Photo::guessImageType($mtch[1], true);
 
                        if ($i) {
                                $ph = new Photo($i, $type);
-                               if ($ph->is_valid()) {
+                               if ($ph->isValid()) {
                                        $orig_width = $ph->getWidth();
                                        $orig_height = $ph->getHeight();
 
index 8fa29174406e7392806188b5a5ac7386cc294b51..221d1471b1a7576fd8199e42108027037abf43d1 100644 (file)
@@ -1,17 +1,15 @@
 <?php
-
 /**
  * @file include/plaintext.php
  */
-
 use Friendica\App;
 use Friendica\ParseUrl;
 use Friendica\Core\PConfig;
+use Friendica\Object\Photo;
 
-require_once("include/Photo.php");
-require_once("include/bbcode.php");
-require_once("include/html2plain.php");
-require_once("include/network.php");
+require_once "include/bbcode.php";
+require_once "include/html2plain.php";
+require_once "include/network.php";
 
 /**
  * @brief Fetches attachment data that were generated the old way
@@ -53,7 +51,7 @@ function get_old_attachment_data($body) {
 
                        if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
 
-                               $picturedata = get_photo_info($matches[1]);
+                               $picturedata = Photo::getInfoFromURL($matches[1]);
 
                                if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
                                        $post["image"] = $matches[1];
@@ -223,7 +221,7 @@ function get_attached_data($body, $item = array()) {
                                        $post["preview"] = $pictures[0][2];
                                        $post["text"] = str_replace($pictures[0][0], "", $body);
                                } else {
-                                       $imgdata = get_photo_info($pictures[0][1]);
+                                       $imgdata = Photo::getInfoFromURL($pictures[0][1]);
                                        if (substr($imgdata["mime"], 0, 6) == "image/") {
                                                $post["type"] = "photo";
                                                $post["image"] = $pictures[0][1];
index 8554ba6f0bf67dc6b43e38294e168d77f5259bfb..4e30eabe39ba37db5315b720ff271f22b8b49393 100644 (file)
@@ -1,12 +1,14 @@
 <?php
-
+/**
+ * @file include/uimport.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
-require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
index d82671b86b9d991230bcb8cb44eeaacfa3a9ef54..356f10ad09627705dfca00f2904efb93f7efe2ba 100644 (file)
@@ -1,8 +1,11 @@
 <?php
-
+/**
+ * @file include/user.php
+ */
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 require_once 'include/network.php';
 require_once 'include/plugin.php';
@@ -282,24 +285,22 @@ function create_user($arr) {
                $photo = avatar_img($email);
 
        // unless there is no avatar-plugin loaded
-       if(strlen($photo)) {
-               require_once('include/Photo.php');
+       if (strlen($photo)) {
                $photo_failure = false;
 
                $filename = basename($photo);
-               $img_str = fetch_url($photo,true);
+               $img_str = fetch_url($photo, true);
                // guess mimetype from headers or filename
-               $type = guess_image_type($photo,true);
+               $type = Photo::guessImageType($photo, true);
 
 
                $img = new Photo($img_str, $type);
-               if($img->is_valid()) {
-
+               if ($img->isValid()) {
                        $img->scaleImageSquare(175);
 
                        $hash = photo_new_resource();
 
-                       $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
+                       $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4);
 
                        if ($r === false) {
                                $photo_failure = true;
index 35be8e79e3f21efaad3494b98f569a0baf6c68eb..69f1884960145776dae8ef104ce0c2490ef69c0e 100644 (file)
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/contacts.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -10,7 +12,6 @@ use Friendica\Object\Contact;
 
 require_once 'include/contact_selectors.php';
 require_once 'mod/proxy.php';
-require_once 'include/Photo.php';
 
 function contacts_init(App $a) {
        if (! local_user()) {
@@ -309,7 +310,7 @@ function _contact_update_profile($contact_id) {
        );
 
        // Update the entry in the contact table
-       update_contact_avatar($data['photo'], local_user(), $contact_id, true);
+       Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
 
        // Update the entry in the gcontact table
        GlobalContact::updateFromProbe($data["url"]);
index 754078316fba9c0d9c5d99477a14e62348f2cdb5..7e1921f304124539d84a3114e5c6cbfd27c6b90b 100644 (file)
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/crepair.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
@@ -84,18 +86,17 @@ function crepair_post(App $a) {
                local_user()
        );
 
-       if($photo) {
+       if ($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
-               require_once("include/Photo.php");
 
-               update_contact_avatar($photo,local_user(),$contact['id']);
+               Contact::updateAvatar($photo, local_user(), $contact['id']);
        }
 
-       if($r)
-               info( t('Contact settings applied.') . EOL);
-       else
-               notice( t('Contact update failed.') . EOL);
-
+       if ($r) {
+               info(t('Contact settings applied.') . EOL);
+       } else {
+               notice(t('Contact update failed.') . EOL);
+       }
 
        return;
 }
index 47871debdb1da9820a9b740f7eb6c18c3af9af79..18d9f25bf598c2a40b2fc938e46de4b4434808d0 100644 (file)
@@ -25,6 +25,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 use Friendica\Protocol\Diaspora;
 
 require_once 'include/enotify.php';
@@ -325,9 +326,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                 *
                 */
 
-               require_once 'include/Photo.php';
-
-               update_contact_avatar($contact['photo'],$uid,$contact_id);
+               Contact::updateAvatar($contact['photo'], $uid, $contact_id);
 
                logger('dfrn_confirm: confirm - imported photos');
 
@@ -676,9 +675,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        $photo = System::baseUrl() . '/images/person-175.jpg';
                }
 
-               require_once 'include/Photo.php';
-
-               update_contact_avatar($photo,$local_uid,$dfrn_record);
+               Contact::updateAvatar($photo,$local_uid,$dfrn_record);
 
                logger('dfrn_confirm: request - photos imported');
 
index 39b212fbddc37a4847d51e09739dfc4ae9292739..3c7584318690b8f62d432010221ac9c252a2d961 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/dfrn_request.php
  * @brief Module: dfrn_request
  *    You also find a graphic which describes the confirmation process at
  *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
-
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 
 require_once 'include/enotify.php';
 require_once 'include/group.php';
 
-function dfrn_request_init(App $a) {
-
-       if($a->argc > 1)
+function dfrn_request_init(App $a)
+{
+       if ($a->argc > 1)
                $which = $a->argv[1];
 
-       profile_load($a,$which);
+       profile_load($a, $which);
        return;
 }
 
@@ -196,7 +195,7 @@ function dfrn_request_post(App $a) {
                                                group_add_member(local_user(), '', $r[0]['id'], $def_gid);
 
                                        if (isset($photo))
-                                               update_contact_avatar($photo, local_user(), $r[0]["id"], true);
+                                               Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
 
                                        $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
                                } else {
@@ -587,7 +586,7 @@ function dfrn_request_post(App $a) {
                                        );
                                        if (DBM::is_result($r)) {
                                                $contact_record = $r[0];
-                                               update_contact_avatar($photo, $uid, $contact_record["id"], true);
+                                               Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
                                        }
                                }
 
index 9c0b7bb5af13b88ddbf8ffd75a6941f684c317ac..516be5298725298455981c53d80d4ea2ab93c80a 100644 (file)
@@ -7,8 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once('include/Photo.php');
+use Friendica\Object\Photo;
 
 /**
  * @param App $a
index 9c9d60eeffbe535c342117773318c347a5c1b208..803d7f19646978ccfa8f8740f1aee19a9233c11c 100755 (executable)
@@ -1,10 +1,11 @@
 <?php
-
+/**
+ * @file mod/install.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-
-require_once "include/Photo.php";
+use Friendica\Object\Photo;
 
 $install_wizard_pass = 1;
 
index ece784baeca5335ea2611c57a22afb08571313e2..8368b99a6b99f4ff13f66e5817b8fd3f1bddba81 100644 (file)
@@ -1,10 +1,12 @@
 <?php
-
+/**
+ * @file mod/photo.php
+ */
 use Friendica\App;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
-require_once('include/security.php');
-require_once('include/Photo.php');
+require_once 'include/security.php';
 
 function photo_init(App $a) {
        global $_SERVER;
@@ -167,7 +169,7 @@ function photo_init(App $a) {
        // Resize only if its not a GIF and it is supported by the library
        if (($mimetype != "image/gif") && in_array($mimetype, Photo::supportedTypes())) {
                $ph = new Photo($data, $mimetype);
-               if ($ph->is_valid()) {
+               if ($ph->isValid()) {
                        if (isset($customres) && $customres > 0 && $customres < 500) {
                                $ph->scaleImageSquare($customres);
                        }
index 7b58bb645d358647814f5984e510746edc27e838..504f0ff1460df4fa5cc6b695c0c9568834fb15be 100644 (file)
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/photos.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
@@ -7,8 +9,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 
-require_once 'include/Photo.php';
 require_once 'include/photos.php';
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -422,7 +424,7 @@ function photos_post(App $a) {
                        );
                        if (DBM::is_result($r)) {
                                $ph = new Photo($r[0]['data'], $r[0]['type']);
-                               if ($ph->is_valid()) {
+                               if ($ph->isValid()) {
                                        $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
                                        $ph->rotate($rotate_deg);
 
@@ -808,7 +810,7 @@ function photos_post(App $a) {
                $type       = $_FILES['userfile']['type'];
        }
        if ($type == "") {
-               $type = guess_image_type($filename);
+               $type = Photo::guessImageType($filename);
        }
 
        logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
@@ -837,7 +839,7 @@ function photos_post(App $a) {
 
        $ph = new Photo($imagedata, $type);
 
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
index e80b9ee84e02a15024be814d3e070a8ad243222c..f667359b5184a18ba515167b418628a9b21e81ec 100644 (file)
@@ -1,12 +1,13 @@
 <?php
-
+/**
+ * @file mod/profile_photo.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-
-require_once("include/Photo.php");
+use Friendica\Object\Photo;
 
 function profile_photo_init(App $a) {
 
@@ -72,7 +73,7 @@ function profile_photo_post(App $a) {
                        $base_image = $r[0];
 
                        $im = new Photo($base_image['data'], $base_image['type']);
-                       if($im->is_valid()) {
+                       if ($im->isValid()) {
                                $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
@@ -150,13 +151,13 @@ function profile_photo_post(App $a) {
        $filesize = intval($_FILES['userfile']['size']);
        $filetype = $_FILES['userfile']['type'];
        if ($filetype == "") {
-               $filetype = guess_image_type($filename);
+               $filetype = Photo::guessImageType($filename);
        }
 
-       $maximagesize = Config::get('system','maximagesize');
+       $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+               notice(sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
        }
@@ -164,8 +165,8 @@ function profile_photo_post(App $a) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if (! $ph->is_valid()) {
-               notice( t('Unable to process image.') . EOL );
+       if (! $ph->isValid()) {
+               notice(t('Unable to process image.') . EOL);
                @unlink($src);
                return;
        }
index 8b5f0834f297dab95905dbf939c74b8e887bb619..790309c62769d4cea2ff235a02299cc544d074c2 100644 (file)
@@ -1,10 +1,14 @@
 <?php
-// Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+/**
+ * @file mod/proxy.php
+ * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+ */
 
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
@@ -15,7 +19,6 @@ define('PROXY_SIZE_MEDIUM', 'medium');
 define('PROXY_SIZE_LARGE', 'large');
 
 require_once 'include/security.php';
-require_once 'include/Photo.php';
 
 function proxy_init(App $a) {
        // Pictures are stored in one of the following ways:
@@ -128,7 +131,7 @@ function proxy_init(App $a) {
                        // reduce quality - if it isn't a GIF
                        if ($mime != 'image/gif') {
                                $img = new Photo($img_str, $mime);
-                               if ($img->is_valid()) {
+                               if ($img->isValid()) {
                                        $img_str = $img->imageString();
                                }
                        }
@@ -172,7 +175,7 @@ function proxy_init(App $a) {
                        $cachefile = ''; // Clear the cachefile so that the dummy isn't stored
                        $valid = false;
                        $img = new Photo($img_str, 'image/png');
-                       if ($img->is_valid()) {
+                       if ($img->isValid()) {
                                $img->scaleImage(10);
                                $img_str = $img->imageString();
                        }
@@ -190,7 +193,7 @@ function proxy_init(App $a) {
                        dba::insert('photo', $fields);
                } else {
                        $img = new Photo($img_str, $mime);
-                       if ($img->is_valid() && !$direct_cache && ($cachefile == '')) {
+                       if ($img->isValid() && !$direct_cache && ($cachefile == '')) {
                                $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
                        }
                }
@@ -201,7 +204,7 @@ function proxy_init(App $a) {
        // reduce quality - if it isn't a GIF
        if ($mime != 'image/gif') {
                $img = new Photo($img_str, $mime);
-               if ($img->is_valid()) {
+               if ($img->isValid()) {
                        $img->scaleImage($size);
                        $img_str = $img->imageString();
                }
index d6cb0c2e1a9db6ce7033887f28a0a8a6611908e8..ce73f85151dde9277796c619baaef129110a299d 100644 (file)
@@ -13,8 +13,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-
-require_once 'include/Photo.php';
+use Friendica\Object\Photo;
 
 function wall_upload_post(App $a, $desktopmode = true) {
 
@@ -163,7 +162,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
        }
 
        if ($filetype=="") {
-               $filetype=guess_image_type($filename);
+               $filetype=Photo::guessImageType($filename);
        }
 
        // If there is a temp name, then do a manual check
@@ -193,7 +192,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                $msg = t('Unable to process image.');
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
index be8b28260dc8025e8aba7644d76032afe698eb46..6ec1101775df0f636f838a7e6c29499fce4166ce 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 use Friendica\Object\Profile;
 use Friendica\Protocol\PortableContact;
 use dba;
@@ -18,7 +19,6 @@ use Exception;
 require_once 'include/datetime.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/Photo.php';
 
 /**
  * @brief This class handles GlobalContact related functions
@@ -881,7 +881,7 @@ class GlobalContact
                        if (DBM::is_result($r)) {
                                logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
 
-                               update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
+                               Contact::updateAvatar($contact["photo"], 0, $r[0]["id"]);
 
                                $fields = array('name', 'nick', 'addr',
                                                'network', 'bd', 'gender',
index 1aee2c2b57fcc18092e82a69124ad0b71cb16a75..361d8e3ac863880f199dd2e0c51d2eabd86fba8a 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -645,9 +646,7 @@ class Contact extends BaseObject
                        }
                }
 
-               require_once 'include/Photo.php';
-
-               update_contact_avatar($data["photo"], $uid, $contact_id);
+               self::updateAvatar($data["photo"], $uid, $contact_id);
 
                $contact = dba::select('contact', array('url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date'), array('id' => $contact_id), array('limit' => 1));
 
@@ -846,5 +845,50 @@ class Contact extends BaseObject
                $return = dba::update('contact', ['blocked' => false], ['id' => $uid]);
 
                return $return;
+  }
+
+  /**
+   * @brief Updates the avatar links in a contact only if needed
+        *
+        * @param string $avatar Link to avatar picture
+        * @param int    $uid    User id of contact owner
+        * @param int    $cid    Contact id
+        * @param bool   $force  force picture update
+        *
+        * @return array Returns array of the different avatar sizes
+        */
+       public static function updateAvatar($avatar, $uid, $cid, $force = false)
+       {
+               // Limit = 1 returns the row so no need for dba:inArray()
+               $r = dba::select('contact', array('avatar', 'photo', 'thumb', 'micro', 'nurl'), array('id' => $cid), array('limit' => 1));
+               if (!DBM::is_result($r)) {
+                       return false;
+               } else {
+                       $data = array($r["photo"], $r["thumb"], $r["micro"]);
+               }
+
+               if (($r["avatar"] != $avatar) || $force) {
+                       $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+
+                       if ($photos) {
+                               dba::update(
+                                       'contact',
+                                       array('avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()),
+                                       array('id' => $cid)
+                               );
+
+                               // Update the public contact (contact id = 0)
+                               if ($uid != 0) {
+                                       $pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
+                                       if (DBM::is_result($pcontact)) {
+                                               self::updateAvatar($avatar, 0, $pcontact['id'], $force);
+                                       }
+                               }
+
+                               return $photos;
+                       }
+               }
+
+               return $data;
        }
 }
diff --git a/src/Object/Photo.php b/src/Object/Photo.php
new file mode 100644 (file)
index 0000000..372f731
--- /dev/null
@@ -0,0 +1,1165 @@
+<?php
+/**
+ * @file src/Object/Photo.php
+ * @brief This file contains the Photo class for image processing
+ */
+namespace Friendica\Object;
+
+use Friendica\App;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use dba;
+use Imagick;
+use ImagickPixel;
+
+require_once "include/photos.php";
+
+/**
+ * Class to handle Photos
+ */
+class Photo
+{
+       private $image;
+
+       /*
+        * Put back gd stuff, not everybody have Imagick
+        */
+       private $imagick;
+       private $width;
+       private $height;
+       private $valid;
+       private $type;
+       private $types;
+
+       /**
+        * @brief supported mimetypes and corresponding file extensions
+        * @return array
+        */
+       public 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
+                       $t = array(
+                               'image/jpeg' => 'jpg',
+                               'image/png' => 'png',
+                               'image/gif' => 'gif'
+                       );
+               } else {
+                       $t = array();
+                       $t['image/jpeg'] ='jpg';
+                       if (imagetypes() & IMG_PNG) {
+                               $t['image/png'] = 'png';
+                       }
+               }
+
+               return $t;
+       }
+
+       /**
+        * @brief Constructor
+        * @param object  $data data
+        * @param boolean $type optional, default null
+        * @return object
+        */
+       public function __construct($data, $type = null)
+       {
+               $this->imagick = class_exists('Imagick');
+               $this->types = static::supportedTypes();
+               if (!array_key_exists($type, $this->types)) {
+                       $type='image/jpeg';
+               }
+               $this->type = $type;
+
+               if ($this->isImagick() && $this->loadData($data)) {
+                       return true;
+               } else {
+                       // Failed to load with Imagick, fallback
+                       $this->imagick = false;
+               }
+               return $this->loadData($data);
+       }
+
+       /**
+        * @brief Destructor
+        * @return void
+        */
+       public function __destruct()
+       {
+               if ($this->image) {
+                       if ($this->isImagick()) {
+                               $this->image->clear();
+                               $this->image->destroy();
+                               return;
+                       }
+                       if (is_resource($this->image)) {
+                               imagedestroy($this->image);
+                       }
+               }
+       }
+
+       /**
+        * @return boolean
+        */
+       public function isImagick()
+       {
+               return $this->imagick;
+       }
+
+       /**
+        * @brief Maps Mime types to Imagick formats
+        * @return arr With with image formats (mime type as key)
+        */
+       public static function getFormatsMap()
+       {
+               $m = array(
+                       'image/jpeg' => 'JPG',
+                       'image/png' => 'PNG',
+                       'image/gif' => 'GIF'
+               );
+               return $m;
+       }
+
+       /**
+        * @param object $data data
+        * @return boolean
+        */
+       private function loadData($data)
+       {
+               if ($this->isImagick()) {
+                       $this->image = new Imagick();
+                       try {
+                               $this->image->readImageBlob($data);
+                       } catch (Exception $e) {
+                               // Imagick couldn't use the data
+                               return false;
+                       }
+
+                       /*
+                        * Setup the image to the format it will be saved to
+                        */
+                       $map = self::getFormatsMap();
+                       $format = $map[$type];
+                       $this->image->setFormat($format);
+
+                       // 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 = Config::get('system', 'png_quality');
+                                       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
+                                        * the zlib compression level (quality / 10) and filter-type (quality % 10).
+                                        * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+                                        * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+                                        */
+                                       $quality = $quality * 10;
+                                       $this->image->setCompressionQuality($quality);
+                                       break;
+                               case "image/jpeg":
+                                       $quality = Config::get('system', 'jpeg_quality');
+                                       if ((! $quality) || ($quality > 100)) {
+                                               $quality = JPEG_QUALITY;
+                                       }
+                                       $this->image->setCompressionQuality($quality);
+                       }
+
+                       // The 'width' and 'height' properties are only used by non-Imagick routines.
+                       $this->width  = $this->image->getImageWidth();
+                       $this->height = $this->image->getImageHeight();
+                       $this->valid  = true;
+
+                       return true;
+               }
+
+               $this->valid = false;
+               $this->image = @imagecreatefromstring($data);
+               if ($this->image !== false) {
+                       $this->width  = imagesx($this->image);
+                       $this->height = imagesy($this->image);
+                       $this->valid  = true;
+                       imagealphablending($this->image, false);
+                       imagesavealpha($this->image, true);
+
+                       return true;
+               }
+
+               return false;
+       }
+
+       /**
+        * @return boolean
+        */
+       public function isValid()
+       {
+               if ($this->isImagick()) {
+                       return ($this->image !== false);
+               }
+               return $this->valid;
+       }
+
+       /**
+        * @return mixed
+        */
+       public function getWidth()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       return $this->image->getImageWidth();
+               }
+               return $this->width;
+       }
+
+       /**
+        * @return mixed
+        */
+       public function getHeight()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       return $this->image->getImageHeight();
+               }
+               return $this->height;
+       }
+
+       /**
+        * @return mixed
+        */
+       public function getImage()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       /* Clean it */
+                       $this->image = $this->image->deconstructImages();
+                       return $this->image;
+               }
+               return $this->image;
+       }
+
+       /**
+        * @return mixed
+        */
+       public function getType()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               return $this->type;
+       }
+
+       /**
+        * @return mixed
+        */
+       public function getExt()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               return $this->types[$this->getType()];
+       }
+
+       /**
+        * @param integer $max max dimension
+        * @return mixed
+        */
+       public function scaleImage($max)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               $width = $this->getWidth();
+               $height = $this->getHeight();
+
+               $dest_width = $dest_height = 0;
+
+               if ((! $width)|| (! $height)) {
+                       return false;
+               }
+
+               if ($width > $max && $height > $max) {
+                       // very tall image (greater than 16:9)
+                       // constrain the width - let the height float.
+
+                       if ((($height * 9) / 16) > $width) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } elseif ($width > $height) {
+                               // else constrain both dimensions
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               $dest_width = intval(($width * $max) / $height);
+                               $dest_height = $max;
+                       }
+               } else {
+                       if ($width > $max) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               if ($height > $max) {
+                                       // very tall image (greater than 16:9)
+                                       // but width is OK - don't do anything
+
+                                       if ((($height * 9) / 16) > $width) {
+                                               $dest_width = $width;
+                                               $dest_height = $height;
+                                       } else {
+                                               $dest_width = intval(($width * $max) / $height);
+                                               $dest_height = $max;
+                                       }
+                               } else {
+                                       $dest_width = $width;
+                                       $dest_height = $height;
+                               }
+                       }
+               }
+
+
+               if ($this->isImagick()) {
+                       /*
+                        * If it is not animated, there will be only one iteration here,
+                        * so don't bother checking
+                        */
+                       // Don't forget to go back to the first frame
+                       $this->image->setFirstIterator();
+                       do {
+                               // FIXME - implement horizantal bias for scaling as in followin GD functions
+                               // to allow very tall images to be constrained only horizontally.
+
+                               $this->image->scaleImage($dest_width, $dest_height);
+                       } while ($this->image->nextImage());
+
+                       // These may not be necessary any more
+                       $this->width  = $this->image->getImageWidth();
+                       $this->height = $this->image->getImageHeight();
+
+                       return;
+               }
+
+
+               $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
+               }
+               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+               if ($this->image) {
+                       imagedestroy($this->image);
+               }
+               $this->image = $dest;
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }
+
+       /**
+        * @param integer $degrees degrees to rotate image
+        * @return mixed
+        */
+       public function rotate($degrees)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       $this->image->setFirstIterator();
+                       do {
+                               $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
+                       } while ($this->image->nextImage());
+                       return;
+               }
+
+               // if script dies at this point check memory_limit setting in php.ini
+               $this->image  = imagerotate($this->image, $degrees, 0);
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }
+
+       /**
+        * @param boolean $horiz optional, default true
+        * @param boolean $vert  optional, default false
+        * @return mixed
+        */
+       public function flip($horiz = true, $vert = false)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       $this->image->setFirstIterator();
+                       do {
+                               if ($horiz) {
+                                       $this->image->flipImage();
+                               }
+                               if ($vert) {
+                                       $this->image->flopImage();
+                               }
+                       } while ($this->image->nextImage());
+                       return;
+               }
+
+               $w = imagesx($this->image);
+               $h = imagesy($this->image);
+               $flipped = imagecreate($w, $h);
+               if ($horiz) {
+                       for ($x = 0; $x < $w; $x++) {
+                               imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+                       }
+               }
+               if ($vert) {
+                       for ($y = 0; $y < $h; $y++) {
+                               imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+                       }
+               }
+               $this->image = $flipped;
+       }
+
+       /**
+        * @param string $filename filename
+        * @return mixed
+        */
+       public function orient($filename)
+       {
+               if ($this->isImagick()) {
+                       // based off comment on http://php.net/manual/en/imagick.getimageorientation.php
+                       $orientation = $this->image->getImageOrientation();
+                       switch ($orientation) {
+                               case Imagick::ORIENTATION_BOTTOMRIGHT:
+                                       $this->image->rotateimage("#000", 180);
+                                       break;
+                               case Imagick::ORIENTATION_RIGHTTOP:
+                                       $this->image->rotateimage("#000", 90);
+                                       break;
+                               case Imagick::ORIENTATION_LEFTBOTTOM:
+                                       $this->image->rotateimage("#000", -90);
+                                       break;
+                       }
+
+                       $this->image->setImageOrientation(Imagick::ORIENTATION_TOPLEFT);
+                       return true;
+               }
+               // based off comment on http://php.net/manual/en/function.imagerotate.php
+
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ((!function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) {
+                       return;
+               }
+
+               $exif = @exif_read_data($filename, null, true);
+               if (!$exif) {
+                       return;
+               }
+
+               $ort = $exif['IFD0']['Orientation'];
+
+               switch ($ort) {
+                       case 1: // nothing
+                               break;
+
+                       case 2: // horizontal flip
+                               $this->flip();
+                               break;
+
+                       case 3: // 180 rotate left
+                               $this->rotate(180);
+                               break;
+
+                       case 4: // vertical flip
+                               $this->flip(false, true);
+                               break;
+
+                       case 5: // vertical flip + 90 rotate right
+                               $this->flip(false, true);
+                               $this->rotate(-90);
+                               break;
+
+                       case 6: // 90 rotate right
+                               $this->rotate(-90);
+                               break;
+
+                       case 7: // horizontal flip + 90 rotate right
+                               $this->flip();
+                               $this->rotate(-90);
+                               break;
+
+                       case 8: // 90 rotate left
+                               $this->rotate(90);
+                               break;
+               }
+
+               //      logger('exif: ' . print_r($exif,true));
+               return $exif;
+       }
+
+       /**
+        * @param integer $min minimum dimension
+        * @return mixed
+        */
+       public function scaleImageUp($min)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               $width = $this->getWidth();
+               $height = $this->getHeight();
+
+               $dest_width = $dest_height = 0;
+
+               if ((!$width)|| (!$height)) {
+                       return false;
+               }
+
+               if ($width < $min && $height < $min) {
+                       if ($width > $height) {
+                               $dest_width = $min;
+                               $dest_height = intval(($height * $min) / $width);
+                       } else {
+                               $dest_width = intval(($width * $min) / $height);
+                               $dest_height = $min;
+                       }
+               } else {
+                       if ($width < $min) {
+                               $dest_width = $min;
+                               $dest_height = intval(($height * $min) / $width);
+                       } else {
+                               if ($height < $min) {
+                                       $dest_width = intval(($width * $min) / $height);
+                                       $dest_height = $min;
+                               } else {
+                                       $dest_width = $width;
+                                       $dest_height = $height;
+                               }
+                       }
+               }
+
+               if ($this->isImagick()) {
+                       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
+               }
+               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+               if ($this->image) {
+                       imagedestroy($this->image);
+               }
+               $this->image = $dest;
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }
+
+       /**
+        * @param integer $dim dimension
+        * @return mixed
+        */
+       public function scaleImageSquare($dim)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       $this->image->setFirstIterator();
+                       do {
+                               $this->image->scaleImage($dim, $dim);
+                       } while ($this->image->nextImage());
+                       return;
+               }
+
+               $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
+               }
+               imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
+               if ($this->image) {
+                       imagedestroy($this->image);
+               }
+               $this->image = $dest;
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }
+
+       /**
+        * @param integer $max maximum
+        * @param integer $x   x coordinate
+        * @param integer $y   y coordinate
+        * @param integer $w   width
+        * @param integer $h   height
+        * @return mixed
+        */
+       public function cropImage($max, $x, $y, $w, $h)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       $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
+                                */
+                               $this->image->setImagePage(0, 0, 0, 0);
+                       } while ($this->image->nextImage());
+                       return $this->scaleImage($max);
+               }
+
+               $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
+               }
+               imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
+               if ($this->image) {
+                       imagedestroy($this->image);
+               }
+               $this->image = $dest;
+               $this->width  = imagesx($this->image);
+               $this->height = imagesy($this->image);
+       }
+
+       /**
+        * @param string $path file path
+        * @return mixed
+        */
+       public function saveImage($path)
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               $string = $this->imageString();
+
+               $a = get_app();
+
+               $stamp1 = microtime(true);
+               file_put_contents($path, $string);
+               $a->save_timestamp($stamp1, "file");
+       }
+
+       /**
+        * @return mixed
+        */
+       public function imageString()
+       {
+               if (!$this->isValid()) {
+                       return false;
+               }
+
+               if ($this->isImagick()) {
+                       /* Clean it */
+                       $this->image = $this->image->deconstructImages();
+                       $string = $this->image->getImagesBlob();
+                       return $string;
+               }
+
+               $quality = false;
+
+               ob_start();
+
+               // Enable interlacing
+               imageinterlace($this->image, true);
+
+               switch ($this->getType()) {
+                       case "image/png":
+                               $quality = Config::get('system', 'png_quality');
+                               if ((!$quality) || ($quality > 9)) {
+                                       $quality = PNG_QUALITY;
+                               }
+                               imagepng($this->image, null, $quality);
+                               break;
+                       case "image/jpeg":
+                               $quality = Config::get('system', 'jpeg_quality');
+                               if ((!$quality) || ($quality > 100)) {
+                                       $quality = JPEG_QUALITY;
+                               }
+                               imagejpeg($this->image, null, $quality);
+               }
+               $string = ob_get_contents();
+               ob_end_clean();
+
+               return $string;
+       }
+
+       /**
+        * @param integer $uid       uid
+        * @param integer $cid       cid
+        * @param integer $rid       rid
+        * @param string  $filename  filename
+        * @param string  $album     album name
+        * @param integer $scale     scale
+        * @param integer $profile   optional, default = 0
+        * @param string  $allow_cid optional, default = ''
+        * @param string  $allow_gid optional, default = ''
+        * @param string  $deny_cid  optional, default = ''
+        * @param string  $deny_gid  optional, default = ''
+        * @param string  $desc      optional, default = ''
+        * @return object
+        */
+       public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
+       {
+               $r = dba::select('photo', array('guid'), array("`resource-id` = ? AND `guid` != ?", $rid, ''), array('limit' => 1));
+               if (DBM::is_result($r)) {
+                       $guid = $r['guid'];
+               } else {
+                       $guid = get_guid();
+               }
+
+               $x = dba::select('photo', array('id'), array('resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale), array('limit' => 1));
+
+               $fields = array('uid' => $uid, 'contact-id' => $cid, 'guid' => $guid, 'resource-id' => $rid, 'created' => datetime_convert(), 'edited' => datetime_convert(),
+                               'filename' => basename($filename), 'type' => $this->getType(), 'album' => $album, 'height' => $this->getHeight(), 'width' => $this->getWidth(),
+                               'datasize' => strlen($this->imageString()), 'data' => $this->imageString(), 'scale' => $scale, 'profile' => $profile,
+                               'allow_cid' => $allow_cid, 'allow_gid' => $allow_gid, 'deny_cid' => $deny_cid, 'deny_gid' => $deny_gid, 'desc' => $desc);
+
+               if (DBM::is_result($x)) {
+                       $r = dba::update('photo', $fields, array('id' => $x['id']));
+               } else {
+                       $r = dba::insert('photo', $fields);
+               }
+
+               return $r;
+       }
+
+       /**
+        * Guess image mimetype from filename or from Content-Type header
+        *
+        * @param string  $filename Image filename
+        * @param boolean $fromcurl Check Content-Type header from curl request
+        *
+        * @return object
+        */
+       public static function guessImageType($filename, $fromcurl = false)
+       {
+               logger('Photo: guessImageType: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
+               $type = null;
+               if ($fromcurl) {
+                       $a = get_app();
+                       $headers=array();
+                       $h = explode("\n", $a->get_curl_headers());
+                       foreach ($h as $l) {
+                               list($k,$v) = array_map("trim", explode(":", trim($l), 2));
+                               $headers[$k] = $v;
+                       }
+                       if (array_key_exists('Content-Type', $headers))
+                               $type = $headers['Content-Type'];
+               }
+               if (is_null($type)) {
+                       // Guessing from extension? Isn't that... dangerous?
+                       if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
+                               /**
+                                * Well, this not much better,
+                                * but at least it comes from the data inside the image,
+                                * we won't be tricked by a manipulated extension
+                                */
+                               $image = new Imagick($filename);
+                               $type = $image->getImageMimeType();
+                               $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
+                       } else {
+                               $ext = pathinfo($filename, PATHINFO_EXTENSION);
+                               $types = self::supportedTypes();
+                               $type = "image/jpeg";
+                               foreach ($types as $m => $e) {
+                                       if ($ext == $e) {
+                                               $type = $m;
+                                       }
+                               }
+                       }
+               }
+               logger('Photo: guessImageType: type='.$type, LOGGER_DEBUG);
+               return $type;
+       }
+
+       /**
+        * @param string  $photo         photo
+        * @param integer $uid           user id
+        * @param integer $cid           contact id
+        * @param boolean $quit_on_error optional, default false
+        * @return array
+        */
+       public static function importProfilePhoto($photo, $uid, $cid, $quit_on_error = false)
+       {
+               $r = dba::select(
+                       'photo',
+                       array('resource-id'),
+                       array('uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos'),
+                       array('limit' => 1)
+               );
+
+               if (DBM::is_result($r) && strlen($r['resource-id'])) {
+                       $hash = $r['resource-id'];
+               } else {
+                       $hash = photo_new_resource();
+               }
+       
+               $photo_failure = false;
+       
+               $filename = basename($photo);
+               $img_str = fetch_url($photo, true);
+       
+               if ($quit_on_error && ($img_str == "")) {
+                       return false;
+               }
+       
+               $type = self::guessImageType($photo, true);
+               $img = new Photo($img_str, $type);
+               if ($img->isValid()) {
+                       $img->scaleImageSquare(175);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
+                       }
+       
+                       $img->scaleImage(80);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
+                       }
+       
+                       $img->scaleImage(48);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
+                       }
+       
+                       $suffix = '?ts='.time();
+       
+                       $photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
+                       $thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
+                       $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
+       
+                       // Remove the cached photo
+                       $a = get_app();
+                       $basepath = $a->get_basepath();
+       
+                       if (is_dir($basepath."/photo")) {
+                               $filename = $basepath.'/photo/'.$hash.'-4.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                               $filename = $basepath.'/photo/'.$hash.'-5.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                               $filename = $basepath.'/photo/'.$hash.'-6.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                       }
+               } else {
+                       $photo_failure = true;
+               }
+       
+               if ($photo_failure && $quit_on_error) {
+                       return false;
+               }
+       
+               if ($photo_failure) {
+                       $photo = System::baseUrl() . '/images/person-175.jpg';
+                       $thumb = System::baseUrl() . '/images/person-80.jpg';
+                       $micro = System::baseUrl() . '/images/person-48.jpg';
+               }
+       
+               return array($photo, $thumb, $micro);
+       }
+
+       /**
+        * @param string $url url
+        * @return object
+        */
+       public static function getInfoFromURL($url)
+       {
+               $data = array();
+       
+               $data = Cache::get($url);
+       
+               if (is_null($data) || !$data || !is_array($data)) {
+                       $img_str = fetch_url($url, true, $redirects, 4);
+                       $filesize = strlen($img_str);
+       
+                       if (function_exists("getimagesizefromstring")) {
+                               $data = getimagesizefromstring($img_str);
+                       } else {
+                               $tempfile = tempnam(get_temppath(), "cache");
+       
+                               $a = get_app();
+                               $stamp1 = microtime(true);
+                               file_put_contents($tempfile, $img_str);
+                               $a->save_timestamp($stamp1, "file");
+       
+                               $data = getimagesize($tempfile);
+                               unlink($tempfile);
+                       }
+       
+                       if ($data) {
+                               $data["size"] = $filesize;
+                       }
+       
+                       Cache::set($url, $data);
+               }
+       
+               return $data;
+       }
+
+       /**
+        * @param integer $width  width
+        * @param integer $height height
+        * @param integer $max    max
+        * @return array
+        */
+       public static function scaleImageTo($width, $height, $max)
+       {
+               $dest_width = $dest_height = 0;
+       
+               if ((!$width) || (!$height)) {
+                       return false;
+               }
+       
+               if ($width > $max && $height > $max) {
+                       // very tall image (greater than 16:9)
+                       // constrain the width - let the height float.
+       
+                       if ((($height * 9) / 16) > $width) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } elseif ($width > $height) {
+                               // else constrain both dimensions
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               $dest_width = intval(($width * $max) / $height);
+                               $dest_height = $max;
+                       }
+               } else {
+                       if ($width > $max) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               if ($height > $max) {
+                                       // very tall image (greater than 16:9)
+                                       // but width is OK - don't do anything
+       
+                                       if ((($height * 9) / 16) > $width) {
+                                               $dest_width = $width;
+                                               $dest_height = $height;
+                                       } else {
+                                               $dest_width = intval(($width * $max) / $height);
+                                               $dest_height = $max;
+                                       }
+                               } else {
+                                       $dest_width = $width;
+                                       $dest_height = $height;
+                               }
+                       }
+               }
+               return array("width" => $dest_width, "height" => $dest_height);
+       }
+
+       /**
+        * @brief This function is used by the fromgplus addon
+        * @param object  $a         App
+        * @param integer $uid       user id
+        * @param string  $imagedata optional, default empty
+        * @param string  $url       optional, default empty
+        * @return array
+        */
+       public static function storePhoto(App $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",
+                       intval($uid)
+               );
+       
+               if (!DBM::is_result($r)) {
+                       logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $page_owner_nick  = $r[0]['nickname'];
+       
+               /// @TODO
+               /// $default_cid      = $r[0]['id'];
+               /// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+       
+               if ((strlen($imagedata) == 0) && ($url == "")) {
+                       logger("No image data and no url provided", LOGGER_DEBUG);
+                       return(array());
+               } elseif (strlen($imagedata) == 0) {
+                       logger("Uploading picture from ".$url, LOGGER_DEBUG);
+       
+                       $stamp1 = microtime(true);
+                       $imagedata = @file_get_contents($url);
+                       $a->save_timestamp($stamp1, "file");
+               }
+       
+               $maximagesize = Config::get('system', 'maximagesize');
+       
+               if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
+                       logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $tempfile = tempnam(get_temppath(), "cache");
+       
+               $stamp1 = microtime(true);
+               file_put_contents($tempfile, $imagedata);
+               $a->save_timestamp($stamp1, "file");
+       
+               $data = getimagesize($tempfile);
+       
+               if (!isset($data["mime"])) {
+                       unlink($tempfile);
+                       logger("File is no picture", LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $ph = new Photo($imagedata, $data["mime"]);
+       
+               if (!$ph->isValid()) {
+                       unlink($tempfile);
+                       logger("Picture is no valid picture", LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $ph->orient($tempfile);
+               unlink($tempfile);
+       
+               $max_length = Config::get('system', 'max_image_length');
+               if (! $max_length) {
+                       $max_length = MAX_IMAGE_LENGTH;
+               }
+
+               if ($max_length > 0) {
+                       $ph->scaleImage($max_length);
+               }
+       
+               $width = $ph->getWidth();
+               $height = $ph->getHeight();
+       
+               $hash = photo_new_resource();
+       
+               $smallest = 0;
+       
+               // Pictures are always public by now
+               //$defperm = '<'.$default_cid.'>';
+               $defperm = "";
+               $visitor = 0;
+       
+               $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
+       
+               if (!$r) {
+                       logger("Picture couldn't be stored", LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+                       "full" => System::baseUrl()."/photo/{$hash}-0.".$ph->getExt());
+       
+               if ($width > 800 || $height > 800) {
+                       $image["large"] = System::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) {
+                               $image["medium"] = System::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) {
+                               $image["small"] = System::baseUrl()."/photo/{$hash}-2.".$ph->getExt();
+                       }
+               }
+       
+               if ($width > 160 && $height > 160) {
+                       $x = 0;
+                       $y = 0;
+               
+                       $min = $ph->getWidth();
+                       if ($min > 160) {
+                               $x = ($min - 160) / 2;
+                       }
+               
+                       if ($ph->getHeight() < $min) {
+                               $min = $ph->getHeight();
+                               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) {
+                               $image["thumb"] = System::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"];
+       
+               // Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
+               //if (isset($image["thumb"]))
+               //  $image["preview"] = $image["thumb"];
+       
+               // Unsure, if this should be activated or deactivated
+               //if (isset($image["small"]))
+               //  $image["preview"] = $image["small"];
+       
+               if (isset($image["medium"])) {
+                       $image["preview"] = $image["medium"];
+               }
+       
+               return($image);
+       }
+}
index 0183fdb3f54eafef2ff0c36ef83e12b17dadbcc6..2183a9c1e05698cdacd8c1bb42905121547af2e0 100644 (file)
@@ -6,6 +6,7 @@
 namespace Friendica;
 
 use Friendica\Core\Config;
+use Friendica\Object\Photo;
 use Friendica\Util\XML;
 
 use dba;
@@ -13,7 +14,6 @@ use DomXPath;
 use DOMDocument;
 
 require_once "include/network.php";
-require_once "include/Photo.php";
 require_once "include/oembed.php";
 
 /**
@@ -353,7 +353,7 @@ class ParseUrl
                                }
 
                                $src = self::completeUrl($attr["src"], $url);
-                               $photodata = get_photo_info($src);
+                               $photodata = Photo::getInfoFromURL($src);
 
                                if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
                                        if ($photodata[0] > 300) {
@@ -374,7 +374,7 @@ class ParseUrl
 
                        unset($siteinfo["image"]);
 
-                       $photodata = get_photo_info($src);
+                       $photodata = Photo::getInfoFromURL($src);
 
                        if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
                                $siteinfo["images"][] = array("src" => $src,
index 47aeaf05e57e14dd47595fd45a972447f79606a7..5af082905d847ecd7e0a3a0fd4614e9c1c002aae 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\XML;
@@ -1659,7 +1660,7 @@ class DFRN
                                );
                        }
 
-                       update_contact_avatar(
+                       Contact::updateAvatar(
                                $author["avatar"],
                                $importer["uid"],
                                $contact["id"],
@@ -2034,7 +2035,7 @@ class DFRN
                        dbesc(normalise_link($old["url"]))
                );
 
-               update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
+               Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
                if ($x === false) {
                        return false;
index 4d91f8b1c0661946f183676a6e15e567fc1e6c73..26412e27044f9ce676794f2be5913e400d6a26d2 100644 (file)
@@ -27,7 +27,6 @@ use SimpleXMLElement;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
-require_once 'include/Photo.php';
 require_once 'include/group.php';
 require_once 'include/datetime.php';
 require_once 'include/queue_fn.php';
@@ -2211,7 +2210,7 @@ class Diaspora
                        $image_url = "http://".$handle_parts[1].$image_url;
                }
 
-               update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
+               Contact::updateAvatar($image_url, $importer["uid"], $contact["id"]);
 
                // Generic birthday. We don't know the timezone. The year is irrelevant.
 
@@ -2471,7 +2470,7 @@ class Diaspora
                        group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
                }
 
-               update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
+               Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
                if ($importer["page-flags"] == PAGE_NORMAL) {
                        logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
@@ -2494,7 +2493,7 @@ class Diaspora
 
                        logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
 
-                       update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
+                       Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
                        // technically they are sharing with us (CONTACT_IS_SHARING),
                        // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
index ed762084c2668d83d55cd4e113006d9b16bf4213..47538faa83953ec13089f06d3d479484f558e850 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Util\Lock;
 use Friendica\Util\XML;
 use dba;
@@ -24,7 +25,6 @@ require_once 'include/bbcode.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
-require_once 'include/Photo.php';
 require_once 'include/follow.php';
 require_once 'include/api.php';
 require_once 'mod/proxy.php';
@@ -203,7 +203,7 @@ class OStatus
 
                        if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
                                logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
-                               update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
+                               Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
                        }
 
                        // Ensure that we are having this contact (with uid=0)
@@ -223,7 +223,7 @@ class OStatus
                                dba::update('contact', $fields, array('id' => $cid), $old_contact);
 
                                // Update the avatar
-                               update_contact_avatar($author["author-avatar"], 0, $cid);
+                               Contact::updateAvatar($author["author-avatar"], 0, $cid);
                        }
 
                        $contact["generation"] = 2;
@@ -1326,7 +1326,7 @@ class OStatus
 
                switch ($siteinfo["type"]) {
                        case 'photo':
-                               $imgdata = get_photo_info($siteinfo["image"]);
+                               $imgdata = Photo::getInfoFromURL($siteinfo["image"]);
                                $attributes = array("rel" => "enclosure",
                                                "href" => $siteinfo["image"],
                                                "type" => $imgdata["mime"],
@@ -1346,7 +1346,7 @@ class OStatus
                }
 
                if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
-                       $imgdata = get_photo_info($siteinfo["image"]);
+                       $imgdata = Photo::getInfoFromURL($siteinfo["image"]);
                        $attributes = array("rel" => "enclosure",
                                        "href" => $siteinfo["image"],
                                        "type" => $imgdata["mime"],
index 59b3ad4325d7b10c6e8f94c81d5a9de53b7de88e..feb4dfdc8dbe9aee53b9b6f1d1de20c1ef6d1b76 100644 (file)
@@ -14,6 +14,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use dba;
 use DOMDocument;
@@ -23,7 +24,6 @@ use Exception;
 require_once 'include/datetime.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/Photo.php';
 
 class PortableContact
 {
index 21074c1d8778c73b343b5bf30f229a48388b59fe..ba0867d3a8ca3cfd7c423c25c4486b2df41ecbcd 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 /**
  *
@@ -146,14 +147,14 @@ function update_1013() {
                AFTER `object` , ADD `target` TEXT NOT NULL AFTER `target-type`");
 }
 
-function update_1014() {
-       require_once('include/Photo.php');
+function update_1014()
+{
        q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
        $r = q("SELECT * FROM `photo` WHERE `scale` = 4");
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $ph = new Photo($rr['data']);
-                       if ($ph->is_valid()) {
+                       if ($ph->isValid()) {
                                $ph->scaleImage(48);
                                $ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
                        }
index 35e40aa96529143c97aa56f70dce78b74a6defb3..0a6b48e4ebf7ec1a6b2a2256e9f1aee47b5b9a56 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 $frio = "view/theme/frio";
 
@@ -79,9 +80,8 @@ function frio_uninstall() {
  * @param App $a Unused but required by hook definition
  * @param array $body_info The item and its html output
  */
-function frio_item_photo_links(App $a, &$body_info) {
-       require_once('include/Photo.php');
-
+function frio_item_photo_links(App $a, &$body_info)
+{
        $phototypes = Photo::supportedTypes();
        $occurence = 1;
        $p = bb_find_open_close($body_info['html'], "<a", ">");
index 5023aeb9ba226fac1eb2c57ee342fbd026c5c4bb..5d5162cd32afd62514b2470cb51d86a5f65121b7 100644 (file)
@@ -11,6 +11,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Object\Photo;
 
 function frost_init(App $a) {
        $a->videowidth = 400;
@@ -45,8 +46,8 @@ function frost_uninstall() {
        logger("uninstalled theme frost");
 }
 
-function frost_item_photo_links(App $a, &$body_info) {
-       require_once('include/Photo.php');
+function frost_item_photo_links(App $a, &$body_info)
+{
        $phototypes = Photo::supportedTypes();
 
        $occurence = 1;