dev#64573 work on account

VERSIONS

+30/04/2019 - v8.0.12
+
+ - ticket #88956 : Affichage notices Arte VOD : correction d'affichage du réalisateur.
+
+ - ticket #86891 : Correction d'une faille de sécurité dans le moteur de recherche.
+
+ - ticket #87127 : Administration : suppression du message de la journée communautaire Bokeh 2019.
+ 
+ - ticket #90151 : Administration : correction de l'ouverture de l'éditeur CSS lorsqu'aucun fichier CSS n'est associé à la page.
+ 
+ - ticket #91113 : Administration : lettre d'information : correction de l'affichage des images d'articles.
+
+ - ticket #90677 : Administration : lettre d'information : correction de la sélection des domaines et paniers dans les notices.
+ 
+ - ticket #88480 : Administration : correction de l'affichage de la liste des agendas externes.
+ 
+ - ticket #82151 : Cosmogramme : correction de l'affichage des fichiers sans extension.
+  
+
+
 16/04/2019 - v8.0.11
 
  - ticket #88091 : Administration : Ajout d'informations dans le rapport d'état système

VERSIONS_HOTLINE/82151

- - ticket #82151 : Cosmogramme : correction de l'affichage des fichiers sans extension.
- 
- 
\ No newline at end of file

VERSIONS_HOTLINE/86891

- - ticket #86891 : Correction de faille de sécurité sur le moteur de recherche
\ No newline at end of file

VERSIONS_HOTLINE/88480

- - ticket #88480 : Administration : correction de l'affichage de la liste des agendas externes.
- 
\ No newline at end of file

VERSIONS_HOTLINE/88956

- - ticket #88956 : Affichage notices Arte VOD : correction d'affichage du réalisateur 
\ No newline at end of file

VERSIONS_HOTLINE/90151

- - ticket #90151 : Correction de l'ouverture de l'éditeur CSS lorsqu'aucun fichier CSS n'est associé à la page
\ No newline at end of file

VERSIONS_HOTLINE/90677

- - ticket #90677 : Lettres d'informations : correction de la sélection des domaines et paniers dans les notices
\ No newline at end of file

VERSIONS_HOTLINE/91113

- - ticket #91113 : Lettre d'information : correction de l'affichage des images d'articles.
- 
\ No newline at end of file

VERSIONS_WIP/87127

- - ticket #87127 : Administration : suppression du message de la journée communautaire Bokeh 2019.
- 
\ No newline at end of file

application/modules/opac/controllers/AbonneController.php

