(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index fc0cd4f4efa070c68f3e118c24920c0606efcd54..df7139e9a800b54ca02e8d35b504ff1365618c4a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -65,7 +65,7 @@ class wsAjax extends cubeAjax {
                }\r
                $x->addClosePopup();\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
-               $x->addTruePopup(SITE_PATH . 'editbook/' . $book->book_id);\r
+               $x->addTruePopup(SITE_PATH . 'editor/' . $book->book_id);\r
        }\r
 \r
        public static function changeBookProprietaire($args, &$x)\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 84cee528e64deab99c37453133e06e04dd6243cd..c0c997fadada826e1ec6fb2348a0f8afd27f693d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -46,8 +46,8 @@ class wsFlash extends cubeFlashGateway {
                                continue;\r
                        }\r
                        $fname = cubeFiles::tidyName($infos['name']);\r
-                       $dest = '/themes/' . $this->args['theme_id'] . '/' . $fname;\r
-                       move_uploaded_file($infos['tmp_name'], ROOT . $dest);\r
+                       $dest = '/' . $this->args['theme_id'] . '/' . $fname;\r
+                       move_uploaded_file($infos['tmp_name'], WS_THEMES . $dest);\r
                        $this->xml->addChild('file', $fname);\r
                        return;\r
                }\r

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 53a39478872d1624db77b43a7e35683962fe4f9b..19991a388b0968e5a3fd2359bdceac566b5acbe1 100644 (file)
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -10,6 +10,9 @@ class wsThemeParametres extends wsParametres {
                if (is_null($this->parent)) {\r
                        return;\r
                }\r
+\r
+               $themeRoot = 'fluidbook/themes/' . $this->parent->theme_id;\r
+\r
                parent::initFields();\r
                /* Navigation */\r
                $this->fields['couleurA'] = array('type' => 'couleurAlpha', 'default' => '', 'editable' => true,\r
@@ -62,9 +65,9 @@ class wsThemeParametres extends wsParametres {
                $this->fields['linksColor'] = array('type' => 'couleur', 'default' => '$couleurA', 'editable' => true,\r
                        'label' => __('Couleur des liens'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
-                       'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200);\r
+                       'label' => __('Marge supplémentaire horizontale'), 'extra' => false, 'grade' => 1, 'min' => 0, 'max' => 200);\r
                $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true,\r
-                       'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1,'min'=>0,'max'=>200);\r
+                       'label' => __('Marge supplémentaire verticale'), 'extra' => false, 'grade' => 1, 'min' => 0, 'max' => 200);\r
                $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'dddddd', 'editable' => true,\r
                        'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4);\r
                /* Credits */\r
@@ -77,7 +80,7 @@ class wsThemeParametres extends wsParametres {
                        'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4);\r
                $this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true,\r
                        'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,\r
-                       'path' => 'themes/' . $this->parent->theme_id,\r
+                       'path' => $themeRoot,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
                $this->fields['repeat'] = array('type' => 'combo',\r
                        'datas' => array(__('Etirer') => wsTheme::STRETCH,\r
@@ -104,19 +107,19 @@ class wsThemeParametres extends wsParametres {
                        'label' => __('Utiliser une image de fond'), 'extra' => true, 'grade' => 4);\r
                $this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true,\r
                        'label' => __('Image de fond'), 'extra' => false, 'grade' => 3,\r
-                       'path' => 'themes/' . $this->parent->theme_id,\r
+                       'path' => $themeRoot,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
                $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,\r
                        'label' => __("Intervertir le menu et le logo"), 'extra' => true, 'grade' => 4);\r
                /* Menu bar logo */\r
                $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,\r
                        'label' => __('Image'), 'extra' => false, 'grade' => 3,\r
-                       'path' => 'themes/' . $this->parent->theme_id,\r
+                       'path' => $themeRoot,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
                /* Loader */\r
                $this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true,\r
                        'label' => __('Logo affiché au chargement'), 'extra' => false, 'grade' => 3,\r
-                       'path' => 'themes/' . $this->parent->theme_id,\r
+                       'path' => $themeRoot,\r
                        'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);\r
                $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,\r
                        'label' => __("Couleur du fond"), 'extra' => false, 'grade' => 3);\r
@@ -136,7 +139,7 @@ class wsThemeParametres extends wsParametres {
                $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'),\r
                        'fieldsnames' => array('couleurA', 'arrowsColor'));\r
                $this->forms['icones'] = array('label' => __('Personnalisation des icônes'),\r
-                       'fieldsnames' => array('iconSet',  'iconShadeColor','|','iconsTMargin','iconsHMargin', '|', 'colorizeIcons', 'couleurI'));\r
+                       'fieldsnames' => array('iconSet', 'iconShadeColor', '|', 'iconsTMargin', 'iconsHMargin', '|', 'colorizeIcons', 'couleurI'));\r
                $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'),\r
                        'fieldsnames' => array('pagesBar', 'pageBarThumbBack'));\r
                $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),\r