From 5a982508676012db3f6654f2a6b4488cbaaf0730 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 29 Apr 2010 08:15:26 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.flash.php | 17 ++++++++- inc/ws/DAO/class.ws.dao.theme.php | 37 +++++++++++++++++--- inc/ws/Metier/class.ws.theme.parametres.php | 6 ++-- swf/_src/wsComposer.fla | Bin 664064 -> 664064 bytes 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 405d6012c..e4650a5a7 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -144,7 +144,6 @@ class wsFlash extends cubeFlashGateway { if (isset($this->args['book_id'])) { $dao = new wsDAOBook($core->con); $book = $dao->selectById($this->args['book_id']); - } $dao = new wsDAOTheme($core->con); @@ -170,6 +169,22 @@ class wsFlash extends cubeFlashGateway { } } + public function deleteTheme() + { + global $core; + + $dao = new wsDAOTheme($core->con); + $dao->delete($this->args['theme_id']); + } + + public function renameTheme() + { + global $core; + + $dao = new wsDAOTheme($core->con); + $dao->rename($this->args['theme_id'], $this->args['text']); + } + public function duplicateTheme() { global $core; diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php index 3927572d7..ff2e0dbba 100644 --- a/inc/ws/DAO/class.ws.dao.theme.php +++ b/inc/ws/DAO/class.ws.dao.theme.php @@ -54,8 +54,30 @@ class wsDAOTheme extends extranetDAO { return $r->theme_id + 1; } + public function delete($theme_id) + { + if (is_null($theme_id) || $theme_id == '') { + return; + } + $this->con->execute('DELETE FROM themes WHERE theme_id=\'' . $this->con->escape($theme_id) . '\''); + if (file_exists(ROOT . '/themes/' . $theme_id)) { + files::deltree(ROOT . '/themes/' . $theme_id); + unlink(ROOT . '/themes/' . $theme_id . '.jpg'); + } + } + + public function rename($theme_id, $newname) + { + $c = $this->con->openCursor('themes'); + $c->nom = $newname; + $c->update('WHERE theme_id=\'' . $this->con->escape($theme_id) . '\''); + } + public function duplicate($theme_id, $proprietaire) { + if (is_null($theme_id) || $theme_id == '') { + return; + } $theme = $this->selectById($theme_id); // Copie des données $c = $this->con->openCursor('themes'); @@ -68,16 +90,23 @@ class wsDAOTheme extends extranetDAO { $c->date = TIME; $c->insert(); // Copie des fichiers - $from = ROOT . '/themes/' . $theme_id . '/'; - $to = ROOT . '/themes/' . $c->theme_id . '/'; + $from = ROOT . '/themes/' . $theme_id ; + $to = ROOT . '/themes/' . $c->theme_id; $dr = opendir($from); if (!file_exists($to)) { mkdir($to, 0777, true); - } while ($file = readdir($dr)) { + } else { + files::deltree($to); + mkdir($to, 0777, true); + } //. + while ($file = readdir($dr)) { if ($file == '.' || $file == '..') { continue; } - copy($from . $file, $to . $file); + copy($from . '/' . $file, $to . '/' . $file); + } + if (file_exists($from . '.jpg')) { + copy($from . '.jpg', $to . '.jpg'); } return $this->selectById($c->theme_id); diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php index e80129150..533f143be 100644 --- a/inc/ws/Metier/class.ws.theme.parametres.php +++ b/inc/ws/Metier/class.ws.theme.parametres.php @@ -87,6 +87,8 @@ class wsThemeParametres extends wsParametres { 'label' => __("Afficher le reflet sur la page"), 'extra' => true, 'grade' => 4); $this->fields['usePageEdges'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher la bordure des pages"), 'extra' => true, 'grade' => 4); + $this->fields['pageEdgeColor'] = array('type' => 'couleur', 'default' => 'cccccc', 'editable' => true, + 'label' => __('Couleur de la bordure'), 'extra' => true, 'grade' => 4); $this->fields['arrowsColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true, 'label' => __('Couleur des flèches'), 'extra' => true, 'grade' => 4); $this->fields['displayPageNumber'] = array('type' => 'boolean', 'default' => true, 'editable' => true, @@ -105,12 +107,12 @@ class wsThemeParametres extends wsParametres { $this->forms['bouton'] = array('label' => __('Personnalisation des boutons'), 'fieldsnames' => array('couleurA', 'arrowsColor')); $this->forms['icones'] = array('label' => __('Personnalisation des icônes'), - 'fieldsnames' => array('iconSet','iconShadColor','|', 'colorizeIcons', 'couleurI')); + 'fieldsnames' => array('iconSet', 'iconShadColor', '|', 'colorizeIcons', 'couleurI')); $this->forms['pagesbar'] = array('label' => __('Personnalisation de la barre des pages'), 'fieldsnames' => array('pagesBar')); $this->forms['book'] = array('label' => __('Personnalisation du fluidbook'), 'fieldsnames' => array('pageReflection', 'shadeAlpha', - '|', 'usePageEdges', + '|', 'usePageEdges', 'pageEdgeColor', '|', 'bookShadeColor', 'bookShadeAlpha', '|', 'displayPageNumber', 'colorPageNumber', '|', 'linksColor')); diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla index 856700c04643db14639ebe8a514b0ff4065c9529..9911b480dc765e628bb3b17ea67da11843c7a2e4 100644 GIT binary patch delta 9016 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 LTHfUbUPJ#6*>agM delta 3170 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 -- 2.39.5