(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 9acb02967bcdce3c5912c81760f3fbd1d924fa5b..7e930fa4fed9051f7f9aebbcb41e1df912382dfd 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -9,6 +9,20 @@ class wsDroits {
                $nav[__('Publications')] = 'publications';\r
                return $nav;\r
        }\r
+\r
+       public static function getSignatures()\r
+       {\r
+               global $core;\r
+\r
+               $dao = new wsDAOSignature($core->con);\r
+\r
+               $signatures = $dao->selectAll();\r
+               $res = array();\r
+               foreach($signatures as $signature) {\r
+                       $res[$signature->nom] = $signature->signature_id;\r
+               }\r
+               return $res;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 37d878f095bc760412f1134a0e708763faa4aa2e..7c2eae3590b9cadd4c6cfc2b6eb846cb28984a95 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -298,7 +298,7 @@ class wsFlash extends cubeFlashGateway {
                $book = $dao->selectById($this->args['book_id']);\r
                fb($book->parametres->getForms());\r
                foreach($book->parametres->getForms() as $name) {\r
-                       $f = $this->xml->addChild('form', json_encode($book->parametres->getForm($name)));\r
+                       $f = $this->xml->addChild('form', html::escapeHTML(json_encode($book->parametres->getForm($name))));\r
                        $f->addAttribute('name', $name);\r
                }\r
        }\r

diff --git a/inc/ws/DAO/_common.php b/inc/ws/DAO/_common.php
index c2822b216d1984fe2bc6698f4b7ba36190af5576..aeb5f343fc27169d3cbc201a83b796bd35f7f2a4 100644 (file)
--- a/inc/ws/DAO/_common.php
+++ b/inc/ws/DAO/_common.php
@@ -4,5 +4,6 @@ $__autoload['wsDAODocument'] = dirname(__FILE__) . '/class.ws.dao.document.php';
 $__autoload['wsDAOTheme'] = dirname(__FILE__) . '/class.ws.dao.theme.php';\r
 $__autoload['wsDAOIcone'] = dirname(__FILE__) . '/class.ws.dao.icone.php';\r
 $__autoload['wsDAOLang'] = dirname(__FILE__) . '/class.ws.dao.lang.php';\r
+$__autoload['wsDAOSignature'] = dirname(__FILE__) . '/class.ws.dao.signature.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 7747f63e80c00daf4c99e9825e49c80c9b1dd19a..94d57be40dea8ecd5167fb121143146a913b7661 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -327,7 +327,7 @@ class wsDAOBook extends extranetDAO {
                $parametres = $book->parametres;\r
                $new = json_decode($settings, false);\r
                foreach($new as $k => $v) {\r
-                       if($k=='_empty_'){\r
+                       if ($k == '_empty_') {\r
                                continue;\r
                        }\r
                        $parametres->$k = $v;\r
@@ -526,6 +526,14 @@ class wsDAOBook extends extranetDAO {
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($book_id, true);\r
 \r
+               $daoSignature = new wsDAOSignature($this->con);\r
+               $signature = $daoSignature->selectById($book->parametres->signature);\r
+\r
+               $exportSignature = array('main' => $signature->main,\r
+                       'mainLink' => $signature->mainLink,\r
+                       'partner' => $signature->partner,\r
+                       'partnerLink' => $signature->partnerLink);\r
+\r
                $index = '';\r
                $textes = '';\r
 \r
@@ -534,6 +542,7 @@ class wsDAOBook extends extranetDAO {
                $flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flex->addVariable('links', $book->links);\r
+               $flex->addVariable('signature', $exportSignature);\r
                $flexLight->addVariable('datas', $book->parametres->toStandardObject());\r
                $flexLight->addVariable('id', $book_id, false, true, 'uint');\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.signature.php b/inc/ws/DAO/class.ws.dao.signature.php
new file mode 100644 (file)
index 0000000..327395c
--- /dev/null
+++ b/inc/ws/DAO/class.ws.dao.signature.php
@@ -0,0 +1,28 @@
+<?php\r
+class wsDAOSignature extends extranetDAO {\r
+       protected function singleton($r)\r
+       {\r
+               $signature = new wsSignature();\r
+               $signature->signature_id = $r->signature_id;\r
+               $signature->nom = $r->nom;\r
+               $signature->main = $r->fbcredit;\r
+               $signature->mainLink = $r->fblink;\r
+               $signature->partner = $r->partnercredit;\r
+               $signature->partnerLink = $r->partnerlink;\r
+               return $signature;\r
+       }\r
+\r
+       public function selectById($signature_id)\r
+       {\r
+               $r = $this->con->select('SELECT * FROM signatures WHERE signature_id=\'' . $this->con->escape($signature_id) . '\'');\r
+               return $this->singleton($r);\r
+       }\r
+\r
+       public function selectAll()\r
+       {\r
+               $r = $this->con->select('SELECT * FROM signatures ORDER BY signature_id');\r
+               return $this->factory($r);\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 27c9ddacd742b981b819a7fc9e5a798ab1e87479..7f9d662d30bde4d98da5608476d7cfc6c2183a18 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -11,5 +11,6 @@ $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.lo
 $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';\r
 $__autoload['wsIcone'] = dirname(__FILE__) . '/class.ws.icone.php';\r
 $__autoload['wsLang'] = dirname(__FILE__) . '/class.ws.lang.php';\r
+$__autoload['wsSignature'] = dirname(__FILE__) . '/class.ws.signature.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index bcaec9e044bc120fd9b95c6d91fce111ae644a69..84ca2d4855df014ce1ada6c6c8a5add303faf06f 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -18,8 +18,9 @@ class wsBookParametres extends wsParametres {
                }\r
                $this->fields['title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de la publication"), 'extra' => false, 'grade' => 1);\r
                $this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"), 'extra' => false, 'grade' => 1);\r
+               $this->fields['signature'] = array('type' => 'combo', 'default' => '1', 'editable' => true, 'label' => __('Signature'), 'extra' => false, 'grade' => 3, 'datas' => wsDroits::getSignatures());\r
                $this->forms['important'] = array('label' => __('Description de la publication'),\r
-                       'fieldsnames' => array('title', 'url_link'));\r
+                       'fieldsnames' => array('title', 'url_link', 'signature'));\r
                // .\r
                // .\r
                $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'), 'extra' => false, 'grade' => 1);\r

diff --git a/inc/ws/Metier/class.ws.signature.php b/inc/ws/Metier/class.ws.signature.php
new file mode 100644 (file)
index 0000000..110821a
--- /dev/null
+++ b/inc/ws/Metier/class.ws.signature.php
@@ -0,0 +1,11 @@
+<?php\r
+class wsSignature extends cubeMetier {\r
+       protected $signature_id;\r
+       protected $nom;\r
+       protected $main;\r
+       protected $mainLink;\r
+       protected $partner;\r
+       protected $partnerLink;\r
+}\r
+\r
+?>
\ No newline at end of file