]> git.mxchange.org Git - friendica.git/blobdiff - mod/photos.php
Move Notify::TYPE_MAIL
[friendica.git] / mod / photos.php
index e763704c4062424a5f8f17244bbd9004d25d646a..0733bbc96001f5e1fe0d98afd04241a5d166145f 100644 (file)
@@ -9,9 +9,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -23,6 +21,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Module\BaseProfile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
@@ -37,7 +36,7 @@ use Friendica\Util\XML;
 
 function photos_init(App $a) {
 
-       if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+       if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                return;
        }
 
@@ -86,7 +85,7 @@ 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'] == L10n::t('Profile Photos')))
+                               if (!$is_owner && !Session::getRemoteContactID($a->profile_uid) && ($album['album'] == DI::l10n()->t('Profile Photos')))
                                        continue;
                                $entry = [
                                        'text'      => $album['album'],
@@ -108,10 +107,10 @@ function photos_init(App $a) {
                if ($ret['success']) {
                        $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
                                '$nick'     => $a->data['user']['nickname'],
-                               '$title'    => L10n::t('Photo Albums'),
-                               '$recent'   => L10n::t('Recent Photos'),
+                               '$title'    => DI::l10n()->t('Photo Albums'),
+                               '$recent'   => DI::l10n()->t('Recent Photos'),
                                '$albums'   => $ret['albums'],
-                               '$upload'   => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
+                               '$upload'   => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
                                '$can_post' => $can_post
                        ]);
                }
@@ -129,7 +128,7 @@ function photos_init(App $a) {
                $tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
                DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
-                       '$ispublic' => L10n::t('everybody')
+                       '$ispublic' => DI::l10n()->t('everybody')
                ]);
        }
 
@@ -159,14 +158,14 @@ function photos_post(App $a)
        }
 
        if (!$can_post) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.') . EOL);
                exit();
        }
 
        $owner_record = User::getOwnerDataById($page_owner_uid);
 
        if (!$owner_record) {
-               notice(L10n::t('Contact information unavailable') . EOL);
+               notice(DI::l10n()->t('Contact information unavailable') . EOL);
                Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
                exit();
        }
@@ -177,7 +176,7 @@ function photos_post(App $a)
                }
                $album = hex2bin($a->argv[3]);
 
-               if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
+               if ($album === DI::l10n()->t('Profile Photos') || $album === 'Contact Photos' || $album === DI::l10n()->t('Contact Photos')) {
                        DI::baseUrl()->redirect($_SESSION['photo_return']);
                        return; // NOTREACHED
                }
@@ -188,7 +187,7 @@ function photos_post(App $a)
                );
 
                if (!DBA::isResult($r)) {
-                       notice(L10n::t('Album not found.') . EOL);
+                       notice(DI::l10n()->t('Album not found.') . EOL);
                        DI::baseUrl()->redirect($_SESSION['photo_return']);
                        return; // NOTREACHED
                }
@@ -246,9 +245,9 @@ function photos_post(App $a)
 
                                // Update the photo albums cache
                                Photo::clearAlbumCache($page_owner_uid);
-                               notice(L10n::t('Album successfully deleted'));
+                               notice(DI::l10n()->t('Album successfully deleted'));
                        } else {
-                               notice(L10n::t('Album was empty.'));
+                               notice(DI::l10n()->t('Album was empty.'));
                        }
                }
 
@@ -573,7 +572,7 @@ function photos_post(App $a)
                                        $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
                                        $arr['origin']        = 1;
-                                       $arr['body']          = 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'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+                                       $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]') ;
                                        $arr['body'] .= "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . DI::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
 
                                        $arr['object'] = '<object><type>' . Activity\ObjectType::PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
@@ -623,7 +622,7 @@ function photos_post(App $a)
 
        $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]);
 
