Move activity_match() to Protocol\Activity::match()

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 84be1c8285d0f0080bbdbe1e71470379c1e226c2..3a94813e5412b1428cfaab3983d05929cb748429 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
@@ -26,6 +27,7 @@ use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
+use Friendica\Util\ACLFormatter;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
@@ -63,9 +65,9 @@ function photos_init(App $a) {
                $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
-                       '$addr' => defaults($profile, 'addr', ''),
+                       '$addr' => $profile['addr'] ?? '',
                        '$account_type' => $account_type,
-                       '$pdesc' => defaults($profile, 'pdesc', ''),
+                       '$pdesc' => $profile['pdesc'] ?? '',
                ]);
 
                $albums = Photo::getAlbums($a->data['user']['uid']);
@@ -296,10 +298,13 @@ function photos_post(App $a)
                $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']) : '';
-               $str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
-               $str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
+               /** @var ACLFormatter $aclFormatter */
+               $aclFormatter = BaseObject::getClass(ACLFormatter::class);
+
+               $str_group_allow   = !empty($_POST['group_allow'])   ? $aclFormatter->aclToString($_POST['group_allow'])   : '';
+               $str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->aclToString($_POST['contact_allow']) : '';
+               $str_group_deny    = !empty($_POST['group_deny'])    ? $aclFormatter->aclToString($_POST['group_deny'])    : '';
+               $str_contact_deny  = !empty($_POST['contact_deny'])  ? $aclFormatter->aclToString($_POST['contact_deny'])  : '';
 
                $resource_id = $a->argv[3];
 
@@ -630,15 +635,18 @@ function photos_post(App $a)
                $visible = 0;
        }
 
-       $group_allow   = defaults($_REQUEST, 'group_allow'  , []);
-       $contact_allow = defaults($_REQUEST, 'contact_allow', []);
-       $group_deny    = defaults($_REQUEST, 'group_deny'   , []);
-       $contact_deny  = defaults($_REQUEST, 'contact_deny' , []);
+       $group_allow   = $_REQUEST['group_allow']   ?? [];
+       $contact_allow = $_REQUEST['contact_allow'] ?? [];
+       $group_deny    = $_REQUEST['group_deny']    ?? [];
+       $contact_deny  = $_REQUEST['contact_deny']  ?? [];
+
+       /** @var ACLFormatter $aclFormatter */
+       $aclFormatter = BaseObject::getClass(ACLFormatter::class);
 
-       $str_group_allow   = perms2str(is_array($group_allow)   ? $group_allow   : explode(',', $group_allow));
-       $str_contact_allow = perms2str(is_array($contact_allow) ? $contact_allow : explode(',', $contact_allow));
-       $str_group_deny    = perms2str(is_array($group_deny)    ? $group_deny    : explode(',', $group_deny));
-       $str_contact_deny  = perms2str(is_array($contact_deny)  ? $contact_deny  : explode(',', $contact_deny));
+       $str_group_allow   = $aclFormatter->aclToString(is_array($group_allow)   ? $group_allow   : explode(',', $group_allow));
+       $str_contact_allow = $aclFormatter->aclToString(is_array($contact_allow) ? $contact_allow : explode(',', $contact_allow));
+       $str_group_deny    = $aclFormatter->aclToString(is_array($group_deny)    ? $group_deny    : explode(',', $group_deny));
+       $str_contact_deny  = $aclFormatter->aclToString(is_array($contact_deny)  ? $contact_deny  : explode(',', $contact_deny));
 
        $ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
 
@@ -666,7 +674,7 @@ function photos_post(App $a)
                                notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+                               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL);
                                break;
                        case UPLOAD_ERR_PARTIAL:
                                notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
@@ -1006,7 +1014,7 @@ function photos_content(App $a)
                $pager = new Pager($a->query_string, 20);
 
                /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
-               $order_field = defaults($_GET, 'order', '');
+               $order_field = $_GET['order'] ?? '';
                if ($order_field === 'posted') {
                        $order = 'ASC';
                } else {
@@ -1158,7 +1166,7 @@ function photos_content(App $a)
                 * By now we hide it if someone wants to.
                 */
                if ($cmd === 'view' && !Config::get('system', 'no_count', false)) {
-                       $order_field = defaults($_GET, 'order', '');
+                       $order_field = $_GET['order'] ?? '';
 
                        if ($order_field === 'posted') {
                                $order = 'ASC';
@@ -1438,7 +1446,12 @@ function photos_content(App $a)
                                        $template = $tpl;
                                        $sparkle = '';
 
-                                       if ((activity_match($item['verb'], ACTIVITY_LIKE) || activity_match($item['verb'], ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) {
+                                       /** @var \Friendica\Protocol\Activity $activity */
+                                       $activity = BaseObject::getClass(\Friendica\Protocol\Activity::class);
+
+                                       if (($activity->match($item['verb'], ACTIVITY_LIKE) ||
+                                            $activity->match($item['verb'], ACTIVITY_DISLIKE)) &&
+                                           ($item['id'] != $item['parent'])) {
                                                continue;
                                        }