Merge pull request #6342 from annando/notices

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 8b11e72421cf878e87c3f6c462c1b94c97136e3f..05943352ba327b3aa2a3bfb04cd552807ae8e275 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -34,8 +34,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) {
@@ -223,7 +221,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,7 +281,7 @@ function photos_post(App $a)
 
                        if (DBA::isResult($r)) {
                                foreach ($r as $rr) {
-                                       $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
+                                       $res[] = "'" . DBA::escape($rr['rid']) . "'";
                                }
                        } else {
                                $a->internalRedirect($_SESSION['photo_return']);
@@ -365,12 +363,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']) : '';
@@ -613,7 +611,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);
@@ -681,8 +679,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/' . $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/' . $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['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
                                        $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
@@ -708,8 +706,8 @@ function photos_post(App $a)
        Addon::callHooks('photo_post_init', $_POST);
 
        // Determine the album to use
-       $album    = !empty($_REQUEST['album'])    ? Strings::removeTags(trim($_REQUEST['album']))    : '';
-       $newalbum = !empty($_REQUEST['newalbum']) ? Strings::removeTags(trim($_REQUEST['newalbum'])) : '';
+       $album    = !empty($_REQUEST['album'])    ? Strings::escapeTags(trim($_REQUEST['album']))    : '';
+       $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
 
        Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
 
@@ -946,8 +944,6 @@ function photos_content(App $a)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        if (empty($a->data['user'])) {
                notice(L10n::t('No photos selected') . EOL);
                return;
@@ -1353,7 +1349,7 @@ function photos_content(App $a)
                }
 
                if ($prevlink) {
-                       $prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+                       $prevlink = [$prevlink, '<div class="icon prev"></div>'];
                }
 
                $photo = [
@@ -1480,7 +1476,7 @@ function photos_content(App $a)
                                $likebuttons = Renderer::replaceMacros($like_tpl, [
                                        '$id' => $link_item['id'],
                                        '$likethis' => L10n::t("I like this \x28toggle\x29"),
-                                       '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? L10n::t("I don't like this \x28toggle\x29") : ''),
+                                       '$nolike' => L10n::t("I don't like this \x28toggle\x29"),
                                        '$wait' => L10n::t('Please wait'),
                                        '$return_path' => $a->query_string,
                                ]);
@@ -1607,9 +1603,7 @@ function photos_content(App $a)
                                }
                        }
                        $response_verbs = ['like'];
-                       if (Feature::isEnabled($owner_uid, 'dislike')) {
-                               $response_verbs[] = 'dislike';
-                       }
+                       $response_verbs[] = 'dislike';
                        $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
 
                        $paginate = $pager->renderFull($total);