(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index db9b73bb2fc1f214ca6dfe2104c2dd832579df06..45ec90aa25791e7b79005adc8fc0cd5ba98df135 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -11,6 +11,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('DB_NAME', 'extranet');\r
        define('DB_USER', 'root');\r
        define('DB_PASSWORD', 'valparaiso');\r
+       define('DEV',true);\r
 \r
        if (in_array($_SERVER['HTTP_HOST'], $localrel)) {\r
                define('WEBROOT', '/cubeExtranet');\r
@@ -20,6 +21,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
                define('SITE_PATH', WEBROOT . '/');\r
        }\r
 \r
+       $tools = ROOT . '/../inc/tools/';\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
        define('DB_HOST', 'localhost');\r
@@ -31,6 +33,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('SITE_PATH', WEBROOT . '/');\r
 \r
        define('FTPROOT', '/usb/ftpextranet/');\r
+       define('DEV',false);\r
 }\r
 \r
 if (in_array($_SERVER['HTTP_HOST'], $ws)) {\r

diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/extranet/Controlleur/class.ws.flash.php
index 6553873b100064059200a555119874ab8dfafbb4..0759422ae4b9fe33072ed91de3933d066ae0244e 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.flash.php
+++ b/inc/extranet/Controlleur/class.ws.flash.php
@@ -11,7 +11,28 @@ class wsFlash extends cubeFlashGateway {
 \r
        public function uploadDocument()\r
        {\r
-\r
+               global $core;\r
+               $dao = new wsDAODocument($core->con);\r
+               foreach($_FILES as $varname => $infos) {\r
+                       if ($infos['error']) {\r
+                               continue;\r
+                       }\r
+                       // Initialisation du document\r
+                       $data = array();\r
+                       $data['proprietaire'] = $core->user->utilisateur_id;\r
+                       $data['pages'] = 0;\r
+                       $data['file'] = $infos['name'];\r
+                       $li = new wsDocumentLocalInfos();\r
+                       $li->fileName = $this->args['fileName'];\r
+                       $li->fileSize = $this->args['fileSize'];\r
+                       $li->creationDate = $this->args['creationDate'];\r
+                       $li->modificationDate = $this->args['modificationDate'];\r
+                       $data['localInfos'] = $li;\r
+                       $document = $dao->sauve($data);\r
+                       $document->copyOriginal($infos['tmp_name']);\r
+                       $document->getInfos();\r
+               }\r
+               $this->xml->addChild('document_id', $document->document_id);\r
        }\r
 \r
        public function testDocuments()\r

diff --git a/inc/extranet/Controlleur/class.ws.url.php b/inc/extranet/Controlleur/class.ws.url.php
index 2b135635eb3bb892b214d6a73dd94a44ae21e0cc..74bbc2e92181f18081837101b40f832c9b829acd 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.url.php
+++ b/inc/extranet/Controlleur/class.ws.url.php
@@ -61,7 +61,7 @@ class wsUrl {
                        $res .= '<td class="bouton"><a href="' . SITE_PATH . 'editbook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Editer('éditer', '', false)) . '</a></td>';\r
                        $res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Stats('stats', '', false)) . '</a></td>';\r
                        $res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . cubeMedia::cssRollover($core->typo->Telecharger('télécharger', '', false)) . '</a></td>';\r
-                       $res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="'.__('Êtes-vous certain de vouloir supprimer cette publication ?').'">' . cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false)) . '</a></td>';\r
+                       $res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false)) . '</a></td>';\r
                        $res .= '</tr>';\r
                        $i++;\r
                }\r
@@ -146,7 +146,7 @@ class wsUrl {
                        'browseText' => __('Parcourir') . ' ...',\r
                        'titreUpload' => __('Sélectionnez un ou plusieurs document PDF sur votre ordinateur'),\r
                        'titreComposition' => __('Organisez le(s) document(s) pour composer votre fluidbook'));\r
