From d8501f2b331ca0b62611a742591669ebc9c373d0 Mon Sep 17 00:00:00 2001
From: SergiX44 <sergio@brighenti.me>
Date: Wed, 18 Aug 2021 08:57:15 +0200
Subject: [PATCH] changed url building

---
 app/Controllers/MediaController.php     |  4 ++--
 app/Factories/ViewFactory.php           |  1 +
 app/helpers.php                         | 11 +++++++++++
 resources/templates/dashboard/grid.twig |  2 +-
 resources/templates/dashboard/list.twig |  2 +-
 resources/templates/upload/public.twig  |  2 +-
 resources/templates/user/edit.twig      |  4 ++--
 src/css/app.css                         |  7 ++++++-
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/MediaController.php b/app/Controllers/MediaController.php
index c050bd4..3648796 100644
--- a/app/Controllers/MediaController.php
+++ b/app/Controllers/MediaController.php
@@ -84,8 +84,8 @@ class MediaController extends Controller
             'delete_token' => $token,
             'media' => $media,
             'type' => $type,
-            'url' => urlFor("/{$userCode}/{$mediaCode}"),
-            'copy_raw' => $this->getSetting('copy_url_behavior', 'off') === 'raw',
+            'url' => urlFor(glue($userCode, $mediaCode)),
+            'copy_raw' => $this->session->get('copy_raw', false),
         ]);
     }
 
diff --git a/app/Factories/ViewFactory.php b/app/Factories/ViewFactory.php
index f20f77d..48ee204 100644
--- a/app/Factories/ViewFactory.php
+++ b/app/Factories/ViewFactory.php
@@ -42,6 +42,7 @@ class ViewFactory
         $twig->addFunction(new TwigFunction('inPath', 'inPath'));
         $twig->addFunction(new TwigFunction('humanFileSize', 'humanFileSize'));
         $twig->addFunction(new TwigFunction('param', 'param'));
+        $twig->addFunction(new TwigFunction('glue', 'glue'));
 
         return new View($twig);
     }
diff --git a/app/helpers.php b/app/helpers.php
index fafee40..a6f850c 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -493,3 +493,14 @@ if (!function_exists('isSecure')) {
             || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] === 443);
     }
 }
+
+if (!function_exists('glue')) {
+    /**
+     * @param  mixed  ...$pieces
+     * @return string
+     */
+    function glue(...$pieces): string
+    {
+        return '/'.implode('/', $pieces);
+    }
+}
diff --git a/resources/templates/dashboard/grid.twig b/resources/templates/dashboard/grid.twig
index 64cd0f7..718d15f 100644
--- a/resources/templates/dashboard/grid.twig
+++ b/resources/templates/dashboard/grid.twig
@@ -19,7 +19,7 @@
                                             <div class="pl-3 pt-2d5"><span class="badge badge-dark shadow-lg">{{ media.size }}</span></div>
                                             <div class="text-right pr-3 pt-2d5">
                                                 <div class="btn-group shadow-lg">
-                                                    <button type="button" class="btn btn-sm btn-success btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ urlFor('/' ~ media.user_code ~ '/' ~ media.code ~ '.' ~ media.extension) }}{{ copy_raw ? '/raw.' ~ media.extension }}">
+                                                    <button type="button" class="btn btn-sm btn-success btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ urlFor(glue(media.user_code, media.code) ~ (copy_raw ? '/raw.' ~ media.extension : '.' ~ media.extension)) }}">
                                                         <i class="fas fa-link"></i>
                                                     </button>
                                                     <a href="{{ urlFor('/' ~ media.user_code ~ '/' ~ media.code ~ '.' ~ media.extension ~ '/download') }}" class="btn btn-sm btn-secondary" data-toggle="tooltip" title="{{ lang('download') }}"><i class="fas fa-cloud-download-alt"></i></a>
diff --git a/resources/templates/dashboard/list.twig b/resources/templates/dashboard/list.twig
index 40697ba..68cb08e 100644
--- a/resources/templates/dashboard/list.twig
+++ b/resources/templates/dashboard/list.twig
@@ -68,7 +68,7 @@
                                                     {% if media.username is not null %}
                                                         <a href="{{ urlFor('/' ~ media.user_code ~ '/' ~ media.code ~ '.' ~ media.extension) }}" class="btn btn-sm btn-outline-secondary" data-toggle="tooltip" title="{{ lang('open') }}" target="_blank"><i class="fas fa-external-link-alt"></i></a>
                                                         <a href="{{ urlFor('/' ~ media.user_code ~ '/' ~ media.code ~ '.' ~ media.extension ~ '/download') }}" class="btn btn-sm btn-outline-primary" data-toggle="tooltip" title="{{ lang('download') }}"><i class="fas fa-cloud-download-alt"></i></a>