-       if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) {
+       if (!DBA::isResult($r) || ($album == DI::l10n()->t('Profile Photos'))) {
                $visible = 1;
        } else {
                $visible = 0;
@@ -668,21 +667,21 @@ function photos_post(App $a)
        if ($error !== UPLOAD_ERR_OK) {
                switch ($error) {
                        case UPLOAD_ERR_INI_SIZE:
-                               notice(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')) . EOL);
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(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)) . EOL);
                                break;
                        case UPLOAD_ERR_PARTIAL:
-                               notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
+                               notice(DI::l10n()->t('Image upload didn\'t complete, please try again') . EOL);
                                break;
                        case UPLOAD_ERR_NO_FILE:
-                               notice(L10n::t('Image file is missing') . EOL);
+                               notice(DI::l10n()->t('Image file is missing') . EOL);
                                break;
                        case UPLOAD_ERR_NO_TMP_DIR:
                        case UPLOAD_ERR_CANT_WRITE:
                        case UPLOAD_ERR_EXTENSION:
-                               notice(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') . EOL);
                                break;
                }
                @unlink($src);
@@ -697,10 +696,10 @@ function photos_post(App $a)
 
        Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
 
-       $maximagesize = Config::get('system', 'maximagesize');
+       $maximagesize = DI::config()->get('system', 'maximagesize');
 
        if ($maximagesize && ($filesize > $maximagesize)) {
-               notice(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)) . EOL);
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -708,7 +707,7 @@ function photos_post(App $a)
        }
 
        if (!$filesize) {
-               notice(L10n::t('Image file is empty.') . EOL);
+               notice(DI::l10n()->t('Image file is empty.') . EOL);
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -723,7 +722,7 @@ function photos_post(App $a)
 
        if (!$image->isValid()) {
                Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
-               notice(L10n::t('Unable to process image.') . EOL);
+               notice(DI::l10n()->t('Unable to process image.') . EOL);
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end',$foo);
@@ -733,7 +732,7 @@ function photos_post(App $a)
        $exif = $image->orient($src);
        @unlink($src);
 
-       $max_length = Config::get('system', 'max_image_length');
+       $max_length = DI::config()->get('system', 'max_image_length');
        if (!$max_length) {
                $max_length = MAX_IMAGE_LENGTH;
        }
@@ -752,7 +751,7 @@ function photos_post(App $a)
 
        if (!$r) {
                Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
-               notice(L10n::t('Image upload failed.') . EOL);
+               notice(DI::l10n()->t('Image upload failed.') . EOL);
                return;
        }
 
@@ -814,7 +813,7 @@ function photos_post(App $a)
 
        Hook::callAll('photo_post_end', $item_id);
 
-       // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+       // addon uploaders should call "exit()" within the photo_post_end hook
        // if they do not wish to be redirected
 
        DI::baseUrl()->redirect($_SESSION['photo_return']);
@@ -834,13 +833,13 @@ function photos_content(App $a)
        // photos/name/image/xxxxx/edit
        // photos/name/image/xxxxx/drop
 
-       if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-               notice(L10n::t('Public access denied.') . EOL);
+       if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+               notice(DI::l10n()->t('Public access denied.') . EOL);
                return;
        }
 
        if (empty($a->data['user'])) {
-               notice(L10n::t('No photos selected') . EOL);
+               notice(DI::l10n()->t('No photos selected') . EOL);
                return;
        }
 
@@ -906,7 +905,7 @@ function photos_content(App $a)
        }
 
        if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-               notice(L10n::t('Access to this item is restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
                return;
        }
 
@@ -916,12 +915,12 @@ function photos_content(App $a)
 
        // tabs
        $is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= Profile::getTabs($a, 'photos', $is_owner, $a->data['user']['nickname']);
+       $o .= BaseProfile::getTabsHTML($a, 'photos', $is_owner, $a->data['user']['nickname']);
 
        // Display upload form
        if ($datatype === 'upload') {
                if (!$can_post) {
-                       notice(L10n::t('Permission denied.'));
+                       notice(DI::l10n()->t('Permission denied.'));
                        return;
                }
 
@@ -932,7 +931,7 @@ function photos_content(App $a)
                $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&lt;current year&gt;</option>';
                if (!empty($a->data['albums'])) {
                        foreach ($a->data['albums'] as $album) {
-                               if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
+                               if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === DI::l10n()->t('Contact Photos'))) {
                                        continue;
                                }
                                $selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
@@ -950,7 +949,7 @@ function photos_content(App $a)
 
                $default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
                $default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
-                       '$submit' => L10n::t('Submit'),
+                       '$submit' => DI::l10n()->t('Submit'),
                ]);
 
                $usage_message = '';
@@ -960,15 +959,15 @@ function photos_content(App $a)
                $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->user));
 
                $o .= Renderer::replaceMacros($tpl,[
-                       '$pagename' => L10n::t('Upload Photos'),
+                       '$pagename' => DI::l10n()->t('Upload Photos'),
                        '$sessid' => session_id(),
                        '$usage' => $usage_message,
                        '$nickname' => $a->data['user']['nickname'],
-                       '$newalbum' => L10n::t('New album name: '),
-                       '$existalbumtext' => L10n::t('or select existing album:'),
-                       '$nosharetext' => L10n::t('Do not show a status post for this upload'),
+                       '$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' => L10n::t('Permissions'),
+                       '$permissions' => DI::l10n()->t('Permissions'),
                        '$aclselect' => $aclselect_e,
                        '$lockstate' => is_array($a->user)
                                        && (strlen($a->user['allow_cid'])
@@ -982,8 +981,8 @@ function photos_content(App $a)
                        '$uploadurl' => $ret['post_url'],
 
                        // ACL permissions box
-                       '$group_perms' => L10n::t('Show to Groups'),
-                       '$contact_perms' => L10n::t('Show to Contacts'),
+                       '$group_perms' => DI::l10n()->t('Show to Groups'),
+                       '$contact_perms' => DI::l10n()->t('Show to Contacts'),
                        '$return_path' => DI::args()->getQueryString(),
                ]);
 
@@ -1034,44 +1033,44 @@ function photos_content(App $a)
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
-                               '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
+                               '$message' => DI::l10n()->t('Do you really want to delete this photo album and all its photos?'),
                                '$extra_inputs' => [],
-                               '$confirm' => L10n::t('Delete Album'),
+                               '$confirm' => DI::l10n()->t('Delete Album'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'dropalbum',
-                               '$cancel' => L10n::t('Cancel'),
+                               '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
 
                // edit album name
                if ($cmd === 'edit') {
-                       if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
+                       if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== DI::l10n()->t('Contact Photos'))) {
                                if ($can_post) {
                                        $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
 
                                        $album_e = $album;
 
                                        $o .= Renderer::replaceMacros($edit_tpl,[
-                                               '$nametext' => L10n::t('New album name: '),
+                                               '$nametext' => DI::l10n()->t('New album name: '),
                                                '$nickname' => $a->data['user']['nickname'],
                                                '$album' => $album_e,
                                                '$hexalbum' => bin2hex($album),
-                                               '$submit' => L10n::t('Submit'),
-                                               '$dropsubmit' => L10n::t('Delete Album')
+                                               '$submit' => DI::l10n()->t('Submit'),
+                                               '$dropsubmit' => DI::l10n()->t('Delete Album')
                                        ]);
                                }
                        }
                } else {
-                       if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos')) && $can_post) {
-                               $edit = [L10n::t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
-                               $drop = [L10n::t('Drop Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/drop'];
+                       if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== DI::l10n()->t('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'];
                        }
                }
 
                if ($order_field === 'posted') {
-                       $order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
+                       $order =  [DI::l10n()->t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
                } else {
-                       $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted', 'newest'];
+                       $order = [DI::l10n()->t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?order=posted', 'newest'];
                }
 
                $photos = [];
@@ -1091,8 +1090,8 @@ function photos_content(App $a)
                                        'id' => $rr['id'],
                                        'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
                                        'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
-                                               . ($order_field === 'posted' ? '?f=&order=posted' : ''),
-                                       'title' => L10n::t('View Photo'),
+                                               . ($order_field === 'posted' ? '?order=posted' : ''),
+                                       'title' => DI::l10n()->t('View Photo'),
                                        'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
                                        'alt' => $imgalt_e,
                                        'desc'=> $desc_e,
@@ -1107,7 +1106,7 @@ function photos_content(App $a)
                        '$photos' => $photos,
                        '$album' => $album,
                        '$can_post' => $can_post,
-                       '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+                       '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
                        '$order' => $order,
                        '$edit' => $edit,
                        '$drop' => $drop,
@@ -1129,9 +1128,9 @@ function photos_content(App $a)
 
                if (!DBA::isResult($ph)) {
                        if (DBA::exists('photo', ['resource-id' => $datum, 'uid' => $owner_uid])) {
-                               notice(L10n::t('Permission denied. Access to this item may be restricted.'));
+                               notice(DI::l10n()->t('Permission denied. Access to this item may be restricted.'));
                        } else {
-                               notice(L10n::t('Photo not available') . EOL);
+                               notice(DI::l10n()->t('Photo not available') . EOL);
                        }
                        return;
                }
@@ -1141,12 +1140,12 @@ function photos_content(App $a)
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
-                               '$message' => L10n::t('Do you really want to delete this photo?'),
+                               '$message' => DI::l10n()->t('Do you really want to delete this photo?'),
                                '$extra_inputs' => [],
-                               '$confirm' => L10n::t('Delete Photo'),
+                               '$confirm' => DI::l10n()->t('Delete Photo'),
                                '$confirm_url' => $drop_url,
                                '$confirm_name' => 'delete',
-                               '$cancel' => L10n::t('Cancel'),
+                               '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
 
@@ -1158,7 +1157,7 @@ function photos_content(App $a)
                 * The query leads to a really intense used index.
                 * By now we hide it if someone wants to.
                 */
-               if ($cmd === 'view' && !Config::get('system', 'no_count', false)) {
+               if ($cmd === 'view' && !DI::config()->get('system', 'no_count', false)) {
                        $order_field = $_GET['order'] ?? '';
 
                        if ($order_field === 'posted') {
@@ -1191,10 +1190,10 @@ function photos_content(App $a)
                                }
 
                                if (!is_null($prv)) {
-                                       $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . ($order_field === 'posted' ? '?f=&order=posted' : '');
+                                       $prevlink = 'photos/' . $a->data['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' ? '?f=&order=posted' : '');
+                                       $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . ($order_field === 'posted' ? '?order=posted' : '');
                                }
 
                                $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
@@ -1234,25 +1233,25 @@ function photos_content(App $a)
                if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
                        $tools = [];
                        if ($cmd === 'edit') {
-                               $tools['view'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum, L10n::t('View photo')];
+                               $tools['view'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum, DI::l10n()->t('View photo')];
                        } else {
-                               $tools['edit'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', L10n::t('Edit photo')];
-                               $tools['delete'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/drop', L10n::t('Delete photo')];
-                               $tools['profile'] = ['profile_photo/use/'.$ph[0]['resource-id'], L10n::t('Use as profile photo')];
+                               $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['profile'] = ['settings/profile/photo/crop/' . $ph[0]['resource-id'], DI::l10n()->t('Use as profile photo')];
                        }
 
                        if (
                                $ph[0]['uid'] == local_user()
                                && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid']))
                        ) {
-                               $tools['lock'] = L10n::t('Private Photo');
+                               $tools['lock'] = DI::l10n()->t('Private Photo');
                        }
                }
 
                $photo = [
                        'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
-                       'title'=> L10n::t('View Full Size'),
-                       'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . DateTimeFormat::utcNow('ymdhis'),
+                       'title'=> DI::l10n()->t('View Full Size'),
+                       'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?_u=' . DateTimeFormat::utcNow('ymdhis'),
                        'height' => $hires['height'],
                        'width' => $hires['width'],
                        'album' => $hires['album'],
@@ -1311,10 +1310,10 @@ function photos_content(App $a)
                                        'removeurl' => '/tagrm/' . $link_item['id'] . '/' . bin2hex($tag)
                                ];
                        }
-                       $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
+                       $tags = ['title' => DI::l10n()->t('Tags: '), 'tags' => $tag_arr];
                        if ($cmd === 'edit') {
                                $tags['removeanyurl'] = 'tagrm/' . $link_item['id'];
-                               $tags['removetitle'] = L10n::t('[Select tags to remove]');
+                               $tags['removetitle'] = DI::l10n()->t('[Select tags to remove]');
                        }
                }
 
@@ -1329,25 +1328,25 @@ function photos_content(App $a)
 
                        $edit = Renderer::replaceMacros($edit_tpl, [
                                '$id' => $ph[0]['id'],
-                               '$album' => ['albname', L10n::t('New album name'), $album_e,''],
-                               '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
-                               '$tags' => ['newtag', L10n::t('Add a Tag'), "", L10n::t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
-                               '$rotate_none' => ['rotate', L10n::t('Do not rotate'),0,'', true],
-                               '$rotate_cw' => ['rotate', L10n::t("Rotate CW \x28right\x29"),1,''],
-                               '$rotate_ccw' => ['rotate', L10n::t("Rotate CCW \x28left\x29"),2,''],
+                               '$album' => ['albname', DI::l10n()->t('New album name'), $album_e,''],
+                               '$caption' => ['desc', DI::l10n()->t('Caption'), $caption_e, ''],
+                               '$tags' => ['newtag', DI::l10n()->t('Add a Tag'), "", DI::l10n()->t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
+                               '$rotate_none' => ['rotate', DI::l10n()->t('Do not rotate'),0,'', true],
+                               '$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'],
                                '$resource_id' => $ph[0]['resource-id'],
-                               '$permissions' => L10n::t('Permissions'),
+                               '$permissions' => DI::l10n()->t('Permissions'),
                                '$aclselect' => $aclselect_e,
 
                                '$item_id' => $link_item['id'] ?? 0,
-                               '$submit' => L10n::t('Submit'),
-                               '$delete' => L10n::t('Delete Photo'),
+                               '$submit' => DI::l10n()->t('Submit'),
+                               '$delete' => DI::l10n()->t('Delete Photo'),
 
                                // ACL permissions box
-                               '$group_perms' => L10n::t('Show to Groups'),
-                               '$contact_perms' => L10n::t('Show to Contacts'),
+                               '$group_perms' => DI::l10n()->t('Show to Groups'),
+                               '$contact_perms' => DI::l10n()->t('Show to Contacts'),
                                '$return_path' => DI::args()->getQueryString(),
                        ]);
                }
@@ -1368,9 +1367,9 @@ function photos_content(App $a)
                                $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
                                $likebuttons = Renderer::replaceMacros($like_tpl, [
                                        '$id' => $link_item['id'],
-                                       '$likethis' => L10n::t("I like this \x28toggle\x29"),
-                                       '$nolike' => L10n::t("I don't like this \x28toggle\x29"),
-                                       '$wait' => L10n::t('Please wait'),
+                                       '$likethis' => DI::l10n()->t("I like this \x28toggle\x29"),
+                                       '$nolike' => DI::l10n()->t("I don't like this \x28toggle\x29"),
+                                       '$wait' => DI::l10n()->t('Please wait'),
                                        '$return_path' => DI::args()->getQueryString(),
                                ]);
                        }
@@ -1384,12 +1383,12 @@ function photos_content(App $a)
                                                '$parent' => $link_item['id'],
                                                '$profile_uid' =>  $owner_uid,
                                                '$mylink' => $contact['url'],
-                                               '$mytitle' => L10n::t('This is you'),
+                                               '$mytitle' => DI::l10n()->t('This is you'),
                                                '$myphoto' => $contact['thumb'],
-                                               '$comment' => L10n::t('Comment'),
-                                               '$submit' => L10n::t('Submit'),
-                                               '$preview' => L10n::t('Preview'),
-                                               '$sourceapp' => L10n::t($a->sourcename),
+                                               '$comment' => DI::l10n()->t('Comment'),
+                                               '$submit' => DI::l10n()->t('Submit'),
+                                               '$preview' => DI::l10n()->t('Preview'),
+                                               '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                '$ww' => '',
                                                '$rand_num' => Crypto::randomDigits(12)
                                        ]);
@@ -1397,8 +1396,8 @@ function photos_content(App $a)
                        }
 
                        $conv_responses = [
-                               'like' => ['title' => L10n::t('Likes','title')],'dislike' => ['title' => L10n::t('Dislikes','title')],
-                               'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')]
+                               'like' => ['title' => DI::l10n()->t('Likes','title')],'dislike' => ['title' => DI::l10n()->t('Dislikes','title')],
+                               'attendyes' => ['title' => DI::l10n()->t('Attending','title')], 'attendno' => ['title' => DI::l10n()->t('Not attending','title')], 'attendmaybe' => ['title' => DI::l10n()->t('Might attend','title')]
                        ];
 
                        // display comments
