]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
The conversation functionality moved to a class
[friendica.git] / mod / photos.php
index b0bd79b8f52afd17dfdf9034363d27f31c028821..209b9fb7beca5ed61a47949255a62f62f0df42dc 100644 (file)
@@ -24,6 +24,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
@@ -52,6 +53,7 @@ use Friendica\Security\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
+use Friendica\Network\HTTPException;
 
 function photos_init(App $a) {
 
@@ -61,42 +63,22 @@ function photos_init(App $a) {
 
        Nav::setSelected('home');
 
-       if ($a->argc > 1) {
-               $nick = $a->argv[1];
-               $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
-
-               if (!DBA::isResult($user)) {
-                       return;
+       if (DI::args()->getArgc() > 1) {
+               $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
+               if (!$owner) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
                }
 
-               $a->data['user'] = $user;
-               $a->profile_uid = $user['uid'];
-               $is_owner = (local_user() && (local_user() == $a->profile_uid));
-
-               $profile = Profile::getByNickname($nick);
-
-               $account_type = Contact::getAccountType($profile);
+               $is_owner = (local_user() && (local_user() == $owner['uid']));
 
-               $tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
+               $albums = Photo::getAlbums($owner['uid']);
 
-               $vcard_widget = Renderer::replaceMacros($tpl, [
-                       '$name' => $profile['name'],
-                       '$photo' => $profile['photo'],
-                       '$addr' => $profile['addr'] ?? '',
-                       '$account_type' => $account_type,
-                       '$about' => BBCode::convert($profile['about']),
-               ]);
-
-               $albums = Photo::getAlbums($a->data['user']['uid']);
-
-               $albums_visible = ((intval($a->data['user']['hidewall']) && !Session::isAuthenticated()) ? false : true);
+               $albums_visible = ((intval($owner['hidewall']) && !Session::isAuthenticated()) ? false : true);
 
                // add various encodings to the array so we can just loop through and pick them out in a template
                $ret = ['success' => false];
 
                if ($albums) {
-                       $a->data['albums'] = $albums;
-
                        if ($albums_visible) {
                                $ret['success'] = true;
                        }
@@ -104,12 +86,12 @@ function photos_init(App $a) {
                        $ret['albums'] = [];
                        foreach ($albums as $k => $album) {
                                //hide profile photos to others
-                               if (!$is_owner && !Session::getRemoteContactID($a->profile_uid) && ($album['album'] == DI::l10n()->t('Profile Photos')))
+                               if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t('Profile Photos')))
                                        continue;
                                $entry = [
                                        'text'      => $album['album'],
                                        'total'     => $album['total'],
-                                       'url'       => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+                                       'url'       => 'photos/' . $owner['nickname'] . '/album/' . bin2hex($album['album']),
                                        'urlencode' => urlencode($album['album']),
                                        'bin2hex'   => bin2hex($album['album'])
                                ];
@@ -117,7 +99,7 @@ function photos_init(App $a) {
                        }
                }
 
-               if (local_user() && $a->data['user']['uid'] == local_user()) {
+               if (local_user() && $owner['uid'] == local_user()) {
                        $can_post = true;
                } else {
                        $can_post = false;
@@ -125,11 +107,11 @@ function photos_init(App $a) {
 
                if ($ret['success']) {
                        $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
-                               '$nick'     => $a->data['user']['nickname'],
+                               '$nick'     => $owner['nickname'],
                                '$title'    => DI::l10n()->t('Photo Albums'),
                                '$recent'   => DI::l10n()->t('Recent Photos'),
                                '$albums'   => $ret['albums'],
-                               '$upload'   => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
+                               '$upload'   => [DI::l10n()->t('Upload New Photos'), 'photos/' . $owner['nickname'] . '/upload'],
                                '$can_post' => $can_post
                        ]);
                }
@@ -138,7 +120,7 @@ function photos_init(App $a) {
                        DI::page()['aside'] = '';
                }
 
-               DI::page()['aside'] .= $vcard_widget;
+               DI::page()['aside'] .= Widget\VCard::getHTML($owner);
 
                if (!empty($photo_albums_widget)) {
                        DI::page()['aside'] .= $photo_albums_widget;
@@ -156,13 +138,18 @@ function photos_init(App $a) {
 
 function photos_post(App $a)
 {
+       $user = User::getByNickname(DI::args()->getArgv()[1]);
+       if (!DBA::isResult($user)) {
+               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+       }
+
        $phototypes = Images::supportedTypes();
 
        $can_post  = false;
        $visitor   = 0;
 
-       $page_owner_uid = intval($a->data['user']['uid']);
-       $community_page = $a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
+       $page_owner_uid = intval($user['uid']);
+       $community_page = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
 
        if (local_user() && (local_user() == $page_owner_uid)) {
                $can_post = true;
@@ -202,11 +189,11 @@ function photos_post(App $a)
                $str_contact_allow .= $aclFormatter->toString(Contact::getPublicIdByUserId($page_owner_uid));
        }
 
-       if ($a->argc > 3 && $a->argv[2] === 'album') {
-               if (!Strings::isHex($a->argv[3])) {
-                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
+       if (DI::args()->getArgc() > 3 && DI::args()->getArgv()[2] === 'album') {
+               if (!Strings::isHex(DI::args()->getArgv()[3])) {
+                       DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
                }
-               $album = hex2bin($a->argv[3]);
+               $album = hex2bin(DI::args()->getArgv()[3]);
 
                if ($album === DI::l10n()->t('Profile Photos') || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) {
                        DI::baseUrl()->redirect($_SESSION['photo_return']);
@@ -220,13 +207,13 @@ function photos_post(App $a)
 
                if (!DBA::isResult($r)) {
                        notice(DI::l10n()->t('Album not found.'));
-                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
+                       DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
                        return; // NOTREACHED
                }
 
                // Check if the user has responded to a delete confirmation query
                if (!empty($_REQUEST['canceled'])) {
-                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album/' . $a->argv[3]);
+                       DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album/' . DI::args()->getArgv()[3]);
                }
 
                // RENAME photo album
@@ -240,7 +227,7 @@ function photos_post(App $a)
                        // Update the photo albums cache
                        Photo::clearAlbumCache($page_owner_uid);
 
-                       DI::baseUrl()->redirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
+                       DI::baseUrl()->redirect('photos/' . $a->getLoggedInUserNickname() . '/album/' . bin2hex($newalbum));
                        return; // NOTREACHED
                }
 
@@ -283,22 +270,22 @@ function photos_post(App $a)
                        }
                }
 
-               DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
+               DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
        }
 
-       if ($a->argc > 3 && $a->argv[2] === 'image') {
+       if (DI::args()->getArgc() > 3 && DI::args()->getArgv()[2] === 'image') {
                // Check if the user has responded to a delete confirmation query for a single photo
                if (!empty($_POST['canceled'])) {
-                       DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+                       DI::baseUrl()->redirect('photos/' . DI::args()->getArgv()[1] . '/image/' . DI::args()->getArgv()[3]);
                }
 
                if (!empty($_POST['delete'])) {
                        // same as above but remove single photo
                        if ($visitor) {
-                               $condition = ['contact-id' => $visitor, 'uid' => $page_owner_uid, 'resource-id' => $a->argv[3]];
+                               $condition = ['contact-id' => $visitor, 'uid' => $page_owner_uid, 'resource-id' => DI::args()->getArgv()[3]];
 
                        } else {
-                               $condition = ['uid' => local_user(), 'resource-id' => $a->argv[3]];
+                               $condition = ['uid' => local_user(), 'resource-id' => DI::args()->getArgv()[3]];
                        }
 
                        $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
@@ -312,22 +299,22 @@ function photos_post(App $a)
                                Photo::clearAlbumCache($page_owner_uid);
                        } else {
                                notice(DI::l10n()->t('Failed to delete the photo.'));
-                               DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+                               DI::baseUrl()->redirect('photos/' . DI::args()->getArgv()[1] . '/image/' . DI::args()->getArgv()[3]);
                        }
 
-                       DI::baseUrl()->redirect('photos/' . $a->argv[1]);
+                       DI::baseUrl()->redirect('photos/' . DI::args()->getArgv()[1]);
                        return; // NOTREACHED
                }
        }
 
-       if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
+       if (DI::args()->getArgc() > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
                $desc        = !empty($_POST['desc'])      ? Strings::escapeTags(trim($_POST['desc']))      : '';
                $rawtags     = !empty($_POST['newtag'])    ? Strings::escapeTags(trim($_POST['newtag']))    : '';
                $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])                      : 0;
                $albname     = !empty($_POST['albname'])   ? trim($_POST['albname'])                        : '';
                $origaname   = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
 
-               $resource_id = $a->argv[3];
+               $resource_id = DI::args()->getArgv()[3];
 
                if (!strlen($albname)) {
                        $albname = DateTimeFormat::localNow('Y');
@@ -420,7 +407,7 @@ function photos_post(App $a)
                        $arr['visible']       = $visibility;
                        $arr['origin']        = 1;
 
-                       $arr['body']          = '[url=' . DI::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
+                       $arr['body']          = '[url=' . DI::baseUrl() . '/photos/' . $user['nickname'] . '/image/' . $photo['resource-id'] . ']'
                                                . '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
                                                . '[/url]';
 
@@ -428,7 +415,7 @@ function photos_post(App $a)
                }
 
                if ($item_id) {
-                       $item = Post::selectFirst(['tag', 'inform', 'uri-id'], ['id' => $item_id, 'uid' => $page_owner_uid]);
+                       $item = Post::selectFirst(['inform', 'uri-id'], ['id' => $item_id, 'uid' => $page_owner_uid]);
 
                        if (DBA::isResult($item)) {
                                $old_inform = $item['inform'];
@@ -524,7 +511,7 @@ function photos_post(App $a)
 
                                                        if (!empty($item['uri-id'])) {
                                                                Tag::store($item['uri-id'], Tag::MENTION, $newname, $profile);
-                                                       }       
+                                                       }
                                                }
                                        } elseif (strpos($tag, '#') === 0) {
                                                $tagname = substr($tag, 1);
@@ -832,33 +819,40 @@ function photos_content(App $a)
        // photos/name/image/xxxxx/edit
        // photos/name/image/xxxxx/drop
 
+       $user = User::getByNickname(DI::args()->getArgv()[1]);
+       if (!DBA::isResult($user)) {
+               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+       }
+
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                notice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
-       if (empty($a->data['user'])) {
+       if (empty($user)) {
                notice(DI::l10n()->t('No photos selected'));
                return;
        }
 
+       $profile = Profile::getByUID($user['uid']);
+
        $phototypes = Images::supportedTypes();
 
        $_SESSION['photo_return'] = DI::args()->getCommand();
 
        // Parse arguments
        $datum = null;
-       if ($a->argc > 3) {
-               $datatype = $a->argv[2];
-               $datum = $a->argv[3];
-       } elseif (($a->argc > 2) && ($a->argv[2] === 'upload')) {
+       if (DI::args()->getArgc() > 3) {
+               $datatype = DI::args()->getArgv()[2];
+               $datum = DI::args()->getArgv()[3];
+       } elseif ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[2] === 'upload')) {
                $datatype = 'upload';
        } else {
                $datatype = 'summary';
        }
 
-       if ($a->argc > 4) {
-               $cmd = $a->argv[4];
+       if (DI::args()->getArgc() > 4) {
+               $cmd = DI::args()->getArgv()[4];
        } else {
                $cmd = 'view';
        }
@@ -872,9 +866,9 @@ function photos_content(App $a)
        $edit           = '';
        $drop           = '';
 
-       $owner_uid = $a->data['user']['uid'];
+       $owner_uid = $user['uid'];
 
-       $community_page = (($a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
+       $community_page = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
        if (local_user() && (local_user() == $owner_uid)) {
                $can_post = true;
@@ -900,10 +894,11 @@ function photos_content(App $a)
 
        if (!$remote_contact && local_user()) {
                $contact_id = $_SESSION['cid'];
-               $contact = $a->contact;
+
+               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $owner_uid, 'blocked' => false, 'pending' => false]);
        }
 
-       if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
+       if ($user['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
                notice(DI::l10n()->t('Access to this item is restricted.'));
                return;
        }
@@ -914,7 +909,7 @@ function photos_content(App $a)
 
        // tabs
        $is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= BaseProfile::getTabsHTML($a, 'photos', $is_owner, $a->data['user']['nickname']);
+       $o .= BaseProfile::getTabsHTML($a, 'photos', $is_owner, $user['nickname'], $profile['hide-friends']);
 
        // Display upload form
        if ($datatype === 'upload') {
@@ -928,8 +923,9 @@ function photos_content(App $a)
                $albumselect = '';
 
                $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&lt;current year&gt;</option>';
-               if (!empty($a->data['albums'])) {
-                       foreach ($a->data['albums'] as $album) {
+               $albums = Photo::getAlbums($owner_uid);
+               if (!empty($albums)) {
+                       foreach ($albums as $album) {
                                if (($album['album'] === '') || ($album['album'] === Photo::CONTACT_PHOTOS) || ($album['album'] === DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
                                        continue;
                                }
@@ -940,7 +936,7 @@ function photos_content(App $a)
 
                $uploader = '';
 
-               $ret = ['post_url' => 'photos/' . $a->data['user']['nickname'],
+               $ret = ['post_url' => 'photos/' . $user['nickname'],
                                'addon_text' => $uploader,
                                'default_upload' => true];
 
@@ -955,25 +951,20 @@ function photos_content(App $a)
 
                $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
 
-               $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->user));
+               $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()));
 
                $o .= Renderer::replaceMacros($tpl,[
                        '$pagename' => DI::l10n()->t('Upload Photos'),
                        '$sessid' => session_id(),
                        '$usage' => $usage_message,
-                       '$nickname' => $a->data['user']['nickname'],
+                       '$nickname' => $user['nickname'],
                        '$newalbum' => DI::l10n()->t('New album name: '),
                        '$existalbumtext' => DI::l10n()->t('or select existing album:'),
                        '$nosharetext' => DI::l10n()->t('Do not show a status post for this upload'),
                        '$albumselect' => $albumselect,
                        '$permissions' => DI::l10n()->t('Permissions'),
                        '$aclselect' => $aclselect_e,
-                       '$lockstate' => is_array($a->user)
-                                       && (strlen($a->user['allow_cid'])
-                                               || strlen($a->user['allow_gid'])
-                                               || strlen($a->user['deny_cid'])
-                                               || strlen($a->user['deny_gid'])
-                                       ) ? 'lock' : 'unlock',
+                       '$lockstate' => ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock',
                        '$alt_uploader' => $ret['addon_text'],
                        '$default_upload_box' => ($ret['default_upload'] ? $default_upload_box : ''),
                        '$default_upload_submit' => ($ret['default_upload'] ? $default_upload_submit : ''),
@@ -990,7 +981,7 @@ function photos_content(App $a)
        if ($datatype === 'album') {
                // if $datum is not a valid hex, redirect to the default page
                if (!Strings::isHex($datum)) {
-                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname']. '/album');
+                       DI::baseUrl()->redirect('photos/' . $user['nickname']. '/album');
                }
                $album = hex2bin($datum);
 
@@ -1034,6 +1025,7 @@ function photos_content(App $a)
                                '$confirm' => DI::l10n()->t('Delete Album'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'dropalbum',
+                               '$confirm_value' => 'dropalbum',
                                '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
@@ -1048,7 +1040,7 @@ function photos_content(App $a)
 
                                        $o .= Renderer::replaceMacros($edit_tpl,[
                                                '$nametext' => DI::l10n()->t('New album name: '),
-                                               '$nickname' => $a->data['user']['nickname'],
+                                               '$nickname' => $user['nickname'],
                                                '$album' => $album_e,
                                                '$hexalbum' => bin2hex($album),
                                                '$submit' => DI::l10n()->t('Submit'),
@@ -1058,15 +1050,15 @@ function photos_content(App $a)
                        }
                } else {
                        if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) {
-                               $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
-                               $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/drop'];
+                               $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit'];
+                               $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop'];
                        }
                }
 
                if ($order_field === 'posted') {
-                       $order =  [DI::l10n()->t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
+                       $order =  [DI::l10n()->t('Show Newest First'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album), 'oldest'];
                } else {
-                       $order = [DI::l10n()->t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?order=posted', 'newest'];
+                       $order = [DI::l10n()->t('Show Oldest First'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '?order=posted', 'newest'];
                }
 
                $photos = [];
@@ -1085,7 +1077,7 @@ function photos_content(App $a)
                                $photos[] = [
                                        'id' => $rr['id'],
                                        'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-                                       'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
+                                       'link' => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id']
                                                . ($order_field === 'posted' ? '?order=posted' : ''),
                                        'title' => DI::l10n()->t('View Photo'),
                                        'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
@@ -1102,7 +1094,7 @@ function photos_content(App $a)
                        '$photos' => $photos,
                        '$album' => $album,
                        '$can_post' => $can_post,
-                       '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+                       '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $user['nickname'] . '/upload/' . bin2hex($album)],
                        '$order' => $order,
                        '$edit' => $edit,
                        '$drop' => $drop,
@@ -1140,6 +1132,7 @@ function photos_content(App $a)
                                '$confirm' => DI::l10n()->t('Delete Photo'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'delete',
+                               '$confirm_value' => 'delete',
                                '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
@@ -1185,10 +1178,10 @@ function photos_content(App $a)
                                }
 
                                if (!is_null($prv)) {
-                                       $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . ($order_field === 'posted' ? '?order=posted' : '');
+                                       $prevlink = 'photos/' . $user['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . ($order_field === 'posted' ? '?order=posted' : '');
                                }
                                if (!is_null($nxt)) {
-                                       $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . ($order_field === 'posted' ? '?order=posted' : '');
+                                       $nextlink = 'photos/' . $user['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . ($order_field === 'posted' ? '?order=posted' : '');
                                }
 
                                $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
@@ -1221,17 +1214,17 @@ function photos_content(App $a)
                        }
                }
 
-               $album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+               $album_link = 'photos/' . $user['nickname'] . '/album/' . bin2hex($ph[0]['album']);
 
                $tools = null;
 
                if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
                        $tools = [];
                        if ($cmd === 'edit') {
-                               $tools['view'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum, DI::l10n()->t('View photo')];
+                               $tools['view'] = ['photos/' . $user['nickname'] . '/image/' . $datum, DI::l10n()->t('View photo')];
                        } else {
-                               $tools['edit'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', DI::l10n()->t('Edit photo')];
-                               $tools['delete'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/drop', DI::l10n()->t('Delete photo')];
+                               $tools['edit'] = ['photos/' . $user['nickname'] . '/image/' . $datum . '/edit', DI::l10n()->t('Edit photo')];
+                               $tools['delete'] = ['photos/' . $user['nickname'] . '/image/' . $datum . '/drop', DI::l10n()->t('Delete photo')];
                                $tools['profile'] = ['settings/profile/photo/crop/' . $ph[0]['resource-id'], DI::l10n()->t('Use as profile photo')];
                        }
 
@@ -1319,7 +1312,7 @@ function photos_content(App $a)
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
-                       $aclselect_e = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($ph[0]));
+                       $aclselect_e = ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), false, ACL::getDefaultUserPermissions($ph[0]));
 
                        $edit = Renderer::replaceMacros($edit_tpl, [
                                '$id' => $ph[0]['id'],
@@ -1330,7 +1323,7 @@ function photos_content(App $a)
                                '$rotate_cw' => ['rotate', DI::l10n()->t("Rotate CW \x28right\x29"),1,''],
                                '$rotate_ccw' => ['rotate', DI::l10n()->t("Rotate CCW \x28left\x29"),2,''],
 
-                               '$nickname' => $a->data['user']['nickname'],
+                               '$nickname' => $user['nickname'],
                                '$resource_id' => $ph[0]['resource-id'],
                                '$permissions' => DI::l10n()->t('Permissions'),
                                '$aclselect' => $aclselect_e,
@@ -1380,7 +1373,6 @@ function photos_content(App $a)
                                                '$submit' => DI::l10n()->t('Submit'),
                                                '$preview' => DI::l10n()->t('Preview'),
                                                '$loading' => DI::l10n()->t('Loading...'),
-                                               '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                '$qcomment' => $qcomment,
                                                '$rand_num' => Crypto::randomDigits(12)
                                        ]);
@@ -1402,15 +1394,15 @@ function photos_content(App $a)
                        // display comments
                        if (DBA::isResult($items)) {
                                foreach ($items as $item) {
-                                       builtin_activity_puller($item, $conv_responses);
+                                       DI::conversation()->builtinActivityPuller($item, $conv_responses);
                                }
 
                                if (!empty($conv_responses['like'][$link_item['uri']])) {
-                                       $like = format_activity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id']);
+                                       $like = DI::conversation()->formatActivity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id']);
                                }
 
                                if (!empty($conv_responses['dislike'][$link_item['uri']])) {
-                                       $dislike = format_activity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id']);
+                                       $dislike = DI::conversation()->formatActivity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id']);
                                }
 
                                if (($can_post || Security::canWriteToUserWall($owner_uid))) {
@@ -1436,7 +1428,6 @@ function photos_content(App $a)
                                                '$comment' => DI::l10n()->t('Comment'),
                                                '$submit' => DI::l10n()->t('Submit'),
                                                '$preview' => DI::l10n()->t('Preview'),
-                                               '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                '$qcomment' => $qcomment,
                                                '$rand_num' => Crypto::randomDigits(12)
                                        ]);
@@ -1511,7 +1502,6 @@ function photos_content(App $a)
                                                        '$comment' => DI::l10n()->t('Comment'),
                                                        '$submit' => DI::l10n()->t('Submit'),
                                                        '$preview' => DI::l10n()->t('Preview'),
-                                                       '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                        '$qcomment' => $qcomment,
                                                        '$rand_num' => Crypto::randomDigits(12)
                                                ]);
@@ -1578,7 +1568,7 @@ function photos_content(App $a)
        $total = 0;
        $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
                $sql_extra GROUP BY `resource-id`",
-               intval($a->data['user']['uid']),
+               intval($user['uid']),
                DBA::escape(Photo::CONTACT_PHOTOS),
                DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS))
        );
@@ -1593,7 +1583,7 @@ function photos_content(App $a)
                ANY_VALUE(`created`) AS `created` FROM `photo`
                WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
-               intval($a->data['user']['uid']),
+               intval($user['uid']),
                DBA::escape(Photo::CONTACT_PHOTOS),
                DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS)),
                $pager->getStart(),
@@ -1619,12 +1609,12 @@ function photos_content(App $a)
                        $photos[] = [
                                'id'    => $rr['id'],
                                'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-                               'link'  => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+                               'link'  => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id'],
                                'title' => DI::l10n()->t('View Photo'),
                                'src'   => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
                                'alt'   => $alt_e,
                                'album' => [
-                                       'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+                                       'link' => 'photos/' . $user['nickname'] . '/album/' . bin2hex($rr['album']),
                                        'name' => $name_e,
                                        'alt'  => DI::l10n()->t('View Album'),
                                ],
@@ -1637,7 +1627,7 @@ function photos_content(App $a)
        $o .= Renderer::replaceMacros($tpl, [
                '$title' => DI::l10n()->t('Recent Photos'),
                '$can_post' => $can_post,
-               '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
+               '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $user['nickname'] . '/upload'],
                '$photos' => $photos,
                '$paginate' => $pager->renderFull($total),
        ]);