friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Merge pull request #470 from friendica/revert-469-revert-468-task/3878-move-objects-to-src

Browse source 
Revert "Revert "Move objects to src""
This commit is contained in:
Michael Vogel 2017-12-08 06:20:29 +01:00 committed by GitHub
commit 95facaefc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1319 additions and 1164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fromgplus/fromgplus.php
View file

@ -11,7 +11,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Object\Photo;
use Friendica\Object\Image;
require_once 'mod/share.php';
require_once 'mod/parse_url.php';
@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
}
if ($cleaned["full"] != "")
$infoFull = Photo::getInfoFromURL($cleaned["full"]);
$infoFull = Image::getInfoFromURL($cleaned["full"]);
else
$infoFull = array("0" => 0, "1" => 0);
if ($cleaned["preview"] != "")
$infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
$infoPreview = Image::getInfoFromURL($cleaned["preview"]);
else
$infoFull = array("0" => 0, "1" => 0);
@ -352,9 +352,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
} else {
if ($attachment->fullImage->url != "") {
$images = Photo::storePhoto($a, $uid, "", $attachment->fullImage->url);
$images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
} elseif ($attachment->image->url != "") {
$images = Photo::storePhoto($a, $uid, "", $attachment->image->url);
$images = Image::storePhoto($a, $uid, "", $attachment->image->url);
}
}

6
pumpio/pumpio.php
View file

@ -8,8 +8,8 @@
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Model\GlobalContact;
use Friendica\Object\Contact;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php';
@ -974,7 +974,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
function pumpio_get_contact($uid, $contact, $no_insert = false) {
GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
GContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
"photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));

1354
statusnet/statusnet.php
View file

File diff suppressed because it is too large Load diff

1113
twitter/twitter.php
View file

File diff suppressed because it is too large Load diff