@@ -1423,12 +1422,12 @@ function photos_content(App $a)
                                                '$parent' => $link_item['id'],
                                                '$profile_uid' =>  $owner_uid,
                                                '$mylink' => $contact['url'],
-                                               '$mytitle' => L10n::t('This is you'),
+                                               '$mytitle' => DI::l10n()->t('This is you'),
                                                '$myphoto' => $contact['thumb'],
-                                               '$comment' => L10n::t('Comment'),
-                                               '$submit' => L10n::t('Submit'),
-                                               '$preview' => L10n::t('Preview'),
-                                               '$sourceapp' => L10n::t($a->sourcename),
+                                               '$comment' => DI::l10n()->t('Comment'),
+                                               '$submit' => DI::l10n()->t('Submit'),
+                                               '$preview' => DI::l10n()->t('Preview'),
+                                               '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                '$ww' => '',
                                                '$rand_num' => Crypto::randomDigits(12)
                                        ]);
@@ -1458,8 +1457,8 @@ function photos_content(App $a)
                                        $drop = [
                                                'dropping' => $dropping,
                                                'pagedrop' => false,
-                                               'select' => L10n::t('Select'),
-                                               'delete' => L10n::t('Delete'),
+                                               'select' => DI::l10n()->t('Select'),
+                                               'delete' => DI::l10n()->t('Delete'),
                                        ];
 
                                        $title_e = $item['title'];
