if (DI::args()->getArgc() > 1) {
$owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
- if (!$owner) {
+ if (empty($owner) || $owner['account_removed']) {
throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
}
if ($albname !== $origaname) {
Photo::clearAlbumCache($page_owner_uid);
}
- /* Don't make the item visible if the only change was the album name */
-
- $visibility = 0;
- if ($photo['desc'] !== $desc || strlen($rawtags)) {
- $visibility = 1;
- }
}
if (DBA::isResult($photos) && !$item_id) {
$arr['allow_gid'] = $photo['allow_gid'];
$arr['deny_cid'] = $photo['deny_cid'];
$arr['deny_gid'] = $photo['deny_gid'];
- $arr['visible'] = $visibility;
+ $arr['visible'] = 0;
$arr['origin'] = 1;
$arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $user['nickname'] . '/image/' . $photo['resource-id'] . ']'
$arr['allow_gid'] = $photo['allow_gid'];
$arr['deny_cid'] = $photo['deny_cid'];
$arr['deny_gid'] = $photo['deny_gid'];
- $arr['visible'] = 1;
+ $arr['visible'] = 0;
$arr['verb'] = Activity::TAG;
$arr['gravity'] = GRAVITY_PARENT;
$arr['object-type'] = Activity\ObjectType::PERSON;
}
}
- /*
- * We create a wall item for every photo, but we don't want to
- * overwhelm the data stream with a hundred newly uploaded photos.
- * So we will make the first photo uploaded to this album in the last several hours
- * visible by default, the rest will become visible over time when and if
- * they acquire comments, likes, dislikes, and/or tags
- */
-
- $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > ?', $album, $page_owner_uid, DateTimeFormat::utc('now - 3 hours')]);
-
- if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
- $visible = 1;
- } else {
- $visible = 0;
- }
-
- if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') {
- $visible = 0;
- }
-
$ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
Hook::callAll('photo_post_file', $ret);
$arr['allow_gid'] = $str_group_allow;
$arr['deny_cid'] = $str_contact_deny;
$arr['deny_gid'] = $str_group_deny;
- $arr['visible'] = $visible;
+ $arr['visible'] = 0;
$arr['origin'] = 1;
$arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
// Display one photo
if ($datatype === 'image') {
// fetch image, item containing image, then comments
- $ph = Photo::selectToArray([], ["`uid` = ? AND `resource-id` = ? " . $sql_extra, $owner_uid, $datum], ['order' => ['scale' => true]]);
+ $ph = Photo::selectToArray([], ["`uid` = ? AND `resource-id` = ? " . $sql_extra, $owner_uid, $datum], ['order' => ['scale']]);
if (!DBA::isResult($ph)) {
if (DBA::exists('photo', ['resource-id' => $datum, 'uid' => $owner_uid])) {
$order_field = $_GET['order'] ?? '';
if ($order_field === 'posted') {
- $order = 'ASC';
+ $params = ['order' => [$order_field]];
+ } elseif (!empty($order_field)) {
+ $params = ['order' => [$order_field => true]];
} else {
- $order = 'DESC';
+ $params = [];
}
- $prvnxt = Photo::selectToArray(['resource-id'], ["`album` = ? AND `uid` = ? AND `scale` = ?" . $sql_extra, $ph[0]['album'], $owner_uid, 0]);
+ $prvnxt = Photo::selectToArray(['resource-id'], ["`album` = ? AND `uid` = ? AND `scale` = ?" . $sql_extra, $ph[0]['album'], $owner_uid, 0], $params);
if (DBA::isResult($prvnxt)) {
$prv = null;
$tags = null;
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) {
+ foreach (Tag::getByURIId($link_item['uri-id']) as $tag) {
$tag_arr[] = [
- 'name' => BBCode::convert($tag),
- 'removeurl' => '/tagrm/' . $link_item['id'] . '/' . bin2hex($tag)
+ 'name' => $tag['name'],
+ 'removeurl' => '/tagrm/' . $link_item['id'] . '/' . bin2hex($tag['name'])
];
}
$tags = ['title' => DI::l10n()->t('Tags: '), 'tags' => $tag_arr];