X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=5a477c3bce4a468145cd829eb6b476dd2694b517;hb=b124c414dcaebaf15ab1f82c2e47e348400b582e;hp=b637d69694add678dea727010dace228a6e21785;hpb=3e13799e70ff77a8733b663e1ff3a4d5bea18015;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index b637d69694..5a477c3bce 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -9,13 +9,12 @@ use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\ACL;
-use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
-use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Group;
@@ -30,8 +29,8 @@ use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
use Friendica\Util\Security;
-use Friendica\Util\Temporal;
use Friendica\Util\Strings;
+use Friendica\Util\Temporal;
use Friendica\Util\XML;
function photos_init(App $a) {
@@ -48,23 +47,21 @@ function photos_init(App $a) {
if ($a->argc > 1) {
$nick = $a->argv[1];
- $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
- DBA::escape($nick)
- );
+ $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
if (!DBA::isResult($user)) {
return;
}
- $a->data['user'] = $user[0];
- $a->profile_uid = $user[0]['uid'];
+ $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);
- $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
+ $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
@@ -116,7 +113,6 @@ function photos_init(App $a) {
'$title' => L10n::t('Photo Albums'),
'$recent' => L10n::t('Recent Photos'),
'$albums' => $ret['albums'],
- '$baseurl' => System::baseUrl(),
'$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
'$can_post' => $can_post
]);
@@ -154,7 +150,7 @@ function photos_post(App $a)
$visitor = 0;
$page_owner_uid = $a->data['user']['uid'];
- $community_page = $a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY;
+ $community_page = $a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
if (local_user() && (local_user() == $page_owner_uid)) {
$can_post = true;
@@ -171,12 +167,7 @@ function photos_post(App $a)
}
if ($contact_id > 0) {
- $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
- intval($contact_id),
- intval($page_owner_uid)
- );
-
- if (DBA::isResult($r)) {
+ if (DBA::exists('contact', ['id' => $contact_id, 'uid' => $page_owner_uid, 'blocked' => false, 'pending' => false])) {
$can_post = true;
$visitor = $contact_id;
}
@@ -185,7 +176,7 @@ function photos_post(App $a)
if (!$can_post) {
notice(L10n::t('Permission denied.') . EOL);
- killme();
+ exit();
}
$owner_record = User::getOwnerDataById($page_owner_uid);
@@ -193,10 +184,13 @@ function photos_post(App $a)
if (!$owner_record) {
notice(L10n::t('Contact information unavailable') . EOL);
Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
- killme();
+ exit();
}
if ($a->argc > 3 && $a->argv[2] === 'album') {
+ if (!Strings::isHex($a->argv[3])) {
+ $a->internalRedirect('photos/' . $a->data['user']['nickname'] . '/album');
+ }
$album = hex2bin($a->argv[3]);
if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
@@ -236,36 +230,12 @@ function photos_post(App $a)
}
/*
- * DELETE photo album and all its photos
+ * DELETE all photos filed in a given album
*/
-
- if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
- // Check if we should do HTML-based delete confirmation
- if (!empty($_REQUEST['confirm'])) {
- $drop_url = $a->query_string;
-
- $extra_inputs = [
- ['name' => 'albumname', 'value' => $_POST['albumname']],
- ];
-
- $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
- '$method' => 'post',
- '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
- '$extra_inputs' => $extra_inputs,
- '$confirm' => L10n::t('Delete Album'),
- '$confirm_url' => $drop_url,
- '$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => L10n::t('Cancel'),
- ]);
-
- $a->error = 1; // Set $a->error so the other module functions don't execute
- return;
- }
-
+ if (!empty($_POST['dropalbum'])) {
$res = [];
// get the list of photos we are about to delete
-
if ($visitor) {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
intval($visitor),
@@ -283,77 +253,57 @@ function photos_post(App $a)
foreach ($r as $rr) {
$res[] = $rr['rid'];
}
- } else {
- $a->internalRedirect($_SESSION['photo_return']);
- return; // NOTREACHED
- }
- // remove the associated photos
- Photo::delete(['resource-id' => $res, 'uid' => $page_owner_uid]);
+ // remove the associated photos
+ Photo::delete(['resource-id' => $res, 'uid' => $page_owner_uid]);
- // find and delete the corresponding item with all the comments and likes/dislikes
- Item::deleteForUser(['resource-id' => $res, 'uid' => $page_owner_uid], $page_owner_uid);
+ // find and delete the corresponding item with all the comments and likes/dislikes
+ Item::deleteForUser(['resource-id' => $res, 'uid' => $page_owner_uid], $page_owner_uid);
- // Update the photo albums cache
- Photo::clearAlbumCache($page_owner_uid);
+ // Update the photo albums cache
+ Photo::clearAlbumCache($page_owner_uid);
+ notice(L10n::t('Album successfully deleted'));
+ } else {
+ notice(L10n::t('Album was empty.'));
+ }
}
- $a->internalRedirect('photos/' . $a->data['user']['nickname']);
- return; // NOTREACHED
+ $a->internalRedirect('photos/' . $a->argv[1]);
}
+ if ($a->argc > 3 && $a->argv[2] === 'image') {
+ // Check if the user has responded to a delete confirmation query for a single photo
+ if (!empty($_POST['canceled'])) {
+ $a->internalRedirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+ }
- // Check if the user has responded to a delete confirmation query for a single photo
- if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
- $a->internalRedirect($_SESSION['photo_return']);
- }
-
- if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
-
- // same as above but remove single photo
-
- // Check if we should do HTML-based delete confirmation
- if (!empty($_REQUEST['confirm'])) {
- $drop_url = $a->query_string;
+ 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]];
- $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
- '$method' => 'post',
- '$message' => L10n::t('Do you really want to delete this photo?'),
- '$extra_inputs' => [],
- '$confirm' => L10n::t('Delete Photo'),
- '$confirm_url' => $drop_url,
- '$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => L10n::t('Cancel'),
- ]);
+ } else {
+ $condition = ['uid' => local_user(), 'resource-id' => $a->argv[3]];
+ }
- $a->error = 1; // Set $a->error so the other module functions don't execute
- return;
- }
+ $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
- if ($visitor) {
- $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
- intval($visitor),
- intval($page_owner_uid),
- DBA::escape($a->argv[2])
- );
- } else {
- $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
- intval(local_user()),
- DBA::escape($a->argv[2])
- );
- }
+ if (DBA::isResult($photo)) {
+ Photo::delete(['uid' => $page_owner_uid, 'resource-id' => $photo['resource-id']]);
- if (DBA::isResult($r)) {
- Photo::delete(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid]);
+ Item::deleteForUser(['resource-id' => $photo['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
- Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
+ // Update the photo albums cache
+ Photo::clearAlbumCache($page_owner_uid);
+ notice('Successfully deleted the photo.');
+ } else {
+ notice('Failed to delete the photo.');
+ $a->internalRedirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+ }
- // Update the photo albums cache
- Photo::clearAlbumCache($page_owner_uid);
+ $a->internalRedirect('photos/' . $a->argv[1]);
+ return; // NOTREACHED
}
-
- $a->internalRedirect('photos/' . $a->data['user']['nickname']);
- return; // NOTREACHED
}
if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
@@ -368,7 +318,7 @@ function photos_post(App $a)
$str_group_deny = !empty($_POST['group_deny']) ? perms2str($_POST['group_deny']) : '';
$str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
- $resource_id = $a->argv[2];
+ $resource_id = $a->argv[3];
if (!strlen($albname)) {
$albname = DateTimeFormat::localNow('Y');
@@ -410,9 +360,12 @@ function photos_post(App $a)
}
}
- $photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
+ $photos_stmt = DBA::select('photo', [], ['resource-id' => $resource_id, 'uid' => $page_owner_uid], ['order' => ['scale' => true]]);
+
+ $photos = DBA::toArray($photos_stmt);
- if (DBA::isResult($photo)) {
+ if (DBA::isResult($photos)) {
+ $photo = $photos[0];
$ext = $phototypes[$photo['type']];
Photo::update(
['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny],
@@ -423,16 +376,15 @@ function photos_post(App $a)
if ($albname !== $origaname) {
Photo::clearAlbumCache($page_owner_uid);
}
- }
-
- /* Don't make the item visible if the only change was the album name */
+ /* Don't make the item visible if the only change was the album name */
- $visibility = 0;
- if ($photo['desc'] !== $desc || strlen($rawtags)) {
- $visibility = 1;
+ $visibility = 0;
+ if ($photo['desc'] !== $desc || strlen($rawtags)) {
+ $visibility = 1;
+ }
}
- if (!$item_id) {
+ if (DBA::isResult($photos) && !$item_id) {
// Create item container
$title = '';
$uri = Item::newURI($page_owner_uid);
@@ -469,10 +421,11 @@ function photos_post(App $a)
if ($item_id) {
$item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
- }
- if (DBA::isResult($item)) {
- $old_tag = $item['tag'];
- $old_inform = $item['inform'];
+
+ if (DBA::isResult($item)) {
+ $old_tag = $item['tag'];
+ $old_inform = $item['inform'];
+ }
}
if (strlen($rawtags)) {
@@ -492,6 +445,7 @@ function photos_post(App $a)
foreach ($tags as $tag) {
if (strpos($tag, '@') === 0) {
$profile = '';
+ $contact = null;
$name = substr($tag,1);
if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
@@ -519,7 +473,6 @@ function photos_post(App $a)
$taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
- $alias = '';
$tagcid = 0;
if (strrpos($newname, '+')) {
@@ -527,34 +480,26 @@ function photos_post(App $a)
}
if ($tagcid) {
- $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($tagcid),
- intval($profile_uid)
- );
+ $contact = DBA::selectFirst('contact', [], ['id' => $tagcid, 'uid' => $page_owner_uid]);
} else {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
- $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($newname),
- intval($page_owner_uid)
- );
-
- if (!DBA::isResult($r)) {
+ $contact = DBA::selectFirst('contact', [], ['name' => $newname, 'uid' => $page_owner_uid]);
+ if (!DBA::isResult($contact)) {
//select someone by attag or nick and the name passed in
- $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- DBA::escape($name),
- DBA::escape($name),
- intval($page_owner_uid)
+ $contact = DBA::selectFirst('contact', [],
+ ['(`attag` = ? OR `nick` = ?) AND `uid` = ?', $name, $name, $page_owner_uid],
+ ['order' => ['attag' => true]]
);
}
}
- if (DBA::isResult($r)) {
- $newname = $r[0]['name'];
- $profile = $r[0]['url'];
+ if (DBA::isResult($contact)) {
+ $newname = $contact['name'];
+ $profile = $contact['url'];
- $notify = 'cid:' . $r[0]['id'];
+ $notify = 'cid:' . $contact['id'];
if (strlen($inform)) {
$inform .= ',';
}
@@ -563,8 +508,8 @@ function photos_post(App $a)
}
if ($profile) {
- if (substr($notify, 0, 4) === 'cid:') {
- $taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'];
+ if (!empty($contact)) {
+ $taginfo[] = [$newname, $profile, $notify, $contact, '@[url=' . str_replace(',', '%2c', $profile) . ']' . $newname . '[/url]'];
} else {
$taginfo[] = [$newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'];
}
@@ -583,13 +528,13 @@ function photos_post(App $a)
}
}
- $newtag = $old_tag;
+ $newtag = $old_tag ?? '';
if (strlen($newtag) && strlen($str_tags)) {
$newtag .= ',';
}
$newtag .= $str_tags;
- $newinform = $old_inform;
+ $newinform = $old_inform ?? '';
if (strlen($newinform) && strlen($inform)) {
$newinform .= ',';
}
@@ -600,7 +545,7 @@ function photos_post(App $a)
Item::update($fields, $condition);
$best = 0;
- foreach ($p as $scales) {
+ foreach ($photos as $scales) {
if (intval($scales['scale']) == 2) {
$best = 2;
break;
@@ -648,15 +593,15 @@ function photos_post(App $a)
$arr['object'] = '' . "\n";
$arr['target'] = '