#487 @2

diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index fdbc3c77448babf4378dc005eb79adb47a0bedf2..28255821990c22bb14bbab55865d662e1072d791 100644 (file)
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -1,59 +1,6 @@
 <?php
 
 class MaintenanceController extends CubeIT_Controller_MaintenanceController {
-       public function importReferences() {
-               $former = Bootstrap::getInstance()->getFormerDb();
-               $references = $former->select()->from('liste_references')
-                       ->query()->fetchAll();
-
-               Fluidbook_Model_Reference::truncate();
-               Fluidbook_Model_Reference_Category::truncate();
-
-               $categories = array();
-
-               foreach ($references as $reference) {
-                       if (null == $reference->type || !$reference->type) {
-                               continue;
-                       }
-                       $categories = array_merge(explode('§', $reference->type), $categories);
-
-               }
-               $categories = array_unique($categories);
-               $categories = array_values($categories);
-               $categories = array_flip($categories);
-
-               $names = array('brochures' => 'Brochure', 'catalogues' => 'Catalogue', 'magazines' => 'Magazine', 'rapports' => 'Rapport annuel');
-               foreach ($categories as $name => $id) {
-                       $m = new Fluidbook_Model_Reference_Category();
-                       $m->setIdValue($id+1);
-                       $m->setName(array('fr' => $names[$name]));
-                       $m->save(true, false);
-               }
-
-
-               foreach ($references as $reference) {
-                       $data = array();
-                       $data['id'] = $reference->uid;
-                       $data['date'] = $reference->fluidbook_date;
-                       $data['title'] = array('fr' => $reference->titre, 'en' => $reference->titre);
-                       $data['image'] = array($this->_copyFileToCMS('http://www.fluidbook.com/files/' . $reference->image));
-
-                       if ($reference->type) {
-                               $c = array();
-                               $cc = explode('§', $reference->type);
-                               foreach ($cc as $item) {
-                                       $c[] = $categories[$item]+1;
-                               }
-                               $data['categories'] = $c;
-                       }
-                       $data['text'] = array('fr' => $reference->desc___fr, 'en' => $reference->desc___en);
-                       $data['url'] = array('fr' => $this->_filterURL($reference->link_url___fr), 'en' => $this->_filterURL($reference->link_url___en));
-
-                       $m = new Fluidbook_Model_Reference($data);
-                       $m->save(true, false);
-               }
-       }
-
        protected function _filterURL($url) {
                if (null === $url || !$url || $url == 'http://') {
                        return '';

diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php
index 96bb24cf177aef29f7c0d5256db4a01dc205303f..523346587a0762df345114a9acd074f790db5932 100644 (file)
--- a/framework/application/views/helpers/ExemplePublication.php
+++ b/framework/application/views/helpers/ExemplePublication.php
@@ -62,9 +62,11 @@ class Fluidbook_View_Helper_ExemplePublication extends CubeIT_View_Helper_Abstra
 \r
                $url = '/files/' . $path . $page . '.jpg';\r
                $file = $dir . $page . '.jpg';\r
-               if (!file_exists($file)) {\r
-                       $url = 'https://workshop.fluidbook.com/viewerh/' . $fluidbook_id . '_bcf26f9cf4a795ec00b9a44f42750d58_1234567890/data/background/150/t' . $page . '.jpg';\r
-                       file_put_contents($file, file_get_contents($url));\r
+               if (!file_exists($file) || !filesize($file)) {\r
+                       $fb = 'https://workshop.fluidbook.com/viewerh/' . $fluidbook_id . '_bcf26f9cf4a795ec00b9a44f42750d58_12345678900/';\r
+                       file_get_contents($fb);\r
+                       $wsurl = $fb . 'data/background/150/t' . $page . '.jpg';\r
+                       file_put_contents($file, file_get_contents($wsurl));\r
                }\r
                $size = CubeIT_Image::getDimensions($file, $width, $height);\r
                return array('url' => $url, 'width' => $width, 'height' => $height);\r

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index 05019e90c0afdf920f191403782c5600548dc11f..d5a6918b57605bf03627426e8f4a48485b2a61e6 100644 (file)
--- a/framework/application/views/helpers/Exemples.php
+++ b/framework/application/views/helpers/Exemples.php
@@ -18,17 +18,26 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                $exemples = Fluidbook_Model_Reference::factory()->order('date DESC')->find();\r
                $this->_categories = Fluidbook_Model_Reference_Category::factory()->find();\r
 \r
-               $max_featured = floor($nb / 5);\r
-               $normal_per_featured = 4;\r
-               $max_normal = $max_featured * $normal_per_featured;\r
+               $perline = 5.0;\r
 \r
                $featured = array();\r
                $normal = array();\r
+               $c = 0;\r
                foreach ($exemples as $id => $exemple) {\r
                        if ($category > 0 && !in_array($category, $exemple->getCategories())) {\r
                                continue;\r
                        }\r
 \r
+                       $c++;\r
+               }\r
+\r
+               $c = CubeIT_Math::round($c, $perline, 'floor');\r
+               $nb = min($c, CubeIT_Math::round($nb, $perline, 'floor'));\r
+               $max_featured = floor($nb / $perline);\r
+               $normal_per_featured = $perline - 1;\r
+               $max_normal = $max_featured * $normal_per_featured;\r
+\r
+               foreach ($exemples as $id => $exemple) {\r
                        if ($exemple->getFeatured()) {\r
                                $featured[] = $id;\r
                        } else {\r