friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

Photo to namespace 

updates for Photo class moving to Friendica\Object namespace.
This commit is contained in:
Adam Magness 2017-11-29 12:38:39 -05:00
parent 83f427a577
commit 30fa9ac76c
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fromgplus/fromgplus.php
View File

@ -11,10 +11,11 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Object\Photo;
require_once('mod/share.php'); require_once 'mod/share.php';
require_once('mod/parse_url.php'); require_once 'mod/parse_url.php';
require_once('include/text.php'); require_once 'include/text.php';
function fromgplus_install() { function fromgplus_install() {
register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@ -263,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
} }
if ($cleaned["full"] != "") if ($cleaned["full"] != "")
$infoFull = get_photo_info($cleaned["full"]); $infoFull = Photo::getPhotoInfo($cleaned["full"]);
else else
$infoFull = array("0" => 0, "1" => 0); $infoFull = array("0" => 0, "1" => 0);
if ($cleaned["preview"] != "") if ($cleaned["preview"] != "")
$infoPreview = get_photo_info($cleaned["preview"]); $infoPreview = Photo::getPhotoInfo($cleaned["preview"]);
else else
$infoFull = array("0" => 0, "1" => 0); $infoFull = array("0" => 0, "1" => 0);

5
pumpio/pumpio.php
View File

@ -5,12 +5,12 @@
* Version: 0.2 * Version: 0.2
* Author: Michael Vogel <http://pirati.ca/profile/heluecht> * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*/ */
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php'; require 'addon/pumpio/oauth/oauth_client.php';
@ -1046,8 +1046,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
*/ */
} }
if (function_exists("update_contact_avatar")) Photo::updateContactAvatar($contact->image->url, $uid, $contact_id);
update_contact_avatar($contact->image->url, $uid, $contact_id);
return($contact_id); return($contact_id);
} }

5
statusnet/statusnet.php
View File

@ -49,6 +49,7 @@ require_once 'include/enotify.php';
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Object\Photo;
class StatusNetOAuth extends TwitterOAuth { class StatusNetOAuth extends TwitterOAuth {
function get_maxlength() { function get_maxlength() {
@ -999,7 +1000,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
require_once("Photo.php"); require_once("Photo.php");
$photos = import_profile_photo($contact->profile_image_url,$uid,$contact_id); $photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
q("UPDATE `contact` SET `photo` = '%s', q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s', `thumb` = '%s',
@ -1026,7 +1027,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
require_once("Photo.php"); require_once("Photo.php");
$photos = import_profile_photo($contact->profile_image_url, $uid, $r[0]['id']); $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
q("UPDATE `contact` SET `photo` = '%s', q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s', `thumb` = '%s',

7
twitter/twitter.php
View File

@ -64,6 +64,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Object\Photo;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -950,7 +951,7 @@ function twitter_fix_avatar($avatar) {
$new_avatar = str_replace("_normal.", ".", $avatar); $new_avatar = str_replace("_normal.", ".", $avatar);
$info = get_photo_info($new_avatar); $info = Photo::getPhotoInfo($new_avatar);
if (!$info) if (!$info)
$new_avatar = $avatar; $new_avatar = $avatar;
@ -1027,7 +1028,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
require_once("Photo.php"); require_once("Photo.php");
$photos = import_profile_photo($avatar, $uid, $contact_id, true); $photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
if ($photos) { if ($photos) {
q("UPDATE `contact` SET `photo` = '%s', q("UPDATE `contact` SET `photo` = '%s',
@ -1060,7 +1061,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
require_once("Photo.php"); require_once("Photo.php");
$photos = import_profile_photo($avatar, $uid, $r[0]['id'], true); $photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
if ($photos) { if ($photos) {
q("UPDATE `contact` SET `photo` = '%s', q("UPDATE `contact` SET `photo` = '%s',