(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 6fdbf5a91d67e9adcedd60974c298de46c67716c..1390a5a4e1a005af5e7e3a1329ac5baef836fde5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -623,7 +623,12 @@ class wsFlash extends cubeFlashGateway {
                }\r
                $book = $dao->selectById($this->args['book_id']);\r
 \r
-               $absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/viewer/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/';\r
+               $viewer='viewer';\r
+               if(wsDroits::admin()){\r
+                       $viewer='vieweru';\r
+               }\r
+\r
+               $absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/'.$viewer.'/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/';\r
                $this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL);\r
        }\r
 }\r

diff --git a/inc/ws/Metier/class.ws.box.php b/inc/ws/Metier/class.ws.box.php
index 4ba23a8cb35756a7ad57aef4e9a9eaf86b083850..d0558f59af1f278e485b10135bb5241e9ab0b815 100644 (file)
--- a/inc/ws/Metier/class.ws.box.php
+++ b/inc/ws/Metier/class.ws.box.php
@@ -1,22 +1,24 @@
 <?php\r
+\r
 class wsBox extends cubeMetier {\r
-       protected $top;\r
-       protected $left;\r
-       protected $right;\r
-       protected $bottom;\r
-       protected $width;\r
-       protected $height;\r
 \r
-       public function __construct($top, $left, $right, $bottom)\r
-       {\r
-               $this->top = $top;\r
-               $this->left = $left;\r
-               $this->right = $right;\r
-               $this->bottom = $bottom;\r
+    protected $top;\r
+    protected $left;\r
+    protected $right;\r
+    protected $bottom;\r
+    protected $width;\r
+    protected $height;\r
+\r
+    public function __construct($top, $left, $right, $bottom) {\r
+        $this->top = $top;\r
+        $this->left = $left;\r
+        $this->right = $right;\r
+        $this->bottom = $bottom;\r
+\r
+        $this->width = $this->right - $this->left;\r
+        $this->height = $this->bottom - $this->top;\r
+    }\r
 \r
-               $this->width = $this->right - $this->left;\r
-               $this->height = $this->bottom - $this->top;\r
-       }\r
 }\r
 \r
 ?>
\ No newline at end of file