From 6277142a8d6d44d09413be7450d8ecbade9225c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Tue, 18 May 2021 21:37:42 +0200
Subject: [PATCH] parse url and mails on messages

---
 IDEAS.md                              |  1 +
 app/Lib/Utils.php                     | 29 +++++++++++++++++++++++++++
 config/app.php                        |  3 ++-
 resources/views/ticket/show.blade.php | 21 ++++++++++---------
 4 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 app/Lib/Utils.php

diff --git a/IDEAS.md b/IDEAS.md
index 955f56f..e7e5c79 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -1,3 +1,4 @@
 - Permettre à un user de suivre un projet
 - permettre d'insérer des @user dans le texte avec lien vers user
 - permettre de modifier son mot de passe ? (je crois que ça n'as pas été mis exprès)
+- ~~parser les liens http~~
diff --git a/app/Lib/Utils.php b/app/Lib/Utils.php
new file mode 100644
index 0000000..10c11b6
--- /dev/null
+++ b/app/Lib/Utils.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Lib;
+
+class Utils
+{
+    public static function plainToHtml(string $text)
+    {
+        $text = e($text);
+        // url replace and email replace
+        $text = preg_replace_callback(
+            '/([^\s@]+@([^\s@.,]+\.)+[^\s@.,]{2,})|(?:http[s]?:\/\/.)?(?:www\.)?[-a-zA-Z0-9@%._\+~#=]{2,256}\.[a-z]{2,6}\b(?:[-a-zA-Z0-9@:%_\+.~#?&\/\/=]*)/',
+            function ($matches) {
+                $match = collect($matches)->first() ?? '';
+                if (filter_var($match, FILTER_VALIDATE_EMAIL)) {
+                    return strlen($match) ? "<a href=\"mailto:$match\">$match</a>" : $match;
+                } else {
+                    $url = $match;
+                    if (\strpos($url, 'http') === false and \strpos($url, 'https') === false) {
+                        $url = sprintf('http://%s', $url);
+                    }
+                    return strlen($match) ? "<a href=\"$url\" target=\"_blank\">$match</a>" : $match;
+                }
+            },
+            $text
+        );
+        return nl2br($text);
+    }
+}
diff --git a/config/app.php b/config/app.php
index c697c9a..58b8ecc 100644
--- a/config/app.php
+++ b/config/app.php
@@ -227,7 +227,8 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
         'TicketType' => App\Enums\TicketType::class,
-        'TicketStatus' => App\Enums\TicketStatus::class
+        'TicketStatus' => App\Enums\TicketStatus::class,
+        'Utils' => App\Lib\Utils::class
     ],
 
 ];
diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index 534746c..a54a661 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -96,22 +96,23 @@
         @foreach ($messages as $message)
             @if ($message->user_id === null)
             <div class="offset-md-3 col-md-6 alert alert-secondary text-center">
-                {!! nl2br(e($message->message)) !!} - Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} <small class="text-muted">(Message système)</small>
+                {!! nl2br(e($message->message)) !!} - Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}}
+                <small class="text-muted">(Message système)</small>
             </div>
             @elseif ($message->user_id === Auth::user()->id)
-            <div class="offset-md-4 col-md-8 alert alert-primary text-right">
-                {!! nl2br(e($message->message)) !!}<br>
+            <div class="offset-md-4 col-md-8 alert alert-primary">
+                {!! Utils::plainToHtml($message->message) !!}
                 @if ($message->file !== null)
-                    <a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
-                @endif
+                <br><a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
+                @endif<br><br>
                 <small class="text-muted">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $message->user->name }}</small>
             </div>
             @else
-            <div class="col-md-8 alert alert-success text-left">
-                {!! nl2br(e($message->message)) !!}<br>
+            <div class="col-md-8 alert alert-success">
+                {!! Utils::plainToHtml($message->message) !!}
                 @if ($message->file !== null)
-                    <a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
-                @endif
+                    <br><a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
+                @endif<br><br>
                 <small class="text-muted">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $message->user->name }}</small>
             </div>
             @endif
@@ -120,7 +121,7 @@
     <hr>
     <div>
         <h4>Description</h4>
-        <p>{!! nl2br(e($ticket->text)) !!}</p>
+        <p>{!! Utils::plainToHtml($ticket->text) !!}</p>
         <small class="text-muted">Créé le {{ \Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i') }} par <b>{{ $ticket->user->name }}</b></small>
     </div>
     @if ($ticket->file !== null || $ticket->file2 !== null)