From: vincent@cubedesigners.com Date: Wed, 27 Apr 2011 13:24:58 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=98d11e568578960c902cded78096086a07d9f95e;p=cubeextranet.git --- diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 6fdbf5a91..1390a5a4e 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -623,7 +623,12 @@ class wsFlash extends cubeFlashGateway { } $book = $dao->selectById($this->args['book_id']); - $absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/viewer/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/'; + $viewer='viewer'; + if(wsDroits::admin()){ + $viewer='vieweru'; + } + + $absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/'.$viewer.'/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/'; $this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL); } } diff --git a/inc/ws/Metier/class.ws.box.php b/inc/ws/Metier/class.ws.box.php index 4ba23a8cb..d0558f59a 100644 --- a/inc/ws/Metier/class.ws.box.php +++ b/inc/ws/Metier/class.ws.box.php @@ -1,22 +1,24 @@ top = $top; - $this->left = $left; - $this->right = $right; - $this->bottom = $bottom; + protected $top; + protected $left; + protected $right; + protected $bottom; + protected $width; + protected $height; + + public function __construct($top, $left, $right, $bottom) { + $this->top = $top; + $this->left = $left; + $this->right = $right; + $this->bottom = $bottom; + + $this->width = $this->right - $this->left; + $this->height = $this->bottom - $this->top; + } - $this->width = $this->right - $this->left; - $this->height = $this->bottom - $this->top; - } } ?> \ No newline at end of file