done #1049 @3

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f0444726bab2f22a20e4e5398a5d6325ef3a9083..b568d4bc37695425b137294aa13979b477d4f8c2 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1240,6 +1240,13 @@ class wsDAOBook extends commonDAO {
                                $imagesassets[$assetId] = true;
                        }
 
+                       if ($link['type'] == 16 && $book->parametres->linkFilePrefix) {
+                               if (!CubeIT_Util_Url::isDistant($link['to'])) {
+                                       $link['to'] = $book->parametres->linkFilePrefix . $link['to'];
+                                       $links[$id] = $link;
+                               }
+                       }
+
                        if ($link['type'] == 15) {
                                if (isset($imagesassets[$id])) {
                                        continue;

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index fde55e1ed36785e8226185cdaeea61154dc42399..4b6a794c16a9799d9fb9277bbd116756e54605eb 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -136,7 +136,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['pdfThumbnails'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
                                                       'label' => __('PDF utilisé pour générer les miniatures'), 'grade' => 1, 'fileFilter' => $pdfFilter);
 
-               $this->forms['index'] = array('label' => __('Index'), 'fieldsnames' => array('indexAutoScroll','pdfThumbnails'));
+               $this->forms['index'] = array('label' => __('Index'), 'fieldsnames' => array('indexAutoScroll', 'pdfThumbnails'));
 
                // .
                //
@@ -247,6 +247,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['linkTooltipManager'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Gestionnaire des info-bulles"), 'grade' => 5);
                $this->fields['linkTracker'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Tracking des liens'), 'grade' => 5);
                $this->fields['linkTrackerRegexp'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Tracking des liens applicables aux liens du domaine'), 'grade' => 5);
+               $this->fields['linkFilePrefix'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Préfixer les liens de téléchargement'));
                $this->fields['linkMultimediaPerformanceMode'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Mode perfomance pour les liens multimédia'), 'grade' => 5);
                $this->fields['linkMultimediaQuality'] = array('type' => 'float', 'default' => 1.0, 'editable' => true, 'label' => __('Qualité de rendu des animations'), 'grade' => 5);
                $this->fields['linkCornerSize'] = array('type' => 'integer', 'default' => '10', 'editable' => true, 'label' => __('Taille des liens de coins de page'), 'hint' => __("Pourcentage de la largeur de la page"));
@@ -256,7 +257,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['brightcovePlayerId'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Brightcove Player Id'), 'grade' => 3);
                $this->fields['brightcovePlayerSecret'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Brightcove Player Secret'), 'grade' => 3);
                $this->forms['multimedia'] = array('label' => __('Liens et multimédia'),
-                                                  'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass', 'ignoreLinksTypes', 'linkTooltipManager', 'linkCornerSize', 'linkTooltipMaxWidth', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkMultimediaPerformanceMode', 'linkMultimediaQuality', '|', 'videoReset', 'videoBigPlay', '|', 'brightcovePlayerId', 'brightcovePlayerSecret'));
+                                                  'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass', 'ignoreLinksTypes', 'linkTooltipManager', 'linkCornerSize', 'linkTooltipMaxWidth', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkFilePrefix', '|', 'linkMultimediaPerformanceMode', 'linkMultimediaQuality', '|', 'videoReset', 'videoBigPlay', '|', 'brightcovePlayerId', 'brightcovePlayerSecret'));
                //.
                $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
                                                          'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $imageFilter);

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index c3c9c4333532e93f6320ab5c4b5220c247d4664b..95c2a04b50e430c4413c44a085340ba097290fbd 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -663,6 +663,9 @@ class imageLink extends contentLink {
 class fileLink extends normalLink {
 
        public function getURL() {
+               if ($this->compiler->book->parametres->linkFilePrefix && !CubeIT_Util_Url::isDistant($this->to)) {
+                       return $this->compiler->book->parametres->linkFilePrefix . $this->to;
+               }
                $this->copyExternalFile($this->to);
                return wsHTML5Link::getUniversalLocation($this->to);
        }

diff --git a/js/common.js b/js/common.js
index 3fe67954a40ae78aac899453c7115eb4e1c16704..ec5cd915f3ede311a1486463d548446cc36e9f00 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -184,7 +184,7 @@ function load_common_extranet() {
                 status.html('Chargement en cours | <span class="perc">' + percentVal + '</span>');\r
             },\r
             complete: function (xhr) {\r
-                window.location = window.location;\r
+                window.location.reload();\r
             }\r
         });\r
 \r