wip #4211 @0.5

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 9db165417d128d357e9a99830412fa2e8cf961ca..5768436fc0c33ea7581a61f8b999112ede8419ae 100644 (file)
--- 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 8d8a020fd7909455a02f3209b0d184e4fd4d2867..7afece1778ab9393e1a6557fa8725d421ab19914 100644 (file)
--- 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 d643a6a24356400870818702c67b16fa47cc1212..6e8dc40c5e938b4aebd73585375f6c462e789ce6 100644 (file)
--- 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
             }\r
         }\r
 \r
+        if ($attrs['type'] === 'FilesOrURL' && $f['fileFilter']) {\r
+            $attrs['accept'] = explode(';', $f['fileFilter']->extensions);\r
+        }\r
 \r
-        $attrs['fake'] = true;\r
-        $attrs['store_in'] = 'settings';\r
         $attrs['translatable'] = false;\r
 \r
         return $this->generateV3Field($attrs, $tab);\r