wip #5851 @1

diff --git a/app/Fluidbook/Compiler.php b/app/Fluidbook/Compiler.php
index 5461ab701d86cc5c4d2da5fbebd978fe41fbb8d8..0824e459180ef36f4ed14bfa7a481f3c44e9e0e6 100644 (file)
--- a/app/Fluidbook/Compiler.php
+++ b/app/Fluidbook/Compiler.php
@@ -1711,7 +1711,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
             $socialTitle = htmlspecialchars($this->fluidbookSettings->facebook_title ?: $titre, ENT_COMPAT);
             $socialDescription = htmlspecialchars($this->fluidbookSettings->facebook_description ?: $this->fluidbookSettings->seoDescription, ENT_COMPAT);
 
-            $socialImage = 'https://toolbox.fluidbook.com/services/socialimage/' . $this->getFluidbook()->cid;
+            $socialImage = backpack_url('services/socialimage/' . $this->getFluidbook()->cid);
             $dim = self::getSocialImageSize($this->getFluidbook());
 
             $socialImageWidth = $dim[0];

diff --git a/app/Http/Controllers/Admin/Operations/Files/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/Files/DownloadOperation.php
index ad92565ab0ea7fd9513fd119e186de216dec7172..e0d73f9e1268bb41f013cc6d35a59abd3db9017f 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Files/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/Files/DownloadOperation.php
@@ -94,13 +94,13 @@ trait DownloadOperation
                                        <key>kind</key>
                                        <string>display-image</string>
                                        <key>url</key>
-                                       <string>https://toolbox.fluidbook.com/images/ios/57.png</string>
+                                       <string>'.backpack_url('images/ios/57.png').'</string>
                                </dict>
                                <dict>
                                        <key>kind</key>
                                        <string>full-size-image</string>
                                        <key>url</key>
