From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 29 Jul 2021 14:01:53 +0000 (+0000)
Subject: wip #4211 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=23688d173273e0b8544e381fcca6a6f44e87daf0;p=cubeextranet.git

wip #4211 @0.5
---

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 9db165417..5768436fc 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1475,10 +1475,10 @@ class wsMaintenance
         }
     }
 
-    public static function themeParams()
+    public static function bookParams()
     {
-        $parent = new wsTheme();
-        $t = new wsThemeParametres($parent);
+        $parent = new wsBook();
+        $t = new wsBookParametres($parent);
         $t->generateV3Form(false);
     }
 
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 8d8a020fd..7afece177 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -170,8 +170,8 @@ class wsBookParametres extends wsParametres
         $this->fields['widgetQuality'] = array('type' => 'integer', 'default' => 85, 'min' => 0, 'max' => 100, 'editable' => false, 'label' => __('Qualité JPEG'), 'grade' => 3);
         $this->fields['widgetStart'] = array('type' => 'integer', 'default' => 1, 'editable' => false, 'label' => __('Page de début'), 'grade' => 3);
         $this->fields['widgetEnd'] = array('type' => 'integer', 'default' => 8, 'editable' => false, 'label' => __('Page de fin'), 'grade' => 3);
-        $this->forms['widget'] = array('label' => __('Widget') . ' (' . __('Mini Fluidbook') . ')',
-            'fieldsnames' => array('widget', 'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd'));
+//        $this->forms['widget'] = array('label' => __('Widget') . ' (' . __('Mini Fluidbook') . ')',
+//            'fieldsnames' => array('widget', 'widgetCover', 'widgetSize', 'widgetQuality', 'widgetStart', 'widgetEnd'));
         $this->fields['extras'] = array('type' => 'textarea', 'default' => '', 'editable' => false, 'label' => __('Extras'), 'grade' => 3);
         $this->fields['v1SWF'] = array('type' => 'freefile', 'default' => '', 'editable' => false,
             'label' => __('Index.swf spécifique'), 'grade' => 5, 'fileFilter' => $swfFilter);
diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index d643a6a24..6e8dc40c5 100644
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -402,9 +402,10 @@ class wsParametres extends cubeMetier implements Iterator
             }
         }
 
+        if ($attrs['type'] === 'FilesOrURL' && $f['fileFilter']) {
+            $attrs['accept'] = explode(';', $f['fileFilter']->extensions);
+        }
 
-        $attrs['fake'] = true;
-        $attrs['store_in'] = 'settings';
         $attrs['translatable'] = false;
 
         return $this->generateV3Field($attrs, $tab);