@@ -1487,12 +1486,12 @@ function photos_content(App $a)
                                                        '$parent' => $item['parent'],
                                                        '$profile_uid' =>  $owner_uid,
                                                        '$mylink' => $contact['url'],
-                                                       '$mytitle' => L10n::t('This is you'),
+                                                       '$mytitle' => DI::l10n()->t('This is you'),
                                                        '$myphoto' => $contact['thumb'],
-                                                       '$comment' => L10n::t('Comment'),
-                                                       '$submit' => L10n::t('Submit'),
-                                                       '$preview' => L10n::t('Preview'),
-                                                       '$sourceapp' => L10n::t($a->sourcename),
+                                                       '$comment' => DI::l10n()->t('Comment'),
+                                                       '$submit' => DI::l10n()->t('Submit'),
+                                                       '$preview' => DI::l10n()->t('Preview'),
+                                                       '$sourceapp' => DI::l10n()->t($a->sourcename),
                                                        '$ww' => '',
                                                        '$rand_num' => Crypto::randomDigits(12)
                                                ]);
@@ -1518,7 +1517,7 @@ function photos_content(App $a)
                        '$tags' => $tags,
                        '$edit' => $edit,
                        '$map' => $map,
-                       '$map_text' => L10n::t('Map'),
+                       '$map_text' => DI::l10n()->t('Map'),
                        '$likebuttons' => $likebuttons,
                        '$like' => $like,
                        '$dislike' => $dislike,