@@ -466,7 +466,7 @@ class AbonneController extends ZendAfi_Controller_Action {
   protected function _userForm($user) {
     $fields_to_show = Class_AdminVar::getChampsFicheUtilisateur();
 
-    $form = new Zend_Form;
+    $form = new ZendAfi_Form;
     $form
       ->setAction($this->view->url(['action' => 'edit',
                                     'id' => $user->getId()]))
@@ -1446,4 +1446,48 @@ class AbonneController extends ZendAfi_Controller_Action {
 
   public function donnerDesAvisAction() {
   }
+
+
+  public function suivreUneRechercheAction() {
+  }
+
+
+  public function modifierAction() {
+    $form = $this->_userForm($this->_user);
+    $form->setAction($this->view->url());
+    $this->view->form = $form;
+
+    if (!$this->_request->isPost())
+      return ;
+
+    if (!$form->isValid($this->_request->getPost()))
+      return;
+
+    $fields_to_save = Class_AdminVar::getChampsFicheUtilisateur();
+    $attributes = [];
+
+    foreach($fields_to_save as $field)
+      $attributes[$field] = $this->_request->getParam($field);
+
+    $this->_user
+      ->updateAttributes($attributes);
+
+    $patron = $this->_user->getEmprunteur();
+    $patron->updateFromUser($this->_user);
+
+    try {
+      if ($this->_user->save()) {
+        $patron->ensureService($this->_user)->save();
+        $this->_helper->notify($this->_('Vos modifications ont bien été enregistrées'));
+        $this->_redirectClose('/abonne/informations');
+      }
+
+      $form->addDecorator('Errors');
+      foreach($this->_user->getErrors() as $error)
+        $form->addError($error);
+    } catch(Exception $e) {
+      $form->addError($e->getMessage());
+      $form->addDecorator('Errors');
+    }
+  }
 }
\ No newline at end of file

application/modules/opac/views/scripts/abonne/modifier.phtml

+<?php
+echo $this->abonne_Edit($this->user, $this->form);
+?>

application/modules/opac/views/scripts/abonne/suivre-une-recherche.phtml

+<?php
+echo $this->abonne_FollowASearch($this->user);

library/Class/MoteurRecherche/Facettes.php

@@ -30,7 +30,15 @@ class Class_MoteurRecherche_Facettes {
 
 
   public function buildFacetsData($preferences, $facets, $criterias) {
-    $this->_preferences = $preferences;
+    $this->_preferences = array_merge(['suggests_enabled' => '',
+                                       'bookmarks_enabled' => '',
+                                       'facettes_actif' => '',
+                                       'facettes_codes' => '',
+                                       'facettes_nombre' => '',
+                                       'tags_actif' => '',
+                                       'tags_codes' => '',
+                                       'tags_nombres' => ''],
+                                      $preferences);
     $this->_criterias = $criterias;
     $this->_codes_count = $this->fetchFacetsRows($facets);
 
@@ -58,7 +66,7 @@ class Class_MoteurRecherche_Facettes {
   protected function _getTags() {
     return !$this->_preferences['tags_actif'] ?
       [] : $this->extractTags($this->_sanitizeCodes($this->_preferences['tags_codes']),
-                              $this->_preferences['tags_nombre'],
+                           $this->_preferences['tags_nombre'],
                               $this->_codes_count);
   }
 

library/Class/Newsletter.php

@@ -90,6 +90,8 @@ class Class_Newsletter extends Storm_Model_Abstract {
   protected $_recipent_size = 20;
   protected $_default_attribute_values = ['titre' => '',
                                           'draft' => 0,
+                                          'id_catalogue' => '',
+                                          'id_panier' => '',
                                           'articles_ids' => '',
                                           'articles_categories_ids' => ''];
 
@@ -209,14 +211,14 @@ class Class_Newsletter extends Storm_Model_Abstract {
 
   public function getNotices() {
     if (!$this->getIdPanier() and !$this->getIdCatalogue())
-      return array();
+      return [];
 
-    $preferences = array( 'id_catalogue' => $this->getIdCatalogue(),
-                          'id_panier' => $this->getIdPanier(),
-                          'nb_notices' => $this->getNbNotices(),
-                          'only_img' => false,
-                          'aleatoire' => 0,
-                          'tri' => 1);
+    $preferences = ['id_catalogue' => $this->getIdCatalogue(),
+                    'id_panier' => $this->getIdPanier(),
+                    'nb_notices' => $this->getNbNotices(),
+                    'only_img' => false,
+                    'aleatoire' => 0,
+                    'tri' => 1];
 
     return Class_Notice::getNoticesFromPreferences($preferences);
   }
@@ -428,6 +430,17 @@ class Class_Newsletter extends Storm_Model_Abstract {
 
     return $this;
   }
+
+
+  public function getFirstImageUrl() {
+    $template = $this->newTemplate();
+    $text = $template->getBodyHTML();
+
+    $matches = [];
+    return (preg_match('/< *img[^>]*src *= *["\']?([^"\'>]*)/i', $text, $matches) > 0)
+      ? $matches[1]
+      : '';
+  }
 }
 
 

library/Class/Notice.php

@@ -24,6 +24,10 @@ class NoticeLoader extends Storm_Model_Loader {
 
   public function getNoticesFromPreferences($preferences) {
     $requetes = Class_Catalogue::getRequetes($preferences);
+
+    if (!isset($requetes['req_liste']))
+      return [];
+
     $notices = $this->findAll($requetes["req_liste"]);
 
     // Tirage aleatoire

library/startup.php

@@ -81,7 +81,7 @@ class Bokeh_Engine {
 
   function setupConstants() {
     defineConstant('BOKEH_MAJOR_VERSION','8.0');
-    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.11');
+    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.12');
 
     defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 

library/templates/Intonation/Assets/css/intonation.css

@@ -442,6 +442,6 @@ header.col {
     max-height: 300px;
 }
 
-.recherche_avancee .bouton.back {
+.opac .bouton.back {
     display: none;
 }
\ No newline at end of file

library/templates/Intonation/Library/View/Wrapper/Newsletter.php

+<?php
+/**
+ * Copyright (c) 2012-2019, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+
+class Intonation_Library_View_Wrapper_Newsletter extends Intonation_Library_View_Wrapper_Abstract {
+  public function getMainTitle() {
+    return $this->_model->getTitre();
+  }
+
+
+  public function getMainLink() {
+  }
+
+
+  public function getPicture() {
+    return $this->_model->getFirstImageUrl();
+  }
+
+
+  public function getPictureAction() {
+  }
+
+
+  public function getSecondaryTitle() {
+  }
+
+
+  public function getSecondaryLink() {
+  }
+
+
+  public function getSecondaryIco() {
+  }
+
+
+  public function getActions() {
+  }
+
+
+  public function getDescription() {
+    $template = $this->_model->newTemplate();
+    return $this->_view->truncate($template->getBodyHTML());
+  }
+
+
+  public function getDescriptionTitle() {
+  }
+
+
+  public function getBadges() {
+  }
+
+
+  public function getDocType() {
+  }
+
+
+  public function getDocTypeLabel() {
+  }
+}

library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php

@@ -51,7 +51,8 @@ abstract class Intonation_Library_View_Wrapper_RichContent_Section {
 
 
   public function beVisible() {
-    return $this->_visible = true;
+    $this->_visible = true;
+    return $this;
   }
 
 
@@ -65,6 +66,12 @@ abstract class Intonation_Library_View_Wrapper_RichContent_Section {
   }
 
 
+  public function setContent($content) {
+    $this->_content = $content;
+    return $this;
+  }
+
+
   abstract public function getTitle();
   abstract public function getContent();
   abstract public function getClass();

library/templates/Intonation/Library/View/Wrapper/User/RichContent.php

@@ -56,6 +56,12 @@ class Intonation_Library_View_Wrapper_User_RichContent {
   }
 
 
+  public function setSections($sections) {
+    $this->_sections = $sections;
+    return $this;
+  }
+
+
   public function getSections() {
     if ($this->_sections)
       return $this->_sections;