diff --git a/VERSIONS_HOTLINE/56180 b/VERSIONS_HOTLINE/56180
new file mode 100644
index 0000000000000000000000000000000000000000..170dbeffae24897f68503ef4d408fe1bb77dd91a
--- /dev/null
+++ b/VERSIONS_HOTLINE/56180
@@ -0,0 +1 @@
+ - ticket #56180 : PNB Dilicom : Lorsque Bokeh est accédé en https, l'url du player est forcée en https.
\ No newline at end of file
diff --git a/VERSIONS_HOTLINE/59488 b/VERSIONS_HOTLINE/59488
new file mode 100644
index 0000000000000000000000000000000000000000..f376d85111c92120fda80e188b8c81f9959e0ca0
--- /dev/null
+++ b/VERSIONS_HOTLINE/59488
@@ -0,0 +1 @@
+ - ticket #59488 : Nanook : correction de l'authentification des abonnés après un chamgement de site dans le SIGB
\ No newline at end of file
diff --git a/library/Class/Url.php b/library/Class/Url.php
index d74caa397b2f96d23ae19346a62562d72bfa9688..4d781f055987b6406506dcdee4718c7a1615d805 100644
--- a/library/Class/Url.php
+++ b/library/Class/Url.php
@@ -85,10 +85,24 @@ class Class_Url {
if (Class_AdminVar_ForceHTTPS::isEnabled())
return 'https://';
- return 'http'
- . (!isset($_SERVER['HTTPS']) || !$_SERVER['HTTPS'] || $_SERVER['HTTPS'] == 'off'
- ? '' : 's')
- . '://';
+ return 'http' . (static::isSecure() ? 's' : '') . '://';
+ }
+
+
+ public static function isSecure() {
+ return array_key_exists('HTTPS', $_SERVER)
+ && $_SERVER['HTTPS']
+ && 'off' != $_SERVER['HTTPS'];
+ }
+
+
+ public static function secureIfNeeded($url) {
+ if (!static::isSecure())
+ return $url;
+
+ return ('http://' == substr($url, 0, 7))
+ ? ('https://' . substr($url, 7))
+ : $url;
}
diff --git a/library/Class/User/DoubleFinder.php b/library/Class/User/DoubleFinder.php
index 0cb72a202b02b108126246d22d85093c294f7b13..94987266d6d4fc6bfcd70ca3fdd3f5e8fdfab4cd 100644
--- a/library/Class/User/DoubleFinder.php
+++ b/library/Class/User/DoubleFinder.php
@@ -21,6 +21,26 @@
class Class_User_DoubleFinder extends Class_Entity {
+ public function __construct($patron) {
+ $this->setStrategy((Class_IntBib::isSingleNanook())
+ ? new Class_User_DoubleFinder_NanookStrategy($patron)
+ : new Class_User_DoubleFinder_DefaultStrategy($patron));
+ }
+
+
+ public function find() {
+ return $this->getStrategy()->find();
+ }
+
+
+ public function getDouble() {
+ return $this->getStrategy()->getDouble();
+ }
+}
+
+
+
+class Class_User_DoubleFinder_DefaultStrategy extends Class_Entity {
public function __construct($patron) {
$this->setPatron($patron);
}
@@ -44,19 +64,22 @@ class Class_User_DoubleFinder extends Class_Entity {
if (!$id_int_bib = $this->getPatronIdIntBib())
return false;
- foreach(['_matchByLoginAndOrder',
- '_matchByLoginAndIdSigb',
- '_matchByLoginAndLibrary',
- '_matchByIdSigb']
- as $method) {
+ foreach($this->_matchers() as $method)
if (call_user_func([$this, $method]))
return true;
- }
return false;
}
+ protected function _matchers() {
+ return ['_matchByLoginAndOrder',
+ '_matchByLoginAndIdSigb',
+ '_matchByLoginAndLibrary',
+ '_matchByIdSigb'];
+ }
+
+
protected function _matchByLoginAndOrder() {
if (!$ordreabon = $this->getPatronOrdreabon())
return false;
@@ -87,8 +110,7 @@ class Class_User_DoubleFinder extends Class_Entity {
protected function _matchByParams($params) {
- $params = array_merge(['id_int_bib' => $this->getPatronIdIntBib()],
- $params);
+ $params = $this->_restrictToIntegration($params);
if (!$user = Class_Users::findFirstBy($params))
return false;
@@ -96,4 +118,48 @@ class Class_User_DoubleFinder extends Class_Entity {
$this->setDouble($user);
return true;
}
+
+
+ protected function _restrictToIntegration($params) {
+ return array_merge(['id_int_bib' => $this->getPatronIdIntBib()],
+ $params);
+ }
}
+
+
+
+class Class_User_DoubleFinder_NanookStrategy
+ extends Class_User_DoubleFinder_DefaultStrategy {
+
+ protected function _matchers() {
+ return array_merge(['_matchByLoginAndOrderAndLibrary',
+ '_matchByLoginAndIdSigbAndLibrary'],
+ parent::_matchers());
+ }
+
+
+ protected function _matchByLoginAndOrderAndLibrary() {
+ if (!$ordreabon = $this->getPatronOrdreabon())
+ return false;
+
+ return $this->_matchRestrictedToSite(['login' => $this->getPatronLogin(),
+ 'ordreabon' => $ordreabon]);
+ }
+
+
+ protected function _matchByLoginAndIdSigbAndIdSite() {
+ return $this->_matchRestrictedToSite(['login' => $this->getPatronLogin(),
+ 'id_sigb' => $this->getPatronIdSigb()]);
+ }
+
+
+ protected function _matchRestrictedToSite($params) {
+ $params['id_site'] = $this->getPatronIdSite();
+ return $this->_matchByParams($params);
+ }
+
+
+ protected function _restrictToIntegration($params) {
+ return $params;
+ }
+}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TagDilicomWidget.php b/library/ZendAfi/View/Helper/TagDilicomWidget.php
index fa7f9a36d05a35dcf614ec50b238a8fafd86e130..c027963fc2928b11954aeb65e1536c3ea98b1163 100644
--- a/library/ZendAfi/View/Helper/TagDilicomWidget.php
+++ b/library/ZendAfi/View/Helper/TagDilicomWidget.php
@@ -20,14 +20,15 @@
*/
-class ZendAfi_View_Helper_TagDilicomWidget extends Zend_View_Helper_HtmlElement {
+class ZendAfi_View_Helper_TagDilicomWidget extends ZendAfi_View_Helper_BaseHelper {
protected $_album,
$_user;
public function tagDilicomWidget($album) {
$this->_album = $album;
- $links = $this->view->tag('p', $this->view->_('Vous n\'avez pas le droit d\'accéder à la consultation en ligne.'));
+ $links = $this->_tag('p',
+ $this->_('Vous n\'avez pas le droit d\'accéder à la consultation en ligne.'));
$this->_user = Class_Users::getIdentity();
if (!$this->_user || ($this->_user->hasRightAccessDilicom() &&
@@ -38,26 +39,34 @@ class ZendAfi_View_Helper_TagDilicomWidget extends Zend_View_Helper_HtmlElement
if ($this->_user
&& $this->_user->hasRightAccessDilicom()
&& !$this->_user->getBibGLN())
- $links = $this->view->tag('p', $this->view->_('%s n\'a pas accès à la consultation en ligne.', $this->_user->getBib()->getLibelle()));
+ $links = $this->_tag('p',
+ $this->_('%s n\'a pas accès à la consultation en ligne.', $this->_user->getBib()->getLibelle()));
return $links . $this->renderBookPreview($album);
}
+
public function renderBookPreview($album) {
- return $this->view->tag('iframe',
- null,
- ['src' => $this->_album->getExternalURI(),
- 'width' => '100%',
- 'height' => '600px']);
+ if (!$url = $this->_previewUrl())
+ return '';
+
+ return $this->_tag('iframe', null,
+ ['src' => $url,
+ 'width' => '100%',
+ 'height' => '600px']);
}
+ public function _previewUrl() {
+ return Class_Url::secureIfNeeded($this->_album->getExternalURI());
+ }
+
protected function getConsultBookAnchor() {
return $this->getDilicomAnchor(['controller' => 'bib-numerique',
'action' => $this->_getConsultBookAction(),
'id' => $this->_album->getId()],
- $this->view->_('Consulter le livre en ligne (depuis la médiathèque)'),
+ $this->_('Consulter le livre en ligne (depuis la médiathèque)'),
['data-popup' => 'true']);
}
@@ -76,17 +85,16 @@ class ZendAfi_View_Helper_TagDilicomWidget extends Zend_View_Helper_HtmlElement
return $this->getDilicomAnchor(['controller' => 'bib-numerique',
'action' => $this->_getLoanBookAction(),
'id' => $this->_album->getId()],
- $this->view->_('Emprunter le livre au format EPUB'),
+ $this->_('Emprunter le livre au format EPUB'),
['data-popup' => 'true']);
}
protected function getDilicomAnchor($url, $label, $attribs = []) {
- return $this->view->tag('div',
- $this->view->tagAnchor($url,
- $label,
- $attribs),
- ['class' => 'dilicom-action']);
+ return $this->_tag('div',
+ $this->view->tagAnchor($url,
+ $label,
+ $attribs),
+ ['class' => 'dilicom-action']);
}
}
-?>
\ No newline at end of file
diff --git a/tests/library/Class/UserDoubleFinderTest.php b/tests/library/Class/UserDoubleFinderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4309d8eabe522df6561c0a25c210fe98e814aba6
--- /dev/null
+++ b/tests/library/Class/UserDoubleFinderTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, 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 UserDoubleFinderWithSingleNanookTest extends ModelTestCase {
+ protected
+ $_storm_default_to_volatile = true,
+ $_result,
+ $_double;
+
+ public function setUp() {
+ parent::setUp();
+
+ $library_commons = ['mail' => null,
+ 'qualite' => 5,
+ 'dernier_ajout' => '0000-00-00',
+ 'ecart_ajouts' => 0,
+ 'date_mail' => '',
+ 'sigb' => 13,
+ 'planif_mode' => 'r',
+ 'planif_jours' => '1111111',
+ 'planif_fois' => 0,
+ 'planif_par' => null,
+ 'comm_sigb' => 7,
+ 'comm_params' => 'a:1:{s:11:"url_serveur";s:53:"http://nanookws.afi-sa.net/afi_NanookWs/ilsdi/meylan/";}',
+ 'pas_exporter' => 0];
+
+ $this->fixture('Class_IntBib',
+ array_merge($library_commons,
+ ['id' => 7,
+ 'nom' => 'Magasin',
+ 'nom_court' => 'Magasin']));
+
+ $this->fixture('Class_IntBib',
+ array_merge($library_commons,
+ ['id' => 2,
+ 'nom' => 'Béalières',
+ 'nom_court' => 'meylan']));
+
+ $this->fixture('Class_IntBib',
+ array_merge($library_commons,
+ ['id' => 3,
+ 'nom' => 'Grand-Pré',
+ 'nom_court' => 'Grand-Pré']));
+
+
+ $user_commons = ['NOM' => 'testing',
+ 'PRENOM' => 'test',
+ 'NAISSANCE' => '1984-04-18',
+ 'LOGIN' => '0046158',
+ 'PASSWORD' => '1984',
+ 'ROLE' => 'abonne_sigb',
+ 'ROLE_LEVEL' => 2,
+ 'IDABON' => '0046158',
+ 'ORDREABON' => 1,
+ 'pseudo' => '',
+ 'DATE_DEBUT' => '',
+ 'ID_SIGB' => '6308',
+ 'CIVILITE' => 0,
+ 'ID_PANIER_COURANT' => 0];
+
+ $this->fixture('Class_Users',
+ array_merge($user_commons,
+ ['id' => 41632,
+ 'ID_SITE' => 2,
+ 'STATUT' => 1,
+ 'DATE_FIN' => '2016-11-24',
+ 'DATE_MAJ' => '2016-11-28',
+ 'SETTINGS' => 'a:1:{s:11:"library_ids";i:60;}',
+ 'id_int_bib' => 2]));
+
+ $this->fixture('Class_Users',
+ array_merge($user_commons,
+ ['id' => 45012,
+ 'ID_SITE' => 3,
+ 'STATUT' => 0,
+ 'DATE_FIN' => '2017-11-29',
+ 'DATE_MAJ' => '2017-04-18',
+ 'SETTINGS' => 'a:1:{s:11:"library_ids";s:0:"";}',
+ 'id_int_bib' => 3]));
+
+
+ $patron = (new Class_Entity())
+ ->setLogin('0046158')
+ ->setPassword('1984')
+ ->setIdabon('0046158')
+ ->setOrdreabon(1)
+ ->setIdSigb('6308')
+ ->setIdSite(3)
+ ->setIdIntBib(7);
+
+ $finder = new Class_User_DoubleFinder($patron);
+ if ($this->_result = $finder->find())
+ $this->_double = $finder->getDouble();
+ }
+
+
+ /** @test */
+ public function shouldFindDouble() {
+ $this->assertTrue($this->_result);
+ }
+
+
+ /** @test */
+ public function doubleLibraryShouldBe3() {
+ $this->assertEquals(3, $this->_double->getIdSite());
+ }
+}
diff --git a/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php b/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php
index 60faee4900c605ca370e535661e97e34b156182f..0f914fed16fa88f28f999ff30e1a071f96b53d48 100644
--- a/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php
+++ b/tests/library/ZendAfi/View/Helper/RenderAlbumTest.php
@@ -338,11 +338,11 @@ class ZendAfi_View_Helper_RenderAlbumDilicomPNBTest extends ZendAfi_View_Helper_
public function setUp() {
parent::setUp();
- $this->fixture('Class_Bib',
- ['id' => 1,
- 'libelle' => 'Annecy',
- 'gln' => '333'
- ]);
+
+ $this->fixture('Class_Bib', ['id' => 1,
+ 'libelle' => 'Annecy',
+ 'gln' => '333']);
+
$this->logged_user = $this->fixture('Class_Users',
['id' => 6,
'nom'=>'Pito',
@@ -354,21 +354,29 @@ class ZendAfi_View_Helper_RenderAlbumDilicomPNBTest extends ZendAfi_View_Helper_
['id' => '20',
'libelle' => 'Multimedia',
'rights' => [Class_UserGroup::RIGHT_ACCES_PNB_DILICOM]])]]);
+
$this->logged_user->beAbonneSIGB()->assertSave();
ZendAfi_Auth::getInstance()->logUser($this->logged_user);
- $this->fixture('Class_Loan_Pnb',
- ['id' => 1,
- 'record_origin_id' => 'Dilicom-88817216',
- 'user_id' => '6']);
+ $this->fixture('Class_Loan_Pnb', ['id' => 1,
+ 'record_origin_id' => 'Dilicom-88817216',
+ 'user_id' => '6']);
$this->_html = $this->_helper->renderAlbum($this->book);
}
+ public function tearDown() {
+ unset($_SERVER['HTTPS']);
+ parent::tearDown();
+ }
+
+
/** @test */
public function htmlShouldContainsIFrameOnEdenBook() {
- $this->assertXPath($this->_html, '//iframe[@src="http://www.edenlivres.fr/p/23416"][@width="100%"][@height="600px"]', $this->_html);
+ $this->assertXPath($this->_html,
+ '//iframe[@src="http://www.edenlivres.fr/p/23416"][@width="100%"][@height="600px"]',
+ $this->_html);
}
@@ -395,4 +403,15 @@ class ZendAfi_View_Helper_RenderAlbumDilicomPNBTest extends ZendAfi_View_Helper_
$this->assertXPathContentContains($this->_html,
'//p', utf8_encode('Annecy n\'a pas accès à la consultation en ligne'));
}
+
+
+ /** @test */
+ public function withHttpsPreviewSrcShouldBeHttps() {
+ $_SERVER['HTTPS'] = 'on';
+
+ $this->_html = $this->_helper->renderAlbum($this->book);
+ $this->assertXPath($this->_html,
+ '//iframe[@src="https://www.edenlivres.fr/p/23416"][@width="100%"][@height="600px"]',
+ $this->_html);
+ }
}