wip #7868 @1.5

diff --git a/app/Fluidbook/LinkShortener.php b/app/Fluidbook/LinkShortener.php
index 65102b52adad213910587b34bde4161e185484c2..cc14aec9e2f03154e541efafeafa6f17600f45af 100644 (file)
--- a/app/Fluidbook/LinkShortener.php
+++ b/app/Fluidbook/LinkShortener.php
@@ -6,11 +6,14 @@ use GuzzleHttp\Client;
 
 class LinkShortener
 {
-    protected static $shorteners = ['l.fluidbook.com' => '324507fb8d'];
 
     public static function getAvaiableShorteners()
     {
-        return array_keys(self::$shorteners);
+        $res = [];
+        foreach (\App\Models\LinkShortener::all() as $server) {
+            $res[$server->id] = $server->url;
+        }
+        return $res;
     }
 
     public static function shorturl($url, $shortener)

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 76bd31bfaebe02c20966686e20eb1a34cc2b5655..d9ae9160f9326976865a809100c186d2dd7497d0 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -73,11 +73,6 @@ use Cubist\Util\Str;
 use Datetime;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use League\CommonMark\Environment\Environment;
-use League\CommonMark\Extension\Autolink\AutolinkExtension;
-use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
-use League\CommonMark\Extension\Table\TableExtension;
-use League\CommonMark\MarkdownConverter;
 use League\CommonMark\Exception\CommonMarkException;
 use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\KimplayOperation;
 

diff --git a/app/Models/LinkShortener.php b/app/Models/LinkShortener.php
index 019b3857b8bfab019a3a44af2ad7d5ffa850eeeb..c7e2191347e0bdef76b2151dd94e688fd326a651 100644 (file)
--- a/app/Models/LinkShortener.php
+++ b/app/Models/LinkShortener.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Models\Base\ToolboxModel;
+use Cubist\Backpack\Magic\Fields\Text;
 
 class LinkShortener extends ToolboxModel
 {
@@ -20,6 +21,9 @@ class LinkShortener extends ToolboxModel
     {
         parent::setFields();
 
+        $this->addField('url', Text::class, __('URL'), ['column' => true]);
         $this->addOwnerField();
+        $this->addField('api_key', Text::class, __('Clé d\'API'));
+
     }
 }

diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index 308668ba2b094a69a94ec33b58f63d65292cf558..21595a181d98ed26c1fa880e0a0d8a87d783ec49 100644 (file)
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -1105,9 +1105,9 @@ trait PublicationSettings
         $this->_addSettingField('', FormSeparator::class);
         $this->_addSettingField('autolinkRule', SelectFromArray::class, $this->__('Règle pour l\'ajout des liens via excel'), ["default" => "web", 'options' => ['web' => 'Lien web', 'cart' => __('Lien panier'), 'steelite' => 'Steelite']]);
         $this->_addSettingField('', FormSeparator::class);
-        $options = ['none' => $this->__('Aucun')];
-        foreach (LinkShortener::getAvaiableShorteners() as $shortener) {
-            $options[$shortener] = $shortener;
+        $options = [0 => $this->__('Aucun')];
+        foreach (LinkShortener::getAvaiableShorteners() as $id => $shortener) {
+            $options[$id] = $shortener;
         }
         $this->_addSettingField('linkShortener', SelectFromArray::class, $this->__('Raccourcisseur de liens'), ['default' => 'none', 'options' => $options]);