version 7.9.33

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

VERSIONS

+24/07/2017 - v7.9.33
+
+ - ticket #63133: Intégration MARC21: prise en charge des exemplaires en zone 995
+ 
+ - ticket #61721 : Recherche simple : correction du lien nouvelle recherche
+ 
+ - ticket #63113 : Boite articles : modernisation des pictogrammes du mode d'affichage diaporama avec navigation
+
+ - ticket #61301 : Version mobile : Activation de l'accès au Kiosk
+
+
 20/07/2017 - v7.9.32
 
  - ticket #61844 : ArteVOD : ajout d'un script de récupération des enrichissements

VERSIONS_HOTLINE/61721

- - ticket #61721 : corrige le lien nouvelle recherche
\ No newline at end of file

VERSIONS_HOTLINE/63113

- - ticket #63113 : Changement pictos boite diaporamas avec navigation
\ No newline at end of file

VERSION_HOTLINE/63133

- - ticket #63133: intégration MARC21: prise en compte des exemplaires en zone 995 au lieu de 949
\ No newline at end of file

application/modules/telephone/controllers/ModulesController.php

+<?php
+/**
+ * Copyright (c) 2012, 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
+ */
+
+require_once ROOT_PATH.'application/modules/opac/controllers/ModulesController.php';
+
+class Telephone_ModulesController extends ModulesController {
+}
+
+?>
\ No newline at end of file

library/startup.php

@@ -82,7 +82,7 @@ class Bokeh_Engine {
 
   function setupConstants() {
     defineConstant('BOKEH_MAJOR_VERSION','7.9');
-    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.32');
+    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.33');
 
     defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 

tests/application/modules/telephone/controllers/IndexControllerTest.php

@@ -476,7 +476,6 @@ class IndexControllerTelephoneTelephoneSwitchProfilTest extends AbstractControll
 
 
 
-
 class IndexControllerTelephoneEmbedModuleTest extends AbstractIndexControllerTelephoneWithModulesTest {
   public function setUp() {
     parent::setUp();

tests/application/modules/telephone/controllers/ModulesControllerTest.php

+<?php
+/**
+ * Copyright (c) 2012, 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
+ */
+require_once 'TelephoneAbstractControllerTestCase.php';
+
+
+class ModulesControllerTest extends TelephoneAbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  public function setUp() {
+    parent::setUp();
+
+
+    $cfg_accueil =
+      ['modules' => ['1' => ['division' => '1',
+                             'type_module' => 'RECH_SIMPLE',
+                             'preferences' => []],
+
+                     '2' => ['division' => '1',
+                             'type_module' => 'NEWS',
+                             'preferences' => ['titre' => 'Concerts',
+                                               'rss_avis' => 0]],
+
+                     '3' => ['division' => '1',
+                             'type_module' => 'LOGIN',
+                             'preferences' => ['titre' => 'Se connecter',
+                                               'identifiant' => 'identifiant',
+                                               'identifiant_exemple' => 'numero carte',
+                                               'mot_de_passe' => 'mot de passe',
+                                               'mot_de_passe_exemple' => 'zork',
+                                               'lien_connexion' => 'go']],
+                     '4' => ['division' => '1',
+                             'type_module' => 'BIB_NUMERIQUE',
+                             'preferences' => ['titre' => 'Mes albums']],
+
+                     '5' => ['division' => '1',
+                             'type_module' => 'CALENDAR',
+                             'preferences' => ['titre' => 'Agenda']],
+
+                     '6' => ['division' => '1',
+                             'type_module' => 'CRITIQUES',
+                             'preferences' => ['titre' => 'Critiques']],
+
+                     '7' => ['division' => '1',
+                             'type_module' => 'LIBRARY',
+                             'preferences' => ['titre' => 'Libraries']]
+          ]];
+
+    $this->profil_adulte = $this->fixture('Class_Profil', ['id' => 2])
+                                ->setTitreSite('Smartphone')
+                                ->setLibelle(null)
+                                ->setCfgAccueil($cfg_accueil)
+                                ->setSkin('vide')
+                                ->setHeaderCss('mon_style.css')
+                                ->setHauteurBanniere(150)
+                                ->setBrowser('telephone')
+                                ->beCurrentProfil();
+
+    $this->fixture('Class_Profil', ['id' => 34,
+                                    'parent_profil' => $this->profil_adulte]);
+
+    Class_Profil_Skin::setFileSystem((new Storm_FileSystem_Volatile())
+                                     ->mkdir('/public/opac/skins/vide/css/')
+                                     ->touch('/public/opac/skins/vide/css/mobile.css'));
+
+    Class_Profil::setFileWriter(Storm_Test_ObjectWrapper::mock()->whenCalled('fileExists')->answers(true));
+    Class_AdminVar::set('LEKIOSK_SSO_MODE', '');
+    RessourcesNumeriquesFixtures::activateLeKiosk();
+    $group = $this->fixture('Class_UserGroup', ['id' => 1])
+                  ->addRight(Class_UserGroup::RIGHT_ACCES_LEKIOSK);
+    Class_Users::getIdentity()->setUserGroups([$group]);
+    $this->dispatch('/opac/modules/lekiosk');
+  }
+
+
+
+  public function tearDown() {
+    Class_Profil_Skin::setFileSystem(null);
+    parent::tearDown();
+  }
+
+  /** @test */
+  public function shouldHaveAccessToLekiosk() {
+    $this->assertContains('https://pros.lekiosk.com/login/accesshash',
+                          $this->_response->getBody());
+
+  }
+}