-                                       <string>https://toolbox.fluidbook.com/images/ios/57.png</string>
+                                       <string>'.backpack_url('images/ios/57.png').'</string>
                                </dict>
                        </array>
                        <key>metadata</key>

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
index d4520467fda265e0d3b0d44600e8a93527bda08e..c8eb25da79de183a522961ab8a838741bed10f05 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
@@ -89,11 +89,8 @@ trait SocialImageOperation
                 if (!file_exists($lock) || filemtime($lock) < time() - 3600) {
                     touch($lock);
 
-                    $url = 'https://toolbox.fluidbook.com/fluidbook-publication/preview/' . $id . '_' . $fluidbook->hash . '_' . time() . '/?nointerface=1';
-                    if ((file_exists($res) && filemtime($res) < $limit) || isset($_GET['forcecompile'])) {
-                        $url .= '&force=1';
-                    }
-                    $url .= '#/page/0';
+                    $params = ['nointerface' => 1, 'force' => (file_exists($res) && filemtime($res) < $limit) || isset($_GET['forcecompile'])];
+                    $url = backpack_url('/fluidbook-publication/preview/' . $id . '_' . $fluidbook->hash . '_' . time() . '/', $params);
 
                     $w = 1200;
                     $h = 628;

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
index 562eaca67812082198d1d1e2c2187d8a75713c41..f276017d4b44cc72983a472d7742952e2a4aca25 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
 use Spatie\Permission\Models\Role;
+
 // __('!! Demandes de devis fluidbook')
 trait CreateFromWebsite
 {
@@ -104,9 +105,9 @@ trait CreateFromWebsite
             if ($post && !$spam) {
                 try {
                     $quote->slack_ts = Slack::send(Slack::fluidbookQuoteChannel, 'Demande de devis', FluidbookQuoteReceived::getMarkdown($post),
-                        ['Je vais voir' => 'https://toolbox.fluidbook.com/fluidbook-quote?status=0',
-                            'Je m\'en charge' => ['url' => 'https://toolbox.fluidbook.com/fluidbook-quote/' . $quote->id . '/assign/me', 'style' => 'primary'],
-                            'C\'est du SPAM' => ['url' => 'https://toolbox.fluidbook.com/fluidbook-quote/' . $quote->id . '/spam', 'style' => 'danger'],
+                        ['Je vais voir' => backpack_url('fluidbook-quote', ['status' => 0]),
+                            'Je m\'en charge' => ['url' => backpack_url('fluidbook-quote/' . $quote->id . '/assign/me'), 'style' => 'primary'],
+                            'C\'est du SPAM' => ['url' => backpack_url('fluidbook-quote/' . $quote->id . '/spam'), 'style' => 'danger'],
                         ], false);
                     $quote->saveQuietly();
                 } catch (\Exception $e) {

diff --git a/app/Mail/FluidbookQuoteReceived.php b/app/Mail/FluidbookQuoteReceived.php
index 8e5d2ae471445e177f2a7ee709097702687e9284..4fb56909c6894803ae73d20ba61d6f4ba092b249 100644 (file)
--- a/app/Mail/FluidbookQuoteReceived.php
+++ b/app/Mail/FluidbookQuoteReceived.php
@@ -19,7 +19,7 @@ class FluidbookQuoteReceived extends Base
         $this->subject('[Fluidbook Workshop]' . $spam . ' Demande de devis');
 
         if (!$spam) {
-            $footer = 'Veuillez-vous rendre sur la [Toolbox](https://toolbox.fluidbook.com/fluidbook-quote) pour prendre en charge la demande ou la confier à un revendeur';
+            $footer = 'Veuillez-vous rendre sur la [Toolbox](' . backpack_url('fluidbook-quote') . ') pour prendre en charge la demande ou la confier à un revendeur';
         } else {
             $footer = 'Cette demande est un SPAM supposé. Elle n\'a pas été enregistrée dans la Toolbox.';
         }

diff --git a/app/Models/File.php b/app/Models/File.php
index 095fea46f2f6c8d56cf5f3d086fd094c825e06de..fcdd05ec8169e056dec8fc0b4c75cd1b61dd3e05 100644 (file)
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+
 // __('!! Partage de fichiers')
 class File extends ToolboxModel
 {
@@ -213,6 +214,6 @@ class File extends ToolboxModel
 
     public function getURL()
     {
-        return config('url', 'https://toolbox.fluidbook.com') . '/file/' . $this->hash . '/' . $this->name;
+        return backpack_url('file/' . $this->hash . '/' . $this->name);
     }
 }

diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 80c97cc8dda79cbaee6c73f57edd6dfb0c891676..269135e0c0b26d9ab12bac23b88ce3ec21e48050 100644 (file)
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -812,7 +812,7 @@ class FluidbookTheme extends ToolboxSettingsModel
         } else {
             $get = '';
         }
-        return 'https://toolbox.fluidbook.com/fluidbook-publication/preview/20098-' . $id . '_f2e0452eed6dba9878016ce5603fdc54_' . time() . '/' . $get . '#/page/' . $page;
+        return backpack_url('fluidbook-publication/preview/20098-' . $id . '_f2e0452eed6dba9878016ce5603fdc54_' . time() . '/' . $get . '#/page/' . $page);
     }
 
 

diff --git a/app/Slack/Slack.php b/app/Slack/Slack.php
index 57a1dd26c0ed3f568dc2b818374c7cbbae2cc8ed..b9fa119c857c428a8af2aa2f93cef4da42422a72 100644 (file)
--- a/app/Slack/Slack.php
+++ b/app/Slack/Slack.php
@@ -66,7 +66,7 @@ class Slack
                     $data = ['url' => $data];
                 }
                 if (!$data['url']) {
-                    $data['url'] = 'https://toolbox.fluidbook.com/404';
+                    $data['url'] = backpack_url('404');
                 }
                 if ($i < 6) {
                     $a['elements'][] = array_merge([