-               $res = cubeMedia::flash(WEBROOT . '/swf/composer.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff');\r
+               $res = cubeMedia::flash(WEBROOT . '/swf/composer.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'transparent');\r
                return $res;\r
        }\r
 \r
@@ -154,7 +154,7 @@ class wsUrl {
        {\r
                $fv = array(session_name() => session_id(),\r
                        'book_id' => $args[1]);\r
-               $res = cubeMedia::flash(WEBROOT . '/swf/theme.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff');\r
+               $res = cubeMedia::flash(WEBROOT . '/swf/theme.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'transparent');\r
                return $res;\r
        }\r
 \r
@@ -166,7 +166,7 @@ class wsUrl {
        {\r
                $fv = array(session_name() => session_id(),\r
                        'book_id' => $args[1]);\r
-               $res = cubeMedia::flash(WEBROOT . '/swf/links.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff');\r
+               $res = cubeMedia::flash(WEBROOT . '/swf/links.swf', '960', '100%', $fv, 'composerSwf', 'swfPanel', 9, '#ffffff', '', 'false', 'noscale', 'transparent');\r
                return $res;\r
        }\r
 \r

diff --git a/inc/extranet/DAO/_common.php b/inc/extranet/DAO/_common.php
index b2f933f4cc9f494caca4b456519a20397a401abc..96f1a5e62eafd651829fd4587e4bdd43b6e25116 100644 (file)
--- a/inc/extranet/DAO/_common.php
+++ b/inc/extranet/DAO/_common.php
@@ -12,5 +12,6 @@ $__autoload['extranetDAOEntreprise'] = dirname(__FILE__) . '/class.extranet.dao.
 $__autoload['extranetDAOFichier'] = dirname(__FILE__) . '/class.extranet.dao.fichier.php';\r
 \r
 $__autoload['wsDAOBook'] = dirname(__FILE__) . '/class.ws.dao.book.php';\r
+$__autoload['wsDAODocument'] = dirname(__FILE__) . '/class.ws.dao.document.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/extranet/DAO/class.ws.dao.document.php b/inc/extranet/DAO/class.ws.dao.document.php
new file mode 100644 (file)
index 0000000..22f4779
--- /dev/null
+++ b/inc/extranet/DAO/class.ws.dao.document.php
@@ -0,0 +1,72 @@
+<?php\r
+class wsDAODocument extends extranetDAO {\r
+       public function singleton($r)\r
+       {\r
+               $document = new wsDocument();\r
+               $document->document_id = $r->document_id;\r
+               $document->file = $r->file;\r
+               $document->proprietaire = $r->proprietaire;\r
+               $document->pages = $r->pages;\r
+               if ($r->trim) {\r
+                       $document->trim = unserialize($r->trim);\r
+               }\r
+               $document->date = $r->date;\r
+               $document->localInfos = unserialize($r->localInfos);\r
+               return $document;\r
+       }\r
+\r
+       public function getNextId()\r
+       {\r
+               $r = $this->con->select('SELECT MAX(document_id) AS document_id FROM documents');\r
+               return $r->document_id + 1;\r
+       }\r
+\r
+       public function selectById($document_id)\r
+       {\r
+               $r = $this->con->select('SELECT * FROM documents WHERE document_id=\'' . $this->con->escape($document_id) . '\'');\r
+               return $this->singleton($r);\r
+       }\r
+\r
+       public function cree()\r
+       {\r
+               $document = new wsDocument();\r
+               $document->document_id = 'new';\r
+               $document->file = '';\r
+               $document->proprietaire = 0;\r
+               $document->pages = 0;\r
+               $document->trim = array();\r
+               $document->date = TIME;\r
+               $document->localInfos = new wsDocumentLocalInfos();\r
+               return $document;\r
+       }\r
+\r
+       public function sauve($data)\r
+       {\r
+               if (!isset($data['document_id'])) {\r
+                       $data['document_id'] = 'new';\r
+               }\r
+               $c = $this->con->openCursor('documents');\r
+               $c->file = $data['file'];\r
+               $c->proprietaire = $data['proprietaire'];\r
+               $c->pages = $data['pages'];\r
+               if (isset($data['localInfos'])) {\r
+                       $c->localInfos = serialize($data['localInfos']);\r
+               }\r
+               if (isset($data['trim'])) {\r
+                       $c->trim = serialize($data['trim']);\r
+               }\r
+\r
+               if ($data['document_id'] == 'new') {\r
+                       $document_id = $c->document_id = $this->getNextId();\r
+                       $c->date = TIME;\r
+                       $c->insert();\r
+               } else {\r
+                       $document_id = $data['document_id'];\r
+                       $c->update('WHERE document_id=\'' . $this->con->escape($data['document_id']) . '\'');\r
+               }\r
+               $doc = $this->selectById($document_id);\r
+               return $doc;\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/extranet/Metier/_common.php b/inc/extranet/Metier/_common.php
index 3f92f22f08c29ab06c2517f79599d37029ada9d0..0501d9c39fd32e452f185cb22330900625fdf7a2 100644 (file)
--- a/inc/extranet/Metier/_common.php
+++ b/inc/extranet/Metier/_common.php
@@ -18,5 +18,7 @@ $__autoload['wsParametres'] = dirname(__FILE__) . '/class.ws.parametres.php';
 $__autoload['wsThemeParametres'] = dirname(__FILE__) . '/class.ws.theme.parametres.php';\r
 $__autoload['wsBookParametres'] = dirname(__FILE__) . '/class.ws.book.parametres.php';\r
 $__autoload['wsLangueTextes'] = dirname(__FILE__) . '/class.ws.langue.textes.php';\r
+$__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';\r
+$__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/extranet/Metier/class.ws.document.php b/inc/extranet/Metier/class.ws.document.php
new file mode 100644 (file)
index 0000000..3681dc0
--- /dev/null
+++ b/inc/extranet/Metier/class.ws.document.php
@@ -0,0 +1,40 @@
+<?php\r
+class wsDocument extends cubeMetier {\r
+       protected $document_id;\r
+       protected $file;\r
+       protected $proprietaire;\r
+       protected $pagesNumber;\r
+       protected $trim;\r
+       protected $date;\r
+       protected $localInfos;\r
+\r
+       protected $out;\r
+       protected $in;\r
+       protected $log;\r
+\r
+       protected $pages;\r
+\r
+       public function copyOriginal($tmp_file)\r
+       {\r
+               $this->out = ROOT . '/docs/' . $this->document_id . '/';\r
+               $this->log = $this->out . 'log.txt';\r
+               $this->in = $this->out . 'original.pdf';\r
+               if (!file_exists($this->out)) {\r
+                       mkdir($this->out, 0755, true);\r
+               }\r
+               move_uploaded_file($tmp_file, $this->in);\r
+       }\r
+\r
+       public function getInfos()\r
+       {\r
+               echo 'pdfinfo';\r
+               $pdfinfo = new cubeCommandLine('pdfinfo', $this->log);\r
+               $pdfinfo->setArg('-box');\r
+               $pdfinfo->setArg('f', 1);\r
+               $pdfinfo->setArg('l', 10000);\r
+               $pdfinfo->setArg(null, $this->in);\r
+               $pdfinfo->execute();\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/prepend.php b/inc/prepend.php
index 4f7b29fcdc48d393b556b4d4d30f679d924c7972..560eb7d67486e661cdfccc37f90ab2eb248881af 100644 (file)
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -22,4 +22,10 @@ if (isset($_POST['q'])) {
        $_SESSION['q'] = null;\r
 }\r
 \r
+if (DEV) {\r
+       cubePHP::appendEnv('PATH', $tools);\r
+       cubePHP::appendEnv('PATH', $tools . 'gs8.70/bin/');\r
+       cubePHP::appendEnv('PATH', $tools . 'gs8.70/lin/');\r
+}\r
+\r
 ?>
\ No newline at end of file