<?php
/**
- * @file mod/photos.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
use Friendica\App;
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;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Photo;
+use Friendica\Model\Post;
use Friendica\Model\Profile;
+use Friendica\Model\Tag;
use Friendica\Model\User;
use Friendica\Module\BaseProfile;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
use Friendica\Util\Map;
-use Friendica\Util\Security;
+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) {
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, $a->profile_uid);
-
- $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,
- '$pdesc' => $profile['pdesc'] ?? '',
- ]);
-
- $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;
}
$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'])
];
}
}
- if (local_user() && $a->data['user']['uid'] == local_user()) {
+ if (local_user() && $owner['uid'] == local_user()) {
$can_post = true;
} else {
$can_post = false;
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
]);
}
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;
function photos_post(App $a)
{
- Logger::log('mod-photos: photos_post: begin' , Logger::DEBUG);
- Logger::log('mod_photos: REQUEST ' . print_r($_REQUEST, true), Logger::DATA);
- Logger::log('mod_photos: FILES ' . print_r($_FILES, true), Logger::DATA);
+ $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;
}
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);
- Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+ notice(DI::l10n()->t('Contact information unavailable'));
+ DI::logger()->info('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
exit();
}
- if ($a->argc > 3 && $a->argv[2] === 'album') {
- if (!Strings::isHex($a->argv[3])) {
- DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
+ $aclFormatter = DI::aclFormatter();
+ $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $owner_record['allow_cid'] ?? '';
+ $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $owner_record['allow_gid'] ?? '';
+ $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $owner_record['deny_cid'] ?? '';
+ $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $owner_record['deny_gid'] ?? '';
+
+ $visibility = $_REQUEST['visibility'] ?? '';
+ if ($visibility === 'public') {
+ // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
+ $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
+ } else if ($visibility === 'custom') {
+ // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
+ // case that would make it public. So we always append the author's contact id to the allowed contacts.
+ // See https://github.com/friendica/friendica/issues/9672
+ $str_contact_allow .= $aclFormatter->toString(Contact::getPublicIdByUserId($page_owner_uid));
+ }
+
+ 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 === 'Contact Photos' || $album === DI::l10n()->t('Contact Photos')) {
+ if ($album === DI::l10n()->t('Profile Photos') || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) {
DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED
}
);
if (!DBA::isResult($r)) {
- notice(DI::l10n()->t('Album not found.') . EOL);
- DI::baseUrl()->redirect($_SESSION['photo_return']);
+ notice(DI::l10n()->t('Album not found.'));
+ 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($_SESSION['photo_return']);
+ DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album/' . DI::args()->getArgv()[3]);
}
// RENAME photo album
// 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
}
}
}
- DI::baseUrl()->redirect('photos/' . $a->argv[1]);
+ 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);
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
- notice('Successfully deleted the photo.');
} else {
- notice('Failed to delete the photo.');
- DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+ notice(DI::l10n()->t('Failed to delete the photo.'));
+ 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']) ? Strings::escapeTags(trim($_POST['albname'])) : '';
+ $albname = !empty($_POST['albname']) ? trim($_POST['albname']) : '';
$origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
- $aclFormatter = DI::aclFormatter();
-
- $str_group_allow = !empty($_POST['group_allow']) ? $aclFormatter->toString($_POST['group_allow']) : '';
- $str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : '';
- $str_group_deny = !empty($_POST['group_deny']) ? $aclFormatter->toString($_POST['group_deny']) : '';
- $str_contact_deny = !empty($_POST['contact_deny']) ? $aclFormatter->toString($_POST['contact_deny']) : '';
-
- $resource_id = $a->argv[3];
+ $resource_id = DI::args()->getArgv()[3];
if (!strlen($albname)) {
$albname = DateTimeFormat::localNow('Y');
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
- $arr['parent-uri'] = $uri;
$arr['post-type'] = Item::PT_IMAGE;
$arr['wall'] = 1;
$arr['resource-id'] = $photo['resource-id'];
$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]';
}
if ($item_id) {
- $item = Item::selectFirst(['tag', 'inform'], ['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_tag = $item['tag'];
$old_inform = $item['inform'];
}
}
if (strlen($rawtags)) {
- $str_tags = '';
$inform = '';
// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
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, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'];
- }
-
- if (strlen($str_tags)) {
- $str_tags .= ',';
+ $taginfo[] = [$newname, $profile, $notify, null];
}
$profile = str_replace(',', '%2c', $profile);
- $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
+
+ if (!empty($item['uri-id'])) {
+ Tag::store($item['uri-id'], Tag::MENTION, $newname, $profile);
+ }
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
- $str_tags .= '#[url=' . DI::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
+ if (!empty($item['uri-id'])) {
+ Tag::store($item['uri-id'], Tag::HASHTAG, $tagname);
+ }
}
}
}
- $newtag = $old_tag ?? '';
- if (strlen($newtag) && strlen($str_tags)) {
- $newtag .= ',';
- }
- $newtag .= $str_tags;
-
$newinform = $old_inform ?? '';
if (strlen($newinform) && strlen($inform)) {
$newinform .= ',';
}
$newinform .= $inform;
- $fields = ['tag' => $newtag, 'inform' => $newinform, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+ $fields = ['inform' => $newinform, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
$condition = ['id' => $item_id];
Item::update($fields, $condition);
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
- $arr['parent-uri'] = $uri;
$arr['wall'] = 1;
$arr['contact-id'] = $owner_record['id'];
$arr['owner-name'] = $owner_record['name'];
$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]') ;
Hook::callAll('photo_post_init', $_POST);
// Determine the album to use
- $album = !empty($_REQUEST['album']) ? Strings::escapeTags(trim($_REQUEST['album'])) : '';
- $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
+ $album = trim($_REQUEST['album'] ?? '');
+ $newalbum = trim($_REQUEST['newalbum'] ?? '');
- Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
+ Logger::info('album= ' . $album . ' newalbum= ' . $newalbum);
if (!strlen($album)) {
if (strlen($newalbum)) {
$visible = 0;
}
- $group_allow = $_REQUEST['group_allow'] ?? [];
- $contact_allow = $_REQUEST['contact_allow'] ?? [];
- $group_deny = $_REQUEST['group_deny'] ?? [];
- $contact_deny = $_REQUEST['contact_deny'] ?? [];
-
- $aclFormatter = DI::aclFormatter();
-
- $str_group_allow = $aclFormatter->toString(is_array($group_allow) ? $group_allow : explode(',', $group_allow));
- $str_contact_allow = $aclFormatter->toString(is_array($contact_allow) ? $contact_allow : explode(',', $contact_allow));
- $str_group_deny = $aclFormatter->toString(is_array($group_deny) ? $group_deny : explode(',', $group_deny));
- $str_contact_deny = $aclFormatter->toString(is_array($contact_deny) ? $contact_deny : explode(',', $contact_deny));
-
$ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
Hook::callAll('photo_post_file', $ret);
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);
return;
}
- if ($type == "") {
- $type = Images::guessType($filename);
- }
+ $type = Images::getMimeTypeBySource($src, $filename, $type);
Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
$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);
}
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);
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);
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;
}
// 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']);
}
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
- $arr['parent-uri'] = $uri;
- $arr['type'] = 'photo';
+ $arr['post-type'] = Item::PT_IMAGE;
$arr['wall'] = 1;
$arr['resource-id'] = $resource_id;
$arr['contact-id'] = $owner_record['id'];
// 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.') . EOL);
+ notice(DI::l10n()->t('Public access denied.'));
return;
}
- if (empty($a->data['user'])) {
- notice(DI::l10n()->t('No photos selected') . EOL);
+ 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';
}
$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;
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) {
- notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
+ if ($user['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
+ notice(DI::l10n()->t('Access to this item is restricted.'));
return;
}
// 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') {
$albumselect = '';
$albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '><current year></option>';
- if (!empty($a->data['albums'])) {
- foreach ($a->data['albums'] as $album) {
- if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === DI::l10n()->t('Contact Photos'))) {
+ $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;
}
$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$uploader = '';
- $ret = ['post_url' => 'photos/' . $a->data['user']['nickname'],
+ $ret = ['post_url' => 'photos/' . $user['nickname'],
'addon_text' => $uploader,
'default_upload' => true];
$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 : ''),
'$uploadurl' => $ret['post_url'],
// ACL permissions box
- '$group_perms' => DI::l10n()->t('Show to Groups'),
- '$contact_perms' => DI::l10n()->t('Show to Contacts'),
'$return_path' => DI::args()->getQueryString(),
]);
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);
$total = count($r);
}
- $pager = new Pager(DI::args()->getQueryString(), 20);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
/// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
$order_field = $_GET['order'] ?? '';
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
'$message' => DI::l10n()->t('Do you really want to delete this photo album and all its photos?'),
- '$extra_inputs' => [],
'$confirm' => DI::l10n()->t('Delete Album'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum',
+ '$confirm_value' => 'dropalbum',
'$cancel' => DI::l10n()->t('Cancel'),
]);
}
// edit album name
if ($cmd === 'edit') {
- if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== DI::l10n()->t('Contact Photos'))) {
+ if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
if ($can_post) {
$edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
$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'),
}
}
} else {
- 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 (($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/' . $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 = [];
$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,
'$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,
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;
}
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
'$message' => DI::l10n()->t('Do you really want to delete this photo?'),
- '$extra_inputs' => [],
'$confirm' => DI::l10n()->t('Delete Photo'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'delete',
+ '$confirm_value' => 'delete',
'$cancel' => DI::l10n()->t('Cancel'),
]);
}
}
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');
}
}
- $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')];
}
// as a "post" but displaying instead the photo it is linked to
/// @todo Rewrite this query. To do so, $sql_extra must be changed
- $linked_items = q("SELECT `id` FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
+ $linked_items = q("SELECT `id` FROM `post-user-view` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
DBA::escape($datum)
);
if (DBA::isResult($linked_items)) {
// This is a workaround to not being forced to rewrite the while $sql_extra handling
- $link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
+ $link_item = Post::selectFirst([], ['id' => $linked_items[0]['id']]);
}
if (!empty($link_item['parent']) && !empty($link_item['uid'])) {
- $condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']];
- $total = DBA::count('item', $condition);
+ $condition = ["`parent` = ? AND `gravity` = ?", $link_item['parent'], GRAVITY_COMMENT];
+ $total = Post::count($condition);
- $pager = new Pager(DI::args()->getQueryString());
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
- $items = Item::inArray($result);
+ $items = Post::toArray(Post::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params));
if (local_user() == $link_item['uid']) {
Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
$tags = null;
- if (!empty($link_item['id']) && !empty($link_item['tag'])) {
- $arr = explode(',', $link_item['tag']);
+ if (!empty($link_item['id'])) {
+ $tag_text = Tag::getCSVByURIId($link_item['uri-id']);
+ $arr = explode(',', $tag_text);
// parse tags and add links
$tag_arr = [];
foreach ($arr as $tag) {
$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'],
'$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,
'$delete' => DI::l10n()->t('Delete Photo'),
// ACL permissions box
- '$group_perms' => DI::l10n()->t('Show to Groups'),
- '$contact_perms' => DI::l10n()->t('Show to Contacts'),
'$return_path' => DI::args()->getQueryString(),
]);
}
$likebuttons = '';
$comments = '';
$paginate = '';
- $responses = '';
if (!empty($link_item['id']) && !empty($link_item['uri'])) {
$cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
$tpl = Renderer::getMarkupTemplate('photo_item.tpl');
$return_path = DI::args()->getCommand();
- if ($cmd === 'view' && ($can_post || Security::canWriteToUserWall($owner_uid))) {
- $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
- $likebuttons = Renderer::replaceMacros($like_tpl, [
- '$id' => $link_item['id'],
- '$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(),
- ]);
- }
-
if (!DBA::isResult($items)) {
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+ /*
+ * Hmmm, code depending on the presence of a particular addon?
+ * This should be better if done by a hook
+ */
+ $qcomment = null;
+ if (Addon::isEnabled('qcomment')) {
+ $words = DI::pConfig()->get(local_user(), 'qcomment', 'words');
+ $qcomment = $words ? explode("\n", $words) : [];
+ }
+
$comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_path,
'$comment' => DI::l10n()->t('Comment'),
'$submit' => DI::l10n()->t('Submit'),
'$preview' => DI::l10n()->t('Preview'),
- '$sourceapp' => DI::l10n()->t($a->sourcename),
- '$ww' => '',
+ '$loading' => DI::l10n()->t('Loading...'),
+ '$qcomment' => $qcomment,
'$rand_num' => Crypto::randomDigits(12)
]);
}
}
$conv_responses = [
- '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')]
+ 'like' => [],
+ 'dislike' => [],
+ 'attendyes' => [],
+ 'attendno' => [],
+ 'attendmaybe' => []
];
+ if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
+ unset($conv_responses['dislike']);
+ }
+
// 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_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], '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_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], '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))) {
+ /*
+ * Hmmm, code depending on the presence of a particular addon?
+ * This should be better if done by a hook
+ */
+ $qcomment = null;
+ if (Addon::isEnabled('qcomment')) {
+ $words = DI::pConfig()->get(local_user(), 'qcomment', 'words');
+ $qcomment = $words ? explode("\n", $words) : [];
+ }
+
$comments .= Renderer::replaceMacros($cmnt_tpl,[
'$return_path' => '',
'$jsreload' => $return_path,
'$comment' => DI::l10n()->t('Comment'),
'$submit' => DI::l10n()->t('Submit'),
'$preview' => DI::l10n()->t('Preview'),
- '$sourceapp' => DI::l10n()->t($a->sourcename),
- '$ww' => '',
+ '$qcomment' => $qcomment,
'$rand_num' => Crypto::randomDigits(12)
]);
}
foreach ($items as $item) {
$comment = '';
$template = $tpl;
- $sparkle = '';
$activity = DI::activity();
if (($activity->match($item['verb'], Activity::LIKE) ||
$activity->match($item['verb'], Activity::DISLIKE)) &&
- ($item['id'] != $item['parent'])) {
+ ($item['gravity'] != GRAVITY_PARENT)) {
continue;
}
- $profile_url = Contact::magicLinkbyId($item['author-id']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_url = Contact::magicLinkByContact($author);
if (strpos($profile_url, 'redir/') === 0) {
$sparkle = ' sparkle';
} else {
]);
if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+ /*
+ * Hmmm, code depending on the presence of a particular addon?
+ * This should be better if done by a hook
+ */
+ $qcomment = null;
+ if (Addon::isEnabled('qcomment')) {
+ $words = DI::pConfig()->get(local_user(), 'qcomment', 'words');
+ $qcomment = $words ? explode("\n", $words) : [];
+ }
+
$comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_path,
'$comment' => DI::l10n()->t('Comment'),
'$submit' => DI::l10n()->t('Submit'),
'$preview' => DI::l10n()->t('Preview'),
- '$sourceapp' => DI::l10n()->t($a->sourcename),
- '$ww' => '',
+ '$qcomment' => $qcomment,
'$rand_num' => Crypto::randomDigits(12)
]);
}
}
}
- $response_verbs = ['like'];
- $response_verbs[] = 'dislike';
- $responses = get_responses($conv_responses, $response_verbs, $link_item);
+
+ $responses = [];
+ foreach ($conv_responses as $verb => $activity) {
+ if (isset($activity[$link_item['uri']])) {
+ $responses[$verb] = $activity[$link_item['uri']];
+ }
+ }
+
+ if ($cmd === 'view' && ($can_post || Security::canWriteToUserWall($owner_uid))) {
+ $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
+ $likebuttons = Renderer::replaceMacros($like_tpl, [
+ '$id' => $link_item['id'],
+ '$like' => DI::l10n()->t('Like'),
+ '$like_title' => DI::l10n()->t('I like this (toggle)'),
+ '$dislike' => DI::l10n()->t('Dislike'),
+ '$wait' => DI::l10n()->t('Please wait'),
+ '$dislike_title' => DI::l10n()->t('I don\'t like this (toggle)'),
+ '$hide_dislike' => DI::pConfig()->get(local_user(), 'system', 'hide_dislike'),
+ '$responses' => $responses,
+ '$return_path' => DI::args()->getQueryString(),
+ ]);
+ }
$paginate = $pager->renderFull($total);
}
'$likebuttons' => $likebuttons,
'$like' => $like,
'$dislike' => $dislike,
- 'responses' => $responses,
'$comments' => $comments,
'$paginate' => $paginate,
]);
$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']),
- DBA::escape('Contact Photos'),
- DBA::escape(DI::l10n()->t('Contact Photos'))
+ intval($user['uid']),
+ DBA::escape(Photo::CONTACT_PHOTOS),
+ DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS))
);
if (DBA::isResult($r)) {
$total = count($r);
}
- $pager = new Pager(DI::args()->getQueryString(), 20);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
$r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,
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']),
- DBA::escape('Contact Photos'),
- DBA::escape(DI::l10n()->t('Contact Photos')),
+ intval($user['uid']),
+ DBA::escape(Photo::CONTACT_PHOTOS),
+ DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS)),
$pager->getStart(),
$pager->getItemsPerPage()
);
$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'),
],
$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),
]);
projects / friendica.git / blobdiff