-                                                        <a href="javascript:void(0)" class="btn btn-sm btn-outline-success btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ urlFor('/' ~ media.user_code ~ '/' ~ media.code ~ '.' ~ media.extension) }}{{ copy_raw ? '/raw.' ~ media.extension }}"><i class="fas fa-link"></i></a>
+                                                        <a href="javascript:void(0)" class="btn btn-sm btn-outline-success btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ urlFor(glue(media.user_code, media.code) ~ (copy_raw ? '/raw.' ~ media.extension : '.' ~ media.extension)) }}"><i class="fas fa-link"></i></a>
                                                     {% else %}
                                                         <a href="{{ route('upload.raw', {'id': media.id}) }}" class="btn btn-sm btn-outline-dark" data-toggle="tooltip" title="{{ lang('raw') }}" target="_blank"><i class="fas fa-external-link-alt"></i></a>
                                                     {% endif %}
diff --git a/resources/templates/upload/public.twig b/resources/templates/upload/public.twig
index 1670781..097c774 100644
--- a/resources/templates/upload/public.twig
+++ b/resources/templates/upload/public.twig
@@ -31,7 +31,7 @@
             </button>
             <div class="collapse navbar-collapse" id="navbarCollapse">
                 <div class="ml-auto">
-                    <a href="javascript:void(0)" class="btn btn-success my-2 my-sm-0 btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ url }}{{ copy_raw ? '/raw.' ~ media.extension }}"><i class="fas fa-link fa-lg fa-fw"></i></a>
+                    <a href="javascript:void(0)" class="btn btn-success my-2 my-sm-0 btn-clipboard" data-toggle="tooltip" title="{{ lang('copy_link') }}" data-clipboard-text="{{ urlFor(glue(media.user_code, media.code) ~ (copy_raw ? '/raw.' ~ media.extension : '.' ~ media.extension)) }}"><i class="fas fa-link fa-lg fa-fw"></i></a>
                     <a href="{{ url }}/raw" class="btn btn-secondary my-2 my-sm-0" data-toggle="tooltip" title="{{ lang('raw') }}"><i class="fas fa-file-alt fa-lg fa-fw"></i></a>
                     <a href="{{ url }}/download" class="btn btn-warning my-2 my-sm-0" data-toggle="tooltip" title="{{ lang('download') }}"><i class="fas fa-cloud-download-alt fa-lg fa-fw"></i></a>
                     {% if session.get('logged') %}
diff --git a/resources/templates/user/edit.twig b/resources/templates/user/edit.twig
index d2d4392..605ac56 100644
--- a/resources/templates/user/edit.twig
+++ b/resources/templates/user/edit.twig
@@ -40,7 +40,7 @@
                                 <label for="token" class="col-sm-3 col-form-label">{{ lang('token') }}</label>
                                 <div class="col-sm-9">
                                     <div class="input-group">
-                                        <input type="text" id="token" class="form-control" value="{{ user.token }}" readonly>
+                                        <input type="text" id="token" class="form-control privacy-blur" value="{{ user.token }}" readonly>
                                         <div class="input-group-append">
                                             <button class="btn btn-outline-success btn-clipboard" type="button" data-clipboard-target="#token"><i class="fas fa-fw fa-copy"></i> {{ lang('copy') }}</button>
                                             <button class="btn btn-outline-primary refresh-token" data-id="{{ user.id }}" type="button"><i class="fas fa-fw fa-sync"></i> {{ lang('update') }}</button>
@@ -133,4 +133,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/css/app.css b/src/css/app.css
index e379c8d..70ab0d3 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -223,4 +223,9 @@ body {
 
 .hljs-ln-code {
     padding-left: 5px !important;
-}
\ No newline at end of file
+}
+
+.privacy-blur:not(:focus) {
+    color: transparent;
+    text-shadow: 0 0 5px rgba(0,0,0,0.5);
+}