(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index df7139e9a800b54ca02e8d35b504ff1365618c4a..c2bc4baf4c6a161aefe1154a3f1df348fb66ccaf 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -59,10 +59,11 @@ class wsAjax extends cubeAjax {
                global $core;\r
                $dao = new wsDAOBook($core->con);\r
                if ($_POST['book'] != '') {\r
-                       $book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id);\r
+                       $book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id,$_POST['title']);\r
                } else {\r
-                       $book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang);\r
+                       $book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang,$_POST['title']);\r
                }\r
+\r
                $x->addClosePopup();\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
                $x->addTruePopup(SITE_PATH . 'editor/' . $book->book_id);\r
@@ -77,7 +78,7 @@ class wsAjax extends cubeAjax {
                }\r
                $x->addOk('book_proprietaire');\r
                $dao = new wsDAOBook($core->con);\r
-               $dao->setProprietaire($args[1],$_POST['proprietaire']);\r
+               $dao->setProprietaire($args[1], $_POST['proprietaire']);\r
                $x->addClosePopup();\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
        }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 9b8bf34b5d10ee9f37956ad3a20ad32dfe02a79f..b9e1a05791236d82b2eaa6a8d25a2b5c92560b20 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -229,6 +229,8 @@ html{height:100%}' . "\n";
        {\r
                $res = '<tr><td colspan="2"><p style="width:600px;text-align:justify;"><em>' . __("Si votre nouvelle publication a des paramètres en commun avec une publication existante, veuillez rechercher cette publication afin d'attribuer par défaut à votre nouvelle publication les paramètres de l'existante") . '</em></p></td></tr>';\r
                $res .= '<tr><td>' . __('Rechercher une publication') . ' : </td><td>' . form::field('book_nom', 64, 1024) . form::hidden('book', '') . '</td></tr>';\r
+       //      $res .= '<tr><td colspan="2"><hr /></td></tr>';\r
+               $res .= '<tr><td>' . __('Indiquez le titre de votre nouvelle publication') . '</td><td>' . form::field('title', 64, 1024) . '</td></tr>';\r
                return $res;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 3b020b94d7e3f2fac6fc7d3c6abcdcd6521ca9e6..7e941ae698614a8d13f08539b8e13ea4394d6eb4 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -103,7 +103,7 @@ class wsDAOBook extends extranetDAO {
                return $this->selectById($book_id);\r
        }\r
 \r
-       public function duplicate($book_id, $createur)\r
+       public function duplicate($book_id, $createur, $nom)\r
        {\r
                $r = $this->con->select('SELECT * FROM books_vue WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
                $c = $this->con->openCursor('books');\r
@@ -115,7 +115,7 @@ class wsDAOBook extends extranetDAO {
                $c->date_status = TIME;\r
                $c->lang = $r->lang;\r
                $c->parametres = $r->parametres;\r
-               $c->nom = $r->nom;\r
+               $c->nom = $nom;\r
                $c->theme = $r->theme;\r
                $c->changedate = TIME;\r
                $c->compiledate = 0;\r
@@ -125,10 +125,11 @@ class wsDAOBook extends extranetDAO {
                return $this->selectById($book_id);\r
        }\r
 \r
-       public function creeEmpty($createur, $lang)\r
+       public function creeEmpty($createur, $lang, $nom)\r
        {\r
                $c = $this->con->openCursor('books');\r
                $c->proprietaire = $createur;\r
+               $c->nom = $nom;\r
                $c->date = TIME;\r
                $c->hash = md5(rand(0, 1234567893));\r
                $c->compteur_visites = 20;\r
@@ -166,10 +167,10 @@ class wsDAOBook extends extranetDAO {
                                $c = unserialize($r->conversion);\r
                                $c = $c->pages[$r->document_page];\r
                        }\r
-                       if(isset($n[$r->document_page-1])){\r
-                               $num=$n[$r->document_page-1];\r
-                       }else{\r
-                               $num='';\r
+                       if (isset($n[$r->document_page-1])) {\r
+                               $num = $n[$r->document_page-1];\r
+                       } else {\r
+                               $num = '';\r
                        }\r
                        $pages[$r->book_page] = array('document_id' => $r->document_id,\r
                                'document_page' => $r->document_page,\r