X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=2ca6c6a37bb132b482a786750f8b501433bdd91b;hb=cabaea38ac46132963011c724d9c0b380bb5d7c0;hp=037da64b10fdd6eb1bb19f7ccc1dafb721237826;hpb=73b448c82926e384c110434de793c8cc55c5ddbc;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index 037da64b10..2ca6c6a37b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -4,7 +4,6 @@
*/
use Friendica\App;
-use Friendica\BaseObject;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
@@ -18,6 +17,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Photo;
@@ -26,9 +26,9 @@ use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\Activity;
-use Friendica\Util\ACLFormatter;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
use Friendica\Util\Map;
use Friendica\Util\Security;
use Friendica\Util\Strings;
@@ -116,19 +116,19 @@ function photos_init(App $a) {
]);
}
- if (empty($a->page['aside'])) {
- $a->page['aside'] = '';
+ if (empty(DI::page()['aside'])) {
+ DI::page()['aside'] = '';
}
- $a->page['aside'] .= $vcard_widget;
+ DI::page()['aside'] .= $vcard_widget;
if (!empty($photo_albums_widget)) {
- $a->page['aside'] .= $photo_albums_widget;
+ DI::page()['aside'] .= $photo_albums_widget;
}
$tpl = Renderer::getMarkupTemplate("photos_head.tpl");
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
'$ispublic' => L10n::t('everybody')
]);
}
@@ -142,7 +142,7 @@ function photos_post(App $a)
Logger::log('mod_photos: REQUEST ' . print_r($_REQUEST, true), Logger::DATA);
Logger::log('mod_photos: FILES ' . print_r($_FILES, true), Logger::DATA);
- $phototypes = Image::supportedTypes();
+ $phototypes = Images::supportedTypes();
$can_post = false;
$visitor = 0;
@@ -173,12 +173,12 @@ function photos_post(App $a)
if ($a->argc > 3 && $a->argv[2] === 'album') {
if (!Strings::isHex($a->argv[3])) {
- $a->internalRedirect('photos/' . $a->data['user']['nickname'] . '/album');
+ DI::baseUrl()->redirect('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')) {
- $a->internalRedirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@@ -189,13 +189,13 @@ function photos_post(App $a)
if (!DBA::isResult($r)) {
notice(L10n::t('Album not found.') . EOL);
- $a->internalRedirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
if (!empty($_REQUEST['canceled'])) {
- $a->internalRedirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect($_SESSION['photo_return']);
}
// RENAME photo album
@@ -209,7 +209,7 @@ function photos_post(App $a)
// Update the photo albums cache
Photo::clearAlbumCache($page_owner_uid);
- $a->internalRedirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
+ DI::baseUrl()->redirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
return; // NOTREACHED
}
@@ -252,13 +252,13 @@ function photos_post(App $a)
}
}
- $a->internalRedirect('photos/' . $a->argv[1]);
+ DI::baseUrl()->redirect('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]);
+ DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
}
if (!empty($_POST['delete'])) {
@@ -282,10 +282,10 @@ function photos_post(App $a)
notice('Successfully deleted the photo.');
} else {
notice('Failed to delete the photo.');
- $a->internalRedirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
+ DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
}
- $a->internalRedirect('photos/' . $a->argv[1]);
+ DI::baseUrl()->redirect('photos/' . $a->argv[1]);
return; // NOTREACHED
}
}
@@ -297,8 +297,7 @@ function photos_post(App $a)
$albname = !empty($_POST['albname']) ? Strings::escapeTags(trim($_POST['albname'])) : '';
$origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
- /** @var ACLFormatter $aclFormatter */
- $aclFormatter = BaseObject::getClass(ACLFormatter::class);
+ $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']) : '';
@@ -399,8 +398,8 @@ function photos_post(App $a)
$arr['visible'] = $visibility;
$arr['origin'] = 1;
- $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]'
+ $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
+ . '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -510,7 +509,7 @@ function photos_post(App $a)
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
- $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
+ $str_tags .= '#[url=' . DI::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
}
}
}
@@ -574,8 +573,8 @@ 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/' . $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['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'] .= "\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'] = '' . "\n";
$arr['target'] = '' . Activity\ObjectType::IMAGE . '' . $photo['desc'] . ''
- . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '';
- $arr['target'] .= '' . XML::escape('' . "\n" . '') . '';
+ . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '';
+ $arr['target'] .= '' . XML::escape('' . "\n" . '') . '';
Item::insert($arr);
}
}
}
- $a->internalRedirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED
}
@@ -639,8 +638,7 @@ function photos_post(App $a)
$group_deny = $_REQUEST['group_deny'] ?? [];
$contact_deny = $_REQUEST['contact_deny'] ?? [];
- /** @var ACLFormatter $aclFormatter */
- $aclFormatter = BaseObject::getClass(ACLFormatter::class);
+ $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));
@@ -694,7 +692,7 @@ function photos_post(App $a)
}
if ($type == "") {
- $type = Image::guessType($filename);
+ $type = Images::guessType($filename);
}
Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
@@ -748,9 +746,9 @@ function photos_post(App $a)
$smallest = 0;
- $photo_hash = Photo::newResource();
+ $resource_id = Photo::newResource();
- $r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if (!$r) {
Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
@@ -760,13 +758,13 @@ function photos_post(App $a)
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
- Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 1;
}
if ($width > 320 || $height > 320) {
$image->scaleDown(320);
- Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 2;
}
@@ -790,7 +788,7 @@ function photos_post(App $a)
$arr['parent-uri'] = $uri;
$arr['type'] = 'photo';
$arr['wall'] = 1;
- $arr['resource-id'] = $photo_hash;
+ $arr['resource-id'] = $resource_id;
$arr['contact-id'] = $owner_record['id'];
$arr['owner-name'] = $owner_record['name'];
$arr['owner-link'] = $owner_record['url'];
@@ -806,8 +804,8 @@ function photos_post(App $a)
$arr['visible'] = $visible;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
- . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$image->getExt() . '[/img]'
+ $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
+ . '[img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -816,10 +814,10 @@ 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
- $a->internalRedirect($_SESSION['photo_return']);
+ DI::baseUrl()->redirect($_SESSION['photo_return']);
// NOTREACHED
}
@@ -846,9 +844,9 @@ function photos_content(App $a)
return;
}
- $phototypes = Image::supportedTypes();
+ $phototypes = Images::supportedTypes();
- $_SESSION['photo_return'] = $a->cmd;
+ $_SESSION['photo_return'] = DI::args()->getCommand();
// Parse arguments
$datum = null;
@@ -959,7 +957,7 @@ function photos_content(App $a)
$tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
- $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
+ $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->user));
$o .= Renderer::replaceMacros($tpl,[
'$pagename' => L10n::t('Upload Photos'),
@@ -986,7 +984,7 @@ function photos_content(App $a)
// ACL permissions box
'$group_perms' => L10n::t('Show to Groups'),
'$contact_perms' => L10n::t('Show to Contacts'),
- '$return_path' => $a->query_string,
+ '$return_path' => DI::args()->getQueryString(),
]);
return $o;
@@ -996,7 +994,7 @@ function photos_content(App $a)
if ($datatype === 'album') {
// if $datum is not a valid hex, redirect to the default page
if (!Strings::isHex($datum)) {
- $a->internalRedirect('photos/' . $a->data['user']['nickname']. '/album');
+ DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname']. '/album');
}
$album = hex2bin($datum);
@@ -1010,7 +1008,7 @@ function photos_content(App $a)
$total = count($r);
}
- $pager = new Pager($a->query_string, 20);
+ $pager = new Pager(DI::args()->getQueryString(), 20);
/// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
$order_field = $_GET['order'] ?? '';
@@ -1032,16 +1030,12 @@ function photos_content(App $a)
);
if ($cmd === 'drop') {
- $drop_url = $a->query_string;
-
- $extra_inputs = [
- ['name' => 'albumname', 'value' => $_POST['albumname']],
- ];
+ $drop_url = DI::args()->getQueryString();
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?'),
- '$extra_inputs' => $extra_inputs,
+ '$extra_inputs' => [],
'$confirm' => L10n::t('Delete Album'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum',
@@ -1143,7 +1137,7 @@ function photos_content(App $a)
}
if ($cmd === 'drop') {
- $drop_url = $a->query_string;
+ $drop_url = DI::args()->getQueryString();
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
@@ -1204,7 +1198,7 @@ function photos_content(App $a)
}
$tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
'$prevlink' => $prevlink,
'$nextlink' => $nextlink
]);
@@ -1290,7 +1284,7 @@ function photos_content(App $a)
$condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']];
$total = DBA::count('item', $condition);
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::args()->getQueryString());
$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
$result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
@@ -1331,7 +1325,7 @@ function photos_content(App $a)
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
- $aclselect_e = ACL::getFullSelectorHTML($a->user, false, $ph[0]);
+ $aclselect_e = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($ph[0]));
$edit = Renderer::replaceMacros($edit_tpl, [
'$id' => $ph[0]['id'],
@@ -1354,7 +1348,7 @@ function photos_content(App $a)
// ACL permissions box
'$group_perms' => L10n::t('Show to Groups'),
'$contact_perms' => L10n::t('Show to Contacts'),
- '$return_path' => $a->query_string,
+ '$return_path' => DI::args()->getQueryString(),
]);
}
@@ -1368,7 +1362,7 @@ function photos_content(App $a)
if (!empty($link_item['id']) && !empty($link_item['uri'])) {
$cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
$tpl = Renderer::getMarkupTemplate('photo_item.tpl');
- $return_path = $a->cmd;
+ $return_path = DI::args()->getCommand();
if ($cmd === 'view' && ($can_post || Security::canWriteToUserWall($owner_uid))) {
$like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
@@ -1377,7 +1371,7 @@ function photos_content(App $a)
'$likethis' => L10n::t("I like this \x28toggle\x29"),
'$nolike' => L10n::t("I don't like this \x28toggle\x29"),
'$wait' => L10n::t('Please wait'),
- '$return_path' => $a->query_string,
+ '$return_path' => DI::args()->getQueryString(),
]);
}
@@ -1445,8 +1439,7 @@ function photos_content(App $a)
$template = $tpl;
$sparkle = '';
- /** @var Activity $activity */
- $activity = BaseObject::getClass(Activity::class);
+ $activity = DI::activity();
if (($activity->match($item['verb'], Activity::LIKE) ||
$activity->match($item['verb'], Activity::DISLIKE)) &&
@@ -1534,11 +1527,11 @@ function photos_content(App $a)
'$paginate' => $paginate,
]);
- $a->page['htmlhead'] .= "\n" . '' . "\n";
- $a->page['htmlhead'] .= '' . "\n";
- $a->page['htmlhead'] .= '' . "\n";
- $a->page['htmlhead'] .= '' . "\n";
- $a->page['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= "\n" . '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
return $o;
}
@@ -1556,7 +1549,7 @@ function photos_content(App $a)
$total = count($r);
}
- $pager = new Pager($a->query_string, 20);
+ $pager = new Pager(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`,