Indentation

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 3b2fa0c3a8d80c40a8024253735248e1a168f674..1a16f68026ffd39b50bd499bde525fe2231070fc 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -47,7 +47,7 @@ use Friendica\Util\Crypto;
 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;
@@ -395,7 +395,6 @@ function photos_post(App $a)
                        $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'];
@@ -560,7 +559,6 @@ function photos_post(App $a)
                                        $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'];
@@ -791,7 +789,6 @@ function photos_post(App $a)
        $arr['guid']          = System::createUUID();
        $arr['uid']           = $page_owner_uid;
        $arr['uri']           = $uri;
-       $arr['parent-uri']    = $uri;
        $arr['type']          = 'photo';
        $arr['wall']          = 1;
        $arr['resource-id']   = $resource_id;
@@ -1364,17 +1361,6 @@ function photos_content(App $a)
                        $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"),
-                                       '$dislike' => DI::pConfig()->get(local_user(), 'system', 'hide_dislike') ? '' : 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))) {
                                        /*
@@ -1426,11 +1412,11 @@ function photos_content(App $a)
                                }
 
                                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 = format_activity($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 = format_activity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id']);
                                }
 
                                if (($can_post || Security::canWriteToUserWall($owner_uid))) {
@@ -1537,6 +1523,28 @@ function photos_content(App $a)
                                }
                        }
 
+                       $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);
                }