Remove album name bin2hex conversion in file browser

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 9511261553f0d5f46f1f81649635b734f8579506..ae45c714c6e8b46fc68ffd758f8b29e240afdd0b 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -204,13 +204,13 @@ function photos_post(App $a)
 
                if (!DBA::isResult($r)) {
                        notice(DI::l10n()->t('Album not found.') . EOL);
-                       DI::baseUrl()->redirect($_SESSION['photo_return']);
+                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
                        return; // NOTREACHED
                }
 
                // Check if the user has responded to a delete confirmation query
                if (!empty($_REQUEST['canceled'])) {
-                       DI::baseUrl()->redirect($_SESSION['photo_return']);
+                       DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album/' . $a->argv[3]);
                }
 
                // RENAME photo album
@@ -267,7 +267,7 @@ function photos_post(App $a)
                        }
                }
 
-               DI::baseUrl()->redirect('photos/' . $a->argv[1]);
+               DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
        }
 
        if ($a->argc > 3 && $a->argv[2] === 'image') {
@@ -309,7 +309,7 @@ function photos_post(App $a)
                $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']))   : '';
+               $albname     = !empty($_POST['albname'])   ? trim($_POST['albname'])                        : '';
                $origaname   = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
 
                $aclFormatter = DI::aclFormatter();
@@ -615,10 +615,10 @@ function photos_post(App $a)
        Hook::callAll('photo_post_init', $_POST);
 
        // Determine the album to use
-       $album    = !empty($_REQUEST['album'])    ? Strings::escapeTags(trim($_REQUEST['album']))    : '';
-       $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
+       $album    = trim($_REQUEST['album'] ?? '');
+       $newalbum = trim($_REQUEST['newalbum'] ?? '');
 
-       Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
+       Logger::info('album= ' . $album . ' newalbum= ' . $newalbum);
 
        if (!strlen($album)) {
                if (strlen($newalbum)) {
@@ -706,9 +706,7 @@ function photos_post(App $a)
                return;
        }
 
-       if ($type == "") {
-               $type = Images::guessType($filename);
-       }
+       $type = Images::getMimeTypeBySource($src, $filename, $type);
 
        Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
 
@@ -1372,7 +1370,6 @@ function photos_content(App $a)
                $likebuttons = '';
                $comments = '';
                $paginate = '';
-               $responses = '';
 
                if (!empty($link_item['id']) && !empty($link_item['uri'])) {
                        $cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
@@ -1413,11 +1410,11 @@ function photos_content(App $a)
                        }
 
                        $conv_responses = [
-                               'like'        => ['title' => DI::l10n()->t('Likes','title')],
-                               'dislike'     => ['title' => DI::l10n()->t('Dislikes','title')],
-                               'attendyes'   => ['title' => DI::l10n()->t('Attending','title')],
-                               'attendno'    => ['title' => DI::l10n()->t('Not attending','title')],
-                               'attendmaybe' => ['title' => DI::l10n()->t('Might attend','title')]
+                               'like'        => [],
+                               'dislike'     => [],
+                               'attendyes'   => [],
+                               'attendno'    => [],
+                               'attendmaybe' => []
                        ];
 
                        if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -1460,7 +1457,6 @@ function photos_content(App $a)
                                foreach ($items as $item) {
                                        $comment = '';
                                        $template = $tpl;
-                                       $sparkle = '';
 
                                        $activity = DI::activity();
 
@@ -1523,8 +1519,6 @@ function photos_content(App $a)
                                }
                        }
 
-                       $responses = get_responses($conv_responses, ['like', 'dislike'], $link_item);
-
                        $paginate = $pager->renderFull($total);
                }
 
@@ -1544,7 +1538,6 @@ function photos_content(App $a)
                        '$likebuttons' => $likebuttons,
                        '$like' => $like,
                        '$dislike' => $dislike,
-                       'responses' => $responses,
                        '$comments' => $comments,
                        '$paginate' => $paginate,
                ]);