From: vincent@cubedesigners.com Date: Fri, 16 Dec 2016 18:11:10 +0000 (+0000) Subject: wip #1022 @4 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a39f3c0c4093ef039811b6f305825780d8efd053;p=cubeextranet.git wip #1022 @4 --- diff --git a/inc/prepend.php b/inc/prepend.php index a21d4b72c..1c546832d 100644 --- a/inc/prepend.php +++ b/inc/prepend.php @@ -14,6 +14,9 @@ require_once 'Zend/Loader/Autoloader.php'; $loader = Zend_Loader_Autoloader::getInstance(); $loader->registerNamespace('CubeIT_'); +require_once 'ChromeLogger/ChromePhp.php'; +//ChromePhp::getInstance()->setEnabled(); + if ($ws) { define('GA', 'UA-4339912-7'); diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index c561de12b..f17982e60 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -736,12 +736,11 @@ class wsFlash extends cubeFlashGateway { $log = $dao->compile($this->args['book_id'], '2'); - $book = $dao->selectById($this->args['book_id']); $viewer = 'viewer'; - if (wsDroits::admin()) { + /*if (wsDroits::admin()) { $viewer = 'vieweru'; - } + }*/ $absoluteURL = 'https://' . $_SERVER['HTTP_HOST'] . '/' . $viewer . '/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/'; $this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL); diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index f491116f7..2365aa099 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -19,6 +19,8 @@ class wsExporter { public function exportCollection($collectionId, $os) { global $core; + + $ctrl = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true'; $alt = isset($_GET['alt']) && $_GET['alt'] == 'true';