@@ -1543,7 +1542,7 @@ function photos_content(App $a)
                $sql_extra GROUP BY `resource-id`",
                intval($a->data['user']['uid']),
                DBA::escape('Contact Photos'),
-               DBA::escape(L10n::t('Contact Photos'))
+               DBA::escape(DI::l10n()->t('Contact Photos'))
        );
        if (DBA::isResult($r)) {
                $total = count($r);
@@ -1558,7 +1557,7 @@ function photos_content(App $a)
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
                intval($a->data['user']['uid']),
                DBA::escape('Contact Photos'),
-               DBA::escape(L10n::t('Contact Photos')),
+               DBA::escape(DI::l10n()->t('Contact Photos')),
                $pager->getStart(),
                $pager->getItemsPerPage()
        );
@@ -1569,7 +1568,7 @@ function photos_content(App $a)
                $twist = false;
                foreach ($r as $rr) {
                        //hide profile photos to others
-                       if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == L10n::t('Profile Photos'))) {
+                       if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t('Profile Photos'))) {
                                continue;
                        }
 
@@ -1583,13 +1582,13 @@ function photos_content(App $a)
                                'id'    => $rr['id'],
                                'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
                                'link'  => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
-                               'title' => L10n::t('View Photo'),
+                               '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']),
                                        'name' => $name_e,
-                                       'alt'  => L10n::t('View Album'),
+                                       'alt'  => DI::l10n()->t('View Album'),
                                ],
 
                        ];
@@ -1598,9 +1597,9 @@ function photos_content(App $a)
 
        $tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
        $o .= Renderer::replaceMacros($tpl, [
-               '$title' => L10n::t('Recent Photos'),
+               '$title' => DI::l10n()->t('Recent Photos'),
                '$can_post' => $can_post,
-               '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
+               '$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
                '$photos' => $photos,
                '$paginate' => $pager->renderFull($total),
        ]);