(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 7660b50052890185e94003c9025041b6f0741ac3..b2ea17c6b8fb61c18f07b375f79243cf321d1576 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -225,15 +225,14 @@ class wsAjax extends cubeAjax {
                if (isset($_FILES['apns_prod']) && $_FILES['apns_prod']['error']) {\r
                        move_uploaded_file($_FILES['apns_prod']['tmp_name'], $dir . '/apns_prod.pem');\r
                }\r
-               if (isset($_FILES['back']) && !$_FILES['back']['error']) {\r
-                       $ext = CubeIT_Files::getExtension($_FILES['back']['name']);\r
-                       move_uploaded_file($_FILES['back']['tmp_name'], $wdir . '/back.' . $ext);\r
-                       $_POST['theme']['back'] = 'back.' . $ext;\r
-               }\r
-               if (isset($_FILES['etagere']) && !$_FILES['etagere']['error']) {\r
-                       $ext = CubeIT_Files::getExtension($_FILES['etagere']['name']);\r
-                       move_uploaded_file($_FILES['etagere']['tmp_name'], $wdir . '/etagere.' . $ext);\r
-                       $_POST['theme']['etagere'] = 'etagere.' . $ext;\r
+\r
+               $theme = array('back', 'etagere', 'icon', 'splash');\r
+               foreach ($theme as $t) {\r
+                       if (isset($_FILES[$t]) && !$_FILES[$t]['error']) {\r
+                               $ext = CubeIT_Files::getExtension($_FILES[$t]['name']);\r
+                               move_uploaded_file($_FILES[$t]['tmp_name'], $wdir . '/' . $t . '.' . $ext);\r
+                               $_POST['theme'][$t] = $t . '.' . $ext;\r
+                       }\r
                }\r
 \r
                foreach ($_POST['group'] as $gid => $group) {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 4e570de2eacd6481f115194bfab36608bab78ef4..761725406d08973962cb7fc6d0f81592554fc31f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -304,9 +304,9 @@ class wsUrl {
 \r
                $res.='<h3>' . __('Thème') . '</h3>';\r
                $res.='<table class="max">';\r
-               $images = array('back' => __('Image de fond'), 'etagere' => __("Image de l'étagère"));\r
+               $images = array('back' => __('Image de fond'), 'etagere' => __("Image de l'étagère"), 'icon' => __("Icône de l'application") . ' (1024x1024px)', 'splash' => __('Ecran de lancement') . ' (2048x2048px)');\r
                foreach ($images as $i => $label) {\r
-                       $res.='<tr><td class="min nowrap">' . $label . '</td><td><input type="file" name="' . $i . '" /></td></tr>';\r
+                       $res.='<tr><td class="min nowrap">' . $label . '</td><td><input type="file" name="' . $i . '" />' . form::hidden(array('theme[' . $i . ']', 'theme_' . $i), $collection->theme[$i]) . '</td></tr>';\r
                }\r
                $res.='</table>';\r
 \r