Merge pull request #9016 from annando/network-view

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 311d2b1c14e9639c1cdf7e9ed4fac9035d863f47..e5ab6b8dcea416b4eafd282efe232298f817a747 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -82,7 +82,7 @@ function photos_init(App $a) {
                        '$photo' => $profile['photo'],
                        '$addr' => $profile['addr'] ?? '',
                        '$account_type' => $account_type,
-                       '$about' => BBCode::convert($profile['about'] ?? ''),
+                       '$about' => BBCode::convert($profile['about']),
                ]);
 
                $albums = Photo::getAlbums($a->data['user']['uid']);
@@ -175,14 +175,14 @@ function photos_post(App $a)
        }
 
        if (!$can_post) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                exit();
        }
 
        $owner_record = User::getOwnerDataById($page_owner_uid);
 
        if (!$owner_record) {
-               notice(DI::l10n()->t('Contact information unavailable') . EOL);
+               notice(DI::l10n()->t('Contact information unavailable'));
                Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
                exit();
        }
@@ -204,7 +204,7 @@ function photos_post(App $a)
                );
 
                if (!DBA::isResult($r)) {
-                       notice(DI::l10n()->t('Album not found.') . EOL);
+                       notice(DI::l10n()->t('Album not found.'));
                        DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
                        return; // NOTREACHED
                }
@@ -295,9 +295,8 @@ function photos_post(App $a)
 
                                // Update the photo albums cache
                                Photo::clearAlbumCache($page_owner_uid);
-                               notice('Successfully deleted the photo.');
                        } else {
-                               notice('Failed to delete the photo.');
+                               notice(DI::l10n()->t('Failed to delete the photo.'));
                                DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
                        }
 
@@ -509,9 +508,9 @@ function photos_post(App $a)
 
                                                if ($profile) {
                                                        if (!empty($contact)) {
-                                                               $taginfo[] = [$newname, $profile, $notify, $contact, '@[url=' . str_replace(',', '%2c', $profile) . ']' . $newname . '[/url]'];
+                                                               $taginfo[] = [$newname, $profile, $notify, $contact];
                                                        } else {
-                                                               $taginfo[] = [$newname, $profile, $notify, null, '@[url=' . $profile . ']' . $newname . '[/url]'];
+                                                               $taginfo[] = [$newname, $profile, $notify, null];
                                                        }
 
                                                        $profile = str_replace(',', '%2c', $profile);
@@ -579,7 +578,6 @@ function photos_post(App $a)
                                        $arr['gravity']       = GRAVITY_PARENT;
                                        $arr['object-type']   = Activity\ObjectType::PERSON;
                                        $arr['target-type']   = Activity\ObjectType::IMAGE;
-                                       $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
                                        $arr['origin']        = 1;
                                        $arr['body']          = DI::l10n()->t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . DI::l10n()->t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
@@ -677,21 +675,21 @@ function photos_post(App $a)
        if ($error !== UPLOAD_ERR_OK) {
                switch ($error) {
                        case UPLOAD_ERR_INI_SIZE:
-                               notice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
+                               notice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')));
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL);
+                               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)));
                                break;
                        case UPLOAD_ERR_PARTIAL:
-                               notice(DI::l10n()->t('Image upload didn\'t complete, please try again') . EOL);
+                               notice(DI::l10n()->t('Image upload didn\'t complete, please try again'));
                                break;
                        case UPLOAD_ERR_NO_FILE:
-                               notice(DI::l10n()->t('Image file is missing') . EOL);
+                               notice(DI::l10n()->t('Image file is missing'));
                                break;
                        case UPLOAD_ERR_NO_TMP_DIR:
                        case UPLOAD_ERR_CANT_WRITE:
                        case UPLOAD_ERR_EXTENSION:
-                               notice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL);
+                               notice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator'));
                                break;
                }
                @unlink($src);
@@ -707,7 +705,7 @@ function photos_post(App $a)
        $maximagesize = DI::config()->get('system', 'maximagesize');
 
        if ($maximagesize && ($filesize > $maximagesize)) {
-               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
+               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -715,7 +713,7 @@ function photos_post(App $a)
        }
 
        if (!$filesize) {
-               notice(DI::l10n()->t('Image file is empty.') . EOL);
+               notice(DI::l10n()->t('Image file is empty.'));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -730,7 +728,7 @@ function photos_post(App $a)
 
        if (!$image->isValid()) {
                Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
-               notice(DI::l10n()->t('Unable to process image.') . EOL);
+               notice(DI::l10n()->t('Unable to process image.'));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end',$foo);
@@ -759,7 +757,7 @@ function photos_post(App $a)
 
        if (!$r) {
                Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
-               notice(DI::l10n()->t('Image upload failed.') . EOL);
+               notice(DI::l10n()->t('Image upload failed.'));
                return;
        }
 
@@ -779,7 +777,7 @@ function photos_post(App $a)
 
        // Create item container
        $lat = $lon = null;
-       if ($exif && $exif['GPS'] && Feature::isEnabled($page_owner_uid, 'photo_location')) {
+       if (!empty($exif['GPS']) && Feature::isEnabled($page_owner_uid, 'photo_location')) {
                $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
                $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
        }
@@ -842,12 +840,12 @@ function photos_content(App $a)
        // photos/name/image/xxxxx/drop
 
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-               notice(DI::l10n()->t('Public access denied.') . EOL);
+               notice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
        if (empty($a->data['user'])) {
-               notice(DI::l10n()->t('No photos selected') . EOL);
+               notice(DI::l10n()->t('No photos selected'));
                return;
        }
 
@@ -913,7 +911,7 @@ function photos_content(App $a)
        }
 
        if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this item is restricted.'));
                return;
        }
 
@@ -1138,7 +1136,7 @@ function photos_content(App $a)
                        if (DBA::exists('photo', ['resource-id' => $datum, 'uid' => $owner_uid])) {
                                notice(DI::l10n()->t('Permission denied. Access to this item may be restricted.'));
                        } else {
-                               notice(DI::l10n()->t('Photo not available') . EOL);
+                               notice(DI::l10n()->t('Photo not available'));
                        }
                        return;
                }
@@ -1288,7 +1286,7 @@ function photos_content(App $a)
                }
 
                if (!empty($link_item['parent']) && !empty($link_item['uid'])) {
-                       $condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
+                       $condition = ["`parent` = ? AND `gravity` != ?",  $link_item['parent'], GRAVITY_PARENT];
                        $total = DBA::count('item', $condition);
 
                        $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
@@ -1457,7 +1455,7 @@ function photos_content(App $a)
 
                                        if (($activity->match($item['verb'], Activity::LIKE) ||
                                             $activity->match($item['verb'], Activity::DISLIKE)) &&
-                                           ($item['id'] != $item['parent'])) {
+                                           ($item['gravity'] != GRAVITY_PARENT)) {
                                                continue;
                                        }