X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=137e0adb563218b312b51fc3b0dc021899df677f;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=8b11e72421cf878e87c3f6c462c1b94c97136e3f;hpb=b5a97c1abe5246f45911e63e3412d60c90603578;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 8b11e72421..137e0adb56 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;
@@ -34,8 +33,6 @@ use Friendica\Util\Temporal;
use Friendica\Util\Strings;
use Friendica\Util\XML;
-require_once 'include/items.php';
-
function photos_init(App $a) {
if ($a->argc > 1) {
@@ -156,7 +153,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;
@@ -187,7 +184,7 @@ function photos_post(App $a)
if (!$can_post) {
notice(L10n::t('Permission denied.') . EOL);
- killme();
+ exit();
}
$owner_record = User::getOwnerDataById($page_owner_uid);
@@ -195,7 +192,7 @@ 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') {
@@ -223,7 +220,7 @@ function photos_post(App $a)
}
// RENAME photo album
- $newalbum = Strings::removeTags(trim($_POST['albumname']));
+ $newalbum = Strings::escapeTags(trim($_POST['albumname']));
if ($newalbum != $album) {
q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
DBA::escape($newalbum),
@@ -283,19 +280,15 @@ function photos_post(App $a)
if (DBA::isResult($r)) {
foreach ($r as $rr) {
- $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
+ $res[] = $rr['rid'];
}
} else {
$a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
- $str_res = implode(',', $res);
-
// remove the associated photos
- q("DELETE FROM `photo` WHERE `resource-id` IN ($str_res) AND `uid` = %d",
- intval($page_owner_uid)
- );
+ 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);
@@ -350,10 +343,7 @@ function photos_post(App $a)
}
if (DBA::isResult($r)) {
- q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
- intval($page_owner_uid),
- DBA::escape($r[0]['resource-id'])
- );
+ Photo::delete(['uid' => $page_owner_uid, 'resource-id' => $r[0]['resource-id']]);
Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
@@ -365,12 +355,12 @@ function photos_post(App $a)
return; // NOTREACHED
}
- if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
- $desc = !empty($_POST['desc']) ? Strings::removeTags(trim($_POST['desc'])) : '';
- $rawtags = !empty($_POST['newtag']) ? Strings::removeTags(trim($_POST['newtag'])) : '';
- $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0;
- $albname = !empty($_POST['albname']) ? Strings::removeTags(trim($_POST['albname'])) : '';
- $origaname = !empty($_POST['origaname']) ? Strings::removeTags(trim($_POST['origaname'])) : '';
+ if ($a->argc > 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'])) : '';
+ $origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
$str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : '';
$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
@@ -386,13 +376,10 @@ function photos_post(App $a)
if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
Logger::log('rotate');
- $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ $photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
- if (DBA::isResult($r)) {
- $image = new Image($r[0]['data'], $r[0]['type']);
+ if (DBA::isResult($photo)) {
+ $image = Photo::getImageForPhoto($photo);
if ($image->isValid()) {
$rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
@@ -401,26 +388,14 @@ function photos_post(App $a)
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 0], $image);
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 1], $image);
}
if ($width > 320 || $height > 320) {
@@ -428,50 +403,37 @@ function photos_post(App $a)
$width = $image->getWidth();
$height = $image->getHeight();
- $x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
- DBA::escape($image->asString()),
- intval($height),
- intval($width),
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 2], $image);
}
}
}
}
- $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
- DBA::escape($resource_id),
- intval($page_owner_uid)
- );
+ $photos_stmt = DBA::select('photo', [], ['resource-id' => $resource_id, 'uid' => $page_owner_uid], ['order' => ['scale' => true]]);
- if (DBA::isResult($p)) {
- $ext = $phototypes[$p[0]['type']];
- $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
- DBA::escape($desc),
- DBA::escape($albname),
- DBA::escape($str_contact_allow),
- DBA::escape($str_group_allow),
- DBA::escape($str_contact_deny),
- DBA::escape($str_group_deny),
- DBA::escape($resource_id),
- intval($page_owner_uid)
+ $photos = DBA::toArray($photos_stmt);
+
+ 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],
+ ['resource-id' => $resource_id, 'uid' => $page_owner_uid]
);
// Update the photo albums cache if album name was changed
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 ($p[0]['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);
@@ -483,7 +445,7 @@ function photos_post(App $a)
$arr['parent-uri'] = $uri;
$arr['post-type'] = Item::PT_IMAGE;
$arr['wall'] = 1;
- $arr['resource-id'] = $p[0]['resource-id'];
+ $arr['resource-id'] = $photo['resource-id'];
$arr['contact-id'] = $owner_record['id'];
$arr['owner-name'] = $owner_record['name'];
$arr['owner-link'] = $owner_record['url'];
@@ -492,15 +454,15 @@ function photos_post(App $a)
$arr['author-link'] = $owner_record['url'];
$arr['author-avatar'] = $owner_record['thumb'];
$arr['title'] = $title;
- $arr['allow_cid'] = $p[0]['allow_cid'];
- $arr['allow_gid'] = $p[0]['allow_gid'];
- $arr['deny_cid'] = $p[0]['deny_cid'];
- $arr['deny_gid'] = $p[0]['deny_gid'];
+ $arr['allow_cid'] = $photo['allow_cid'];
+ $arr['allow_gid'] = $photo['allow_gid'];
+ $arr['deny_cid'] = $photo['deny_cid'];
+ $arr['deny_gid'] = $photo['deny_gid'];
$arr['visible'] = $visibility;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
- . '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
+ $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
+ . '[img]' . System::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -558,7 +520,6 @@ function photos_post(App $a)
$taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
- $alias = '';
$tagcid = 0;
if (strrpos($newname, '+')) {
@@ -568,7 +529,7 @@ 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)
+ intval($page_owner_uid)
);
} else {
$newname = str_replace('_',' ',$name);
@@ -613,7 +574,7 @@ function photos_post(App $a)
}
$profile = str_replace(',', '%2c', $profile);
- $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
+ $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
@@ -639,7 +600,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;
@@ -669,10 +630,10 @@ function photos_post(App $a)
$arr['author-link'] = $owner_record['url'];
$arr['author-avatar'] = $owner_record['thumb'];
$arr['title'] = '';
- $arr['allow_cid'] = $p[0]['allow_cid'];
- $arr['allow_gid'] = $p[0]['allow_gid'];
- $arr['deny_cid'] = $p[0]['deny_cid'];
- $arr['deny_gid'] = $p[0]['deny_gid'];
+ $arr['allow_cid'] = $photo['allow_cid'];
+ $arr['allow_gid'] = $photo['allow_gid'];
+ $arr['deny_cid'] = $photo['deny_cid'];
+ $arr['deny_gid'] = $photo['deny_gid'];
$arr['visible'] = 1;
$arr['verb'] = ACTIVITY_TAG;
$arr['gravity'] = GRAVITY_PARENT;
@@ -681,21 +642,21 @@ 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=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
- $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
+ $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+ $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '' . "\n";
- $arr['target'] = '