#fluidbook-workshop : fix bug of pdf not being fixed

typo in url of automatic email
@1

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index bd1a2d6d06420420398809c89228b4e082f0abb6..8b756fe24949f3c85498228c0eb167f7d7323ffd 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -622,7 +622,7 @@ class commonUrl {
                                        $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n";\r
                                        $body .= 'Fichiers chargés : ' . "\n";\r
                                        foreach ($_SESSION['files_uploaded'] as $f) {\r
-                                               $body .= ' - httpx://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . commonUrl::hashFile($f) . '/' . $f . "\n";\r
+                                               $body .= ' - https://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . commonUrl::hashFile($f) . '/' . $f . "\n";\r
                                        }\r
                                        $body .= "\n" . RAPPEL . " : \n";\r
                                        $body .= ' - Adresse : https://' . $_SERVER['HTTP_HOST'] . '/' . "\n";\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index a0e235af070358af4237c6dd514b0d6a1da201a3..175ef62ef6000feab45c485d54b391abe3d07d59 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -223,7 +223,7 @@ class wsDAODocument extends commonDAO {
        public function setLinksFromOldFluidbook($book_id) {
                $daoBook = new wsDAOBook($this->con);
                $pages = $daoBook->getPagesOfBook($book_id);
-               fb($pages);
+
                $book = $daoBook->selectById($book_id);
                $width = $book->parametres->width;
 

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index e35bff11812fddc67d11ffdfbe3ba1301bfd223d..997b8bd6cd8712ae8ed927118ece78ac65cc2ca7 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -928,32 +928,28 @@ class wsDocument extends cubeMetier {
 
        public static function getDir($id) {
 
-               if(!is_array(self::$_docsDir)){
-                       self::$_docsDir=array();
+               if (!is_array(self::$_docsDir)) {
+                       self::$_docsDir = array();
                }
 
-               if(isset(self::$_docsDir[$id])){
+               if (isset(self::$_docsDir[$id])) {
                        return self::$_docsDir[$id];
                }
 
                $new = WS_DOCS . '/' . $id . '/';
                $old = '/mnt/sshfs/batman/home/extranet/www/fluidbook/docs/' . $id . '/';
 
-               if (file_exists($new . '/p1.swf')) {
-                       self::$_docsDir[$id]=$new;
+               if (file_exists($new . 'p1.swf')) {
+                       self::$_docsDir[$id] = $new;
                        return $new;
                } elseif (file_exists($old . 'p1.swf')) {
-                       self::$_docsDir[$id]=$old;
+                       self::$_docsDir[$id] = $old;
                        return $old;
                }
                if (!file_exists($new)) {
                        mkdir($new, 0777, true);
-                       self::$_docsDir[$id]=$new;
-                       return $new;
                }
+               self::$_docsDir[$id] = $new;
+               return $new;
        }
-
-
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file