keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into task/admin-block-list

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-01 00:48:13 -05:00 committed by GitHub
commit ff459441cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 742 additions and 600 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/api.php
View file

@ -5,7 +5,6 @@
* *
* @todo Automatically detect if incoming data is HTML or BBCode * @todo Automatically detect if incoming data is HTML or BBCode
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -23,6 +22,7 @@ use Friendica\Network\HTTPException\NotImplementedException;
use Friendica\Network\HTTPException\UnauthorizedException; use Friendica\Network\HTTPException\UnauthorizedException;
use Friendica\Network\HTTPException\TooManyRequestsException; use Friendica\Network\HTTPException\TooManyRequestsException;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -32,7 +32,6 @@ require_once 'include/conversation.php';
require_once 'include/oauth.php'; require_once 'include/oauth.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'include/Photo.php';
require_once 'mod/item.php'; require_once 'mod/item.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
@ -2377,7 +2376,7 @@ function api_get_attachments(&$body)
$attachments = array(); $attachments = array();
foreach ($images[1] as $image) { foreach ($images[1] as $image) {
$imagedata = get_photo_info($image); $imagedata = Photo::getInfoFromURL($image);
if ($imagedata) { if ($imagedata) {
$attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]); $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"); $start = iconv_strpos($text, $url, $offset, "UTF-8");
if (!($start === false)) { if (!($start === false)) {
$image = get_photo_info($url); $image = Photo::getInfoFromURL($url);
if ($image) { if ($image) {
// If image cache is activated, then use the following sizes: // If image cache is activated, then use the following sizes:
// thumb (150), small (340), medium (600) and large (1024) // thumb (150), small (340), medium (600) and large (1024)
@ -2517,19 +2516,19 @@ function api_get_entitities(&$text, $bbcode)
$media_url = proxy_url($url); $media_url = proxy_url($url);
$sizes = array(); $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"); $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
if (($image[0] > 150) || ($image[1] > 150)) { 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"); $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"); $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
if (($image[0] > 600) || ($image[1] > 600)) { 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"); $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
} }
} else { } else {
@ -3946,7 +3945,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
} }
if ($filetype == "") { if ($filetype == "") {
$filetype=guess_image_type($filename); $filetype=Photo::guessImageType($filename);
} }
$imagedata = getimagesize($src); $imagedata = getimagesize($src);
if ($imagedata) { 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 // create Photo instance with the data of the image
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata, $filetype); $ph = new Photo($imagedata, $filetype);
if (! $ph->is_valid()) { if (! $ph->isValid()) {
throw new InternalServerErrorException("unable to process image data"); throw new InternalServerErrorException("unable to process image data");
} }

4
include/follow.php
View file

@ -8,13 +8,13 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
require_once 'include/group.php'; require_once 'include/group.php';
require_once 'include/salmon.php'; require_once 'include/salmon.php';
require_once 'include/Photo.php';
function update_contact($id) { function update_contact($id) {
/* /*
@ -250,7 +250,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
} }
// Update the avatar // 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. // pull feed and consume it, which should subscribe to the hub.

7
include/items.php
View file

@ -1,9 +1,7 @@
<?php <?php
/** /**
* @file include/items.php * @file include/items.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\ParseUrl; use Friendica\ParseUrl;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -21,7 +19,6 @@ require_once 'include/bbcode.php';
require_once 'include/oembed.php'; require_once 'include/oembed.php';
require_once 'include/salmon.php'; require_once 'include/salmon.php';
require_once 'include/crypto.php'; require_once 'include/crypto.php';
require_once 'include/Photo.php';
require_once 'include/tags.php'; require_once 'include/tags.php';
require_once 'include/files.php'; require_once 'include/files.php';
require_once 'include/text.php'; require_once 'include/text.php';
@ -1692,7 +1689,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$contact_record = $r[0]; $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 /// @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]); $height = intval($match[2]);
$ph = new Photo($data, $type); $ph = new Photo($data, $type);
if ($ph->is_valid()) { if ($ph->isValid()) {
$ph->scaleImage(max($width, $height)); $ph->scaleImage(max($width, $height));
$data = $ph->imageString(); $data = $ph->imageString();
$type = $ph->getType(); $type = $ph->getType();

8
include/network.php
View file

@ -1,13 +1,12 @@
<?php <?php
/** /**
* @file include/network.php * @file include/network.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Photo;
use Friendica\Util\XML; use Friendica\Util\XML;
/** /**
@ -687,7 +686,6 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
$matches = null; $matches = null;
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER); $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
if ($c) { if ($c) {
require_once 'include/Photo.php';
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
logger('scale_external_image: ' . $mtch[1]); 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 // guess mimetype from headers or filename
$type = guess_image_type($mtch[1], true); $type = Photo::guessImageType($mtch[1], true);
if ($i) { if ($i) {
$ph = new Photo($i, $type); $ph = new Photo($i, $type);
if ($ph->is_valid()) { if ($ph->isValid()) {
$orig_width = $ph->getWidth(); $orig_width = $ph->getWidth();
$orig_height = $ph->getHeight(); $orig_height = $ph->getHeight();

14
include/plaintext.php
View file

@ -1,17 +1,15 @@
<?php <?php
/** /**
* @file include/plaintext.php * @file include/plaintext.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\ParseUrl; use Friendica\ParseUrl;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Object\Photo;
require_once("include/Photo.php"); require_once "include/bbcode.php";
require_once("include/bbcode.php"); require_once "include/html2plain.php";
require_once("include/html2plain.php"); require_once "include/network.php";
require_once("include/network.php");
/** /**
* @brief Fetches attachment data that were generated the old way * @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)) { 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])) if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
$post["image"] = $matches[1]; $post["image"] = $matches[1];
@ -223,7 +221,7 @@ function get_attached_data($body, $item = array()) {
$post["preview"] = $pictures[0][2]; $post["preview"] = $pictures[0][2];
$post["text"] = str_replace($pictures[0][0], "", $body); $post["text"] = str_replace($pictures[0][0], "", $body);
} else { } else {
$imgdata = get_photo_info($pictures[0][1]); $imgdata = Photo::getInfoFromURL($pictures[0][1]);
if (substr($imgdata["mime"], 0, 6) == "image/") { if (substr($imgdata["mime"], 0, 6) == "image/") {
$post["type"] = "photo"; $post["type"] = "photo";
$post["image"] = $pictures[0][1]; $post["image"] = $pictures[0][1];

6
include/uimport.php
View file

@ -1,12 +1,14 @@
<?php <?php
/**
* @file include/uimport.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once("include/Photo.php");
define("IMPORT_DEBUG", False); define("IMPORT_DEBUG", False);
function last_insert_id() { function last_insert_id() {

17
include/user.php
View file

@ -1,8 +1,11 @@
<?php <?php
/**
* @file include/user.php
*/
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once 'include/network.php'; require_once 'include/network.php';
require_once 'include/plugin.php'; require_once 'include/plugin.php';
@ -282,24 +285,22 @@ function create_user($arr) {
$photo = avatar_img($email); $photo = avatar_img($email);
// unless there is no avatar-plugin loaded // unless there is no avatar-plugin loaded
if(strlen($photo)) { if (strlen($photo)) {
require_once('include/Photo.php');
$photo_failure = false; $photo_failure = false;
$filename = basename($photo); $filename = basename($photo);
$img_str = fetch_url($photo,true); $img_str = fetch_url($photo, true);
// guess mimetype from headers or filename // guess mimetype from headers or filename
$type = guess_image_type($photo,true); $type = Photo::guessImageType($photo, true);
$img = new Photo($img_str, $type); $img = new Photo($img_str, $type);
if($img->is_valid()) { if ($img->isValid()) {
$img->scaleImageSquare(175); $img->scaleImageSquare(175);
$hash = photo_new_resource(); $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) { if ($r === false) {
$photo_failure = true; $photo_failure = true;

7
mod/contacts.php
View file

@ -1,5 +1,7 @@
<?php <?php
/**
* @file mod/contacts.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -10,7 +12,6 @@ use Friendica\Object\Contact;
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
require_once 'include/Photo.php';
function contacts_init(App $a) { function contacts_init(App $a) {
if (! local_user()) { if (! local_user()) {
@ -309,7 +310,7 @@ function _contact_update_profile($contact_id) {
); );
// Update the entry in the contact table // 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 // Update the entry in the gcontact table
GlobalContact::updateFromProbe($data["url"]); GlobalContact::updateFromProbe($data["url"]);

19
mod/crepair.php
View file

@ -1,5 +1,7 @@
<?php <?php
/**
* @file mod/crepair.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
@ -84,18 +86,17 @@ function crepair_post(App $a) {
local_user() local_user()
); );
if($photo) { if ($photo) {
logger('mod-crepair: updating photo from ' . $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) if ($r) {
info( t('Contact settings applied.') . EOL); info(t('Contact settings applied.') . EOL);
else } else {
notice( t('Contact update failed.') . EOL); notice(t('Contact update failed.') . EOL);
}
return; return;
} }

9
mod/dfrn_confirm.php
View file

@ -25,6 +25,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -325,9 +326,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
* *
*/ */
require_once 'include/Photo.php'; Contact::updateAvatar($contact['photo'], $uid, $contact_id);
update_contact_avatar($contact['photo'],$uid,$contact_id);
logger('dfrn_confirm: confirm - imported photos'); 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'; $photo = System::baseUrl() . '/images/person-175.jpg';
} }
require_once 'include/Photo.php'; Contact::updateAvatar($photo,$local_uid,$dfrn_record);
update_contact_avatar($photo,$local_uid,$dfrn_record);
logger('dfrn_confirm: request - photos imported'); logger('dfrn_confirm: request - photos imported');

15
mod/dfrn_request.php
View file

@ -1,5 +1,4 @@
<?php <?php
/** /**
* @file mod/dfrn_request.php * @file mod/dfrn_request.php
* @brief Module: dfrn_request * @brief Module: dfrn_request
@ -11,23 +10,23 @@
* You also find a graphic which describes the confirmation process at * You also find a graphic which describes the confirmation process at
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png * https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/group.php'; require_once 'include/group.php';
function dfrn_request_init(App $a) { function dfrn_request_init(App $a)
{
if($a->argc > 1) if ($a->argc > 1)
$which = $a->argv[1]; $which = $a->argv[1];
profile_load($a,$which); profile_load($a, $which);
return; return;
} }
@ -196,7 +195,7 @@ function dfrn_request_post(App $a) {
group_add_member(local_user(), '', $r[0]['id'], $def_gid); group_add_member(local_user(), '', $r[0]['id'], $def_gid);
if (isset($photo)) 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']; $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
} else { } else {
@ -587,7 +586,7 @@ function dfrn_request_post(App $a) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$contact_record = $r[0]; $contact_record = $r[0];
update_contact_avatar($photo, $uid, $contact_record["id"], true); Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
} }
} }

3
mod/fbrowser.php
View file

@ -7,8 +7,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Object\Photo;
require_once('include/Photo.php');
/** /**
* @param App $a * @param App $a

7
mod/install.php
View file

@ -1,10 +1,11 @@
<?php <?php
/**
* @file mod/install.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once "include/Photo.php";
$install_wizard_pass = 1; $install_wizard_pass = 1;

10
mod/photo.php
View file

@ -1,10 +1,12 @@
<?php <?php
/**
* @file mod/photo.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once('include/security.php'); require_once 'include/security.php';
require_once('include/Photo.php');
function photo_init(App $a) { function photo_init(App $a) {
global $_SERVER; 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 // Resize only if its not a GIF and it is supported by the library
if (($mimetype != "image/gif") && in_array($mimetype, Photo::supportedTypes())) { if (($mimetype != "image/gif") && in_array($mimetype, Photo::supportedTypes())) {
$ph = new Photo($data, $mimetype); $ph = new Photo($data, $mimetype);
if ($ph->is_valid()) { if ($ph->isValid()) {
if (isset($customres) && $customres > 0 && $customres < 500) { if (isset($customres) && $customres > 0 && $customres < 500) {
$ph->scaleImageSquare($customres); $ph->scaleImageSquare($customres);
} }

12
mod/photos.php
View file

@ -1,5 +1,7 @@
<?php <?php
/**
* @file mod/photos.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -7,8 +9,8 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
require_once 'include/Photo.php';
require_once 'include/photos.php'; require_once 'include/photos.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
@ -422,7 +424,7 @@ function photos_post(App $a) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$ph = new Photo($r[0]['data'], $r[0]['type']); $ph = new Photo($r[0]['data'], $r[0]['type']);
if ($ph->is_valid()) { if ($ph->isValid()) {
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 ); $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
$ph->rotate($rotate_deg); $ph->rotate($rotate_deg);
@ -808,7 +810,7 @@ function photos_post(App $a) {
$type = $_FILES['userfile']['type']; $type = $_FILES['userfile']['type'];
} }
if ($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); 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); $ph = new Photo($imagedata, $type);
if (! $ph->is_valid()) { if (! $ph->isValid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG); logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
notice( t('Unable to process image.') . EOL ); notice( t('Unable to process image.') . EOL );
@unlink($src); @unlink($src);

19
mod/profile_photo.php
View file

@ -1,12 +1,13 @@
<?php <?php
/**
* @file mod/profile_photo.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once("include/Photo.php");
function profile_photo_init(App $a) { function profile_photo_init(App $a) {
@ -72,7 +73,7 @@ function profile_photo_post(App $a) {
$base_image = $r[0]; $base_image = $r[0];
$im = new Photo($base_image['data'], $base_image['type']); $im = new Photo($base_image['data'], $base_image['type']);
if($im->is_valid()) { if ($im->isValid()) {
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH); $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); $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']); $filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type']; $filetype = $_FILES['userfile']['type'];
if ($filetype == "") { 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)) { 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); @unlink($src);
return; return;
} }
@ -164,8 +165,8 @@ function profile_photo_post(App $a) {
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata, $filetype); $ph = new Photo($imagedata, $filetype);
if (! $ph->is_valid()) { if (! $ph->isValid()) {
notice( t('Unable to process image.') . EOL ); notice(t('Unable to process image.') . EOL);
@unlink($src); @unlink($src);
return; return;
} }

15
mod/proxy.php
View file

@ -1,10 +1,14 @@
<?php <?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\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
define('PROXY_DEFAULT_TIME', 86400); // 1 Day define('PROXY_DEFAULT_TIME', 86400); // 1 Day
@ -15,7 +19,6 @@ define('PROXY_SIZE_MEDIUM', 'medium');
define('PROXY_SIZE_LARGE', 'large'); define('PROXY_SIZE_LARGE', 'large');
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/Photo.php';
function proxy_init(App $a) { function proxy_init(App $a) {
// Pictures are stored in one of the following ways: // 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 // reduce quality - if it isn't a GIF
if ($mime != 'image/gif') { if ($mime != 'image/gif') {
$img = new Photo($img_str, $mime); $img = new Photo($img_str, $mime);
if ($img->is_valid()) { if ($img->isValid()) {
$img_str = $img->imageString(); $img_str = $img->imageString();
} }
} }
@ -172,7 +175,7 @@ function proxy_init(App $a) {
$cachefile = ''; // Clear the cachefile so that the dummy isn't stored $cachefile = ''; // Clear the cachefile so that the dummy isn't stored
$valid = false; $valid = false;
$img = new Photo($img_str, 'image/png'); $img = new Photo($img_str, 'image/png');
if ($img->is_valid()) { if ($img->isValid()) {
$img->scaleImage(10); $img->scaleImage(10);
$img_str = $img->imageString(); $img_str = $img->imageString();
} }
@ -190,7 +193,7 @@ function proxy_init(App $a) {
dba::insert('photo', $fields); dba::insert('photo', $fields);
} else { } else {
$img = new Photo($img_str, $mime); $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); $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 // reduce quality - if it isn't a GIF
if ($mime != 'image/gif') { if ($mime != 'image/gif') {
$img = new Photo($img_str, $mime); $img = new Photo($img_str, $mime);
if ($img->is_valid()) { if ($img->isValid()) {
$img->scaleImage($size); $img->scaleImage($size);
$img_str = $img->imageString(); $img_str = $img->imageString();
} }

7
mod/wall_upload.php
View file

@ -13,8 +13,7 @@ use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
require_once 'include/Photo.php';
function wall_upload_post(App $a, $desktopmode = true) { function wall_upload_post(App $a, $desktopmode = true) {
@ -163,7 +162,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
} }
if ($filetype=="") { if ($filetype=="") {
$filetype=guess_image_type($filename); $filetype=Photo::guessImageType($filename);
} }
// If there is a temp name, then do a manual check // 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); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata, $filetype); $ph = new Photo($imagedata, $filetype);
if (! $ph->is_valid()) { if (! $ph->isValid()) {
$msg = t('Unable to process image.'); $msg = t('Unable to process image.');
if ($r_json) { if ($r_json) {
echo json_encode(array('error'=>$msg)); echo json_encode(array('error'=>$msg));

4
src/Model/GlobalContact.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact;
use Friendica\Object\Profile; use Friendica\Object\Profile;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
use dba; use dba;
@ -18,7 +19,6 @@ use Exception;
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/network.php'; require_once 'include/network.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';
require_once 'include/Photo.php';
/** /**
* @brief This class handles GlobalContact related functions * @brief This class handles GlobalContact related functions
@ -881,7 +881,7 @@ class GlobalContact
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG); 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', $fields = array('name', 'nick', 'addr',
'network', 'bd', 'gender', 'network', 'bd', 'gender',

50
src/Object/Contact.php
View file

@ -13,6 +13,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Photo;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
@ -645,9 +646,7 @@ class Contact extends BaseObject
} }
} }
require_once 'include/Photo.php'; self::updateAvatar($data["photo"], $uid, $contact_id);
update_contact_avatar($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)); $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 = dba::update('contact', ['blocked' => false], ['id' => $uid]);
return $return; 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;
} }
} }

1042
include/Photo.php → src/Object/Photo.php
View file

File diff suppressed because it is too large Load diff

6
src/ParseUrl.php
View file

@ -6,6 +6,7 @@
namespace Friendica; namespace Friendica;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Object\Photo;
use Friendica\Util\XML; use Friendica\Util\XML;
use dba; use dba;
@ -13,7 +14,6 @@ use DomXPath;
use DOMDocument; use DOMDocument;
require_once "include/network.php"; require_once "include/network.php";
require_once "include/Photo.php";
require_once "include/oembed.php"; require_once "include/oembed.php";
/** /**
@ -353,7 +353,7 @@ class ParseUrl
} }
$src = self::completeUrl($attr["src"], $url); $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) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
if ($photodata[0] > 300) { if ($photodata[0] > 300) {
@ -374,7 +374,7 @@ class ParseUrl
unset($siteinfo["image"]); unset($siteinfo["image"]);
$photodata = get_photo_info($src); $photodata = Photo::getInfoFromURL($src);
if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) { if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
$siteinfo["images"][] = array("src" => $src, $siteinfo["images"][] = array("src" => $src,

5
src/Protocol/DFRN.php
View file

@ -15,6 +15,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
use Friendica\Object\Profile; use Friendica\Object\Profile;
use Friendica\Protocol\OStatus; use Friendica\Protocol\OStatus;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -1659,7 +1660,7 @@ class DFRN
); );
} }
update_contact_avatar( Contact::updateAvatar(
$author["avatar"], $author["avatar"],
$importer["uid"], $importer["uid"],
$contact["id"], $contact["id"],
@ -2034,7 +2035,7 @@ class DFRN
dbesc(normalise_link($old["url"])) 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) { if ($x === false) {
return false; return false;

7
src/Protocol/Diaspora.php
View file

@ -27,7 +27,6 @@ use SimpleXMLElement;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/bb2diaspora.php'; require_once 'include/bb2diaspora.php';
require_once 'include/Photo.php';
require_once 'include/group.php'; require_once 'include/group.php';
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/queue_fn.php'; require_once 'include/queue_fn.php';
@ -2211,7 +2210,7 @@ class Diaspora
$image_url = "http://".$handle_parts[1].$image_url; $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. // 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); 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) { if ($importer["page-flags"] == PAGE_NORMAL) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG); 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); 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), // technically they are sharing with us (CONTACT_IS_SHARING),
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX

10
src/Protocol/OStatus.php
View file

@ -12,6 +12,7 @@ use Friendica\Database\DBM;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
use Friendica\Util\Lock; use Friendica\Util\Lock;
use Friendica\Util\XML; use Friendica\Util\XML;
use dba; use dba;
@ -24,7 +25,6 @@ require_once 'include/bbcode.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/Photo.php';
require_once 'include/follow.php'; require_once 'include/follow.php';
require_once 'include/api.php'; require_once 'include/api.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
@ -203,7 +203,7 @@ class OStatus
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) { if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG); 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) // 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); dba::update('contact', $fields, array('id' => $cid), $old_contact);
// Update the avatar // Update the avatar
update_contact_avatar($author["author-avatar"], 0, $cid); Contact::updateAvatar($author["author-avatar"], 0, $cid);
} }
$contact["generation"] = 2; $contact["generation"] = 2;
@ -1326,7 +1326,7 @@ class OStatus
switch ($siteinfo["type"]) { switch ($siteinfo["type"]) {
case 'photo': case 'photo':
$imgdata = get_photo_info($siteinfo["image"]); $imgdata = Photo::getInfoFromURL($siteinfo["image"]);
$attributes = array("rel" => "enclosure", $attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"], "href" => $siteinfo["image"],
"type" => $imgdata["mime"], "type" => $imgdata["mime"],
@ -1346,7 +1346,7 @@ class OStatus
} }
if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { 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", $attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"], "href" => $siteinfo["image"],
"type" => $imgdata["mime"], "type" => $imgdata["mime"],

2
src/Protocol/PortableContact.php
View file

@ -14,6 +14,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Photo;
use Friendica\Object\Profile; use Friendica\Object\Profile;
use dba; use dba;
use DOMDocument; use DOMDocument;
@ -23,7 +24,6 @@ use Exception;
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/network.php'; require_once 'include/network.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';
require_once 'include/Photo.php';
class PortableContact class PortableContact
{ {

7
update.php
View file

@ -6,6 +6,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; 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`"); AFTER `object` , ADD `target` TEXT NOT NULL AFTER `target-type`");
} }
function update_1014() { function update_1014()
require_once('include/Photo.php'); {
q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` "); q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
$r = q("SELECT * FROM `photo` WHERE `scale` = 4"); $r = q("SELECT * FROM `photo` WHERE `scale` = 4");
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$ph = new Photo($rr['data']); $ph = new Photo($rr['data']);
if ($ph->is_valid()) { if ($ph->isValid()) {
$ph->scaleImage(48); $ph->scaleImage(48);
$ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0)); $ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
} }

6
view/theme/frio/theme.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Object\Photo;
$frio = "view/theme/frio"; $frio = "view/theme/frio";
@ -79,9 +80,8 @@ function frio_uninstall() {
* @param App $a Unused but required by hook definition * @param App $a Unused but required by hook definition
* @param array $body_info The item and its html output * @param array $body_info The item and its html output
*/ */
function frio_item_photo_links(App $a, &$body_info) { function frio_item_photo_links(App $a, &$body_info)
require_once('include/Photo.php'); {
$phototypes = Photo::supportedTypes(); $phototypes = Photo::supportedTypes();
$occurence = 1; $occurence = 1;
$p = bb_find_open_close($body_info['html'], "<a", ">"); $p = bb_find_open_close($body_info['html'], "<a", ">");

5
view/theme/frost/theme.php
View file

@ -11,6 +11,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Object\Photo;
function frost_init(App $a) { function frost_init(App $a) {
$a->videowidth = 400; $a->videowidth = 400;
@ -45,8 +46,8 @@ function frost_uninstall() {
logger("uninstalled theme frost"); logger("uninstalled theme frost");
} }
function frost_item_photo_links(App $a, &$body_info) { function frost_item_photo_links(App $a, &$body_info)
require_once('include/Photo.php'); {
$phototypes = Photo::supportedTypes(); $phototypes = Photo::supportedTypes();
$occurence = 1; $occurence = 1;