(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 50508258b4d47275d51f31636c029487ac4d5d62..6aa2cb0d0147df6082996609c8d4055708a8c70b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -878,6 +878,7 @@ class wsAjax extends cubeAjax {
                        if ($book_id < 10000) {\r
                                $dao->setLinksFromOldFluidbook($book_id);\r
                        } else {\r
+                               fb($book_id);\r
                                $dao->setFluidbookLinksFromCSV($book_id);\r
                        }\r
                        return;\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c03469e24a66ab3490bf0ca2f0614d8afede6d38..5d93dae08820b7ce82db97a2d70a248f86ccaff2 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -777,7 +777,7 @@ html{height:100%}' . "\n";
                $res.='<hr />';\r
 \r
                $res.='<h2>' . __('Réimporter les liens du fichier PDF') . '</h2>';\r
-               $res.='<a class="restoreLink" rel="11124/pdf" href="#">Restaurer</a>';\r
+               $res.='<a class="restoreLink" rel="'.$book_id.'/pdf" href="#">Restaurer</a>';\r
                $res.='<hr />';\r
 \r
                $res.='<h2>' . __('Historique') . '</h2>';\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index c4a46c11a4bd74a847fd9e1a2761550231f79fa5..1de7b546c25c726f7811f364c3507cf37f87e3ca 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -67,6 +67,8 @@ class wsDAODocument extends commonDAO {
                                continue;\r
                        }\r
 \r
+                       $newformat = (filemtime($csv) > 1363685416);\r
+\r
                        $log[] = 'Links file of page ' . $page . ' found';\r
 \r
 \r
@@ -83,7 +85,11 @@ class wsDAODocument extends commonDAO {
                                        continue;\r
                                }\r
                                $link = array();\r
-                               $cols = array('page' => '', 'type' => '', 'to' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'infobulle' => '', 'numerotation' => 'physical');\r
+                               if ($newformat) {\r
+                                       $cols = array('page' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'type' => '', 'to' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'infobulle' => '', 'numerotation' => 'physical');\r
+                               } else {\r
+                                       $cols = array('page' => '', 'type' => '', 'to' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'infobulle' => '', 'numerotation' => 'physical');\r
+                               }\r
                                $k = 0;\r
                                foreach ($cols as $col => $default) {\r
                                        if (isset($line[$k])) {\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 50c83faf7542a6bd844314deb31396a986c6e2c7..b2a03508a43dc52093796b93c9133b14c80d23b4 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -215,6 +215,7 @@ class wsBookParametres extends wsParametres {
 \r
                $this->fields['customLinkClass'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Classe pour les liens personnalisés'), 'grade' => 5);\r
                $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'grade' => 3);\r
+               $this->fields['ignoreLinksTypes'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Ignorer les liens de type'), 'hint' => __('Liste des numéros séparés par des virgules'), 'grade' => 5);\r
                $this->fields['linkBlinkTime'] = array('type' => 'float', 'default' => 1.0, 'editable' => true, 'label' => __("Temps d'apparition du lien à l'ouverture de la page (en secondes)"));\r
                $this->fields['linkTooltipManager'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Gestionnaire des info-bulles"), 'grade' => 5);\r
                $this->fields['linkTracker'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Tracking des liens'), 'grade' => 5);\r
@@ -225,7 +226,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['videoReset'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Réinitialiser les vidéos après la lecture'), 'grade' => 3);\r
                $this->fields['videoBigPlay'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher le gros bouton Play'), 'grade' => 3);\r
                $this->forms['multimedia'] = array('label' => __('Liens et multimédia'),\r
-                       'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass', 'linkTooltipManager', 'linkCornerSize', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkMultimediaPerformanceMode', 'linkMultimediaQuality', '|', 'videoReset', 'videoBigPlay'));\r
+                       'fieldsnames' => array('permanentLinks', 'linkBlinkTime', 'customLinkClass','ignoreLinksTypes', 'linkTooltipManager', 'linkCornerSize', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkMultimediaPerformanceMode', 'linkMultimediaQuality', '|', 'videoReset', 'videoBigPlay'));\r
                //.\r
                $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $swfFilter);\r
@@ -339,7 +340,7 @@ class wsBookParametres extends wsParametres {
                $this->forms['v1'] = array('label' => __('Options spécifiques au fluidbook version 1'),\r
                        'fieldsnames' => array('extras', 'v1SWF'));\r
 \r
-               $this->fields['themeEnableAfterSearch'] = array('type' => 'boolean', 'default' => true,'editable'=>true, 'label' => __("Afficher l'image supplémentaire à droite du moteur de recherche"), 'grade' => 3);\r
+               $this->fields['themeEnableAfterSearch'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Afficher l'image supplémentaire à droite du moteur de recherche"), 'grade' => 3);\r
                $this->forms['theme'] = array('label' => __('Options du thème'),\r
                        'fieldsnames' => array('themeEnableAfterSearch'));\r
 \r

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 65aba188c07ca2a06cb0a1554ac85efa8209b653..fa82a27108f3496f9044930786b683a663cd0415 100644 (file)
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -128,7 +128,7 @@ class wsLinks {
                $c->user = $user;
                $c->update = $time;
                $c->insert();
-
+               
                $core->con->execute('DELETE FROM document_links WHERE document_id=' . $document_id);
                $c1->insert();
        }