diff --git a/cosmogramme/sql/patch/patch_320.php b/cosmogramme/sql/patch/patch_320.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a409e4589630bd1210998f5696173a7613b299a
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_320.php
@@ -0,0 +1,3 @@
+<?php
+(new Class_Migration_DigitalResource_LeKiosk())->run();
+?>
\ No newline at end of file
diff --git a/library/Class/Migration/DigitalResource/LeKiosk.php b/library/Class/Migration/DigitalResource/LeKiosk.php
new file mode 100644
index 0000000000000000000000000000000000000000..e51f161a328722d83b0bcc603e735cd9eb63cb42
--- /dev/null
+++ b/library/Class/Migration/DigitalResource/LeKiosk.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, 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 Class_Migration_DigitalResource_LeKiosk {
+ use Trait_MemoryCleaner;
+
+ const OLD_LEKIOSK_RIGHT_TOKEN = 21;
+
+ protected $_found_lekiosk_in_profil = false;
+
+
+ public function run() {
+ $this
+ ->renameMenusKeys()
+ ->upgradePermissions();
+ }
+
+
+ protected function upgradePermissions() {
+ foreach(Class_UserGroup::findAll() as $group)
+ $this->replacePermission($group);
+ $this->_cleanMemory();
+ return $this;
+ }
+
+
+ protected function replacePermission($group) {
+ $old_rights = $group->getRightsToken();
+ $permissions = [];
+
+ if((pow(2, static::OLD_LEKIOSK_RIGHT_TOKEN) & $old_rights) === pow(2, static::OLD_LEKIOSK_RIGHT_TOKEN))
+ $permissions[] = Lekiosk_Config::getInstance()->getPermission();
+
+ $group
+ ->setRights($group->getRights())
+ ->save();
+
+ (new Storm_Model_Collection($permissions))
+ ->eachDo(function($permission) use ($group)
+ {
+ $permission->permitTo($group, new Class_Entity());
+ });
+
+ return $group;
+ }
+
+
+ protected function renameMenusKeys() {
+ foreach(Class_Profil::findAll() as $profil)
+ $this->searchAndRename($profil);
+ $this->_cleanMemory();
+ return $this;
+ }
+
+
+ protected function searchAndRename($profil) {
+ $this->_found_lekiosk_in_profil = false;
+ $cfg_menu = $profil->getCfgMenusAsArray();
+ $cfg_menu = $this->recursiveSearchAndRename('LEKIOSK', Lekiosk_Config::getName(), $cfg_menu);
+
+ if($this->_found_lekiosk_in_profil)
+ $profil
+ ->setCfgMenus($cfg_menu)
+ ->save();
+
+ return $profil;
+ }
+
+
+ protected function recursiveSearchAndRename($search, $replace, $subject){
+ foreach($subject as $key => $value) {
+ if($search === $value){
+ $this->_found_lekiosk_in_profil = true;
+ $subject[$key] = $replace;
+ return $subject;
+ }
+ if(is_array($value))
+ $subject[$key] = $this->recursiveSearchAndRename($search, $replace, $value);
+ }
+ return $subject;
+ }
+
+}
\ No newline at end of file
diff --git a/library/Class/Systeme/ModulesMenu.php b/library/Class/Systeme/ModulesMenu.php
index 8a122b1249207777675560c05569816f18aa056d..7e55aeafbbba51c73f368bca3e4b2c313e76f0c3 100644
--- a/library/Class/Systeme/ModulesMenu.php
+++ b/library/Class/Systeme/ModulesMenu.php
@@ -122,7 +122,6 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract {
"CVS" => new Class_Systeme_ModulesMenu_CVS(),
"NUMILOG" => new Class_Systeme_ModulesMenu_Numilog(),
"ARTEVOD" => new Class_Systeme_ModulesMenu_ArteVOD(),
- "LEKIOSK" => new Class_Systeme_ModulesMenu_LeKiosk(),
"ORTHODIDACTE" => new Class_Systeme_ModulesMenu_Orthodidacte(),
"MUSICME" => new Class_Systeme_ModulesMenu_MusicMe(),
"MYCOW" => new Class_Systeme_ModulesMenu_MyCow(),
diff --git a/library/Class/UserGroup.php b/library/Class/UserGroup.php
index f0e3a6ce29e3dcaa2522b68977364f591f7f27ea..cc9e3097c4362df5e6f903d4d77116c768b6c32d 100644
--- a/library/Class/UserGroup.php
+++ b/library/Class/UserGroup.php
@@ -138,7 +138,6 @@ class Class_UserGroup extends Storm_Model_Abstract {
const RIGHT_ACCES_TOUTAPPRENDRE = 6;
const RIGHT_ACCES_MUSICME = 7;
const RIGHT_ACCES_NUMERIQUEPREMIUM = 20;
- const RIGHT_ACCES_LEKIOSK = 21;
const RIGHT_ACCES_CYBERLIBRIS = 22;
const RIGHT_ACCES_MYCOW = 24;
const RIGHT_ACCES_KIDILANGUES = 25;
@@ -185,7 +184,6 @@ class Class_UserGroup extends Storm_Model_Abstract {
self::RIGHT_ACCES_TOUTAPPRENDRE => 'Bibliothèque numérique: accéder à Tout Apprendre',
self::RIGHT_ACCES_NUMERIQUEPREMIUM => 'Bibliothèque numérique: accéder à Numérique Premium',
self::RIGHT_ACCES_MUSICME => 'Bibliothèque numérique: accéder à Music Me',
- self::RIGHT_ACCES_LEKIOSK => 'Bibliothèque numérique: accéder à Lekiosk.com',
self::RIGHT_ACCES_MYCOW => 'Bibliothèque numérique: accéder à MyCOW.EU',
self::RIGHT_ACCES_PLANETNEMO => 'Bibliothèque numérique: accéder à planetnemo.fr',
self::RIGHT_ACCES_KIDILANGUES => 'Bibliothèque numérique: accéder à Kidilangues',
@@ -236,7 +234,6 @@ class Class_UserGroup extends Storm_Model_Abstract {
'CVS' => [Class_UserGroup::RIGHT_ACCES_CVS],
'Numilog' => [Class_UserGroup::RIGHT_ACCES_NUMILOG],
'Vodeclic' => [Class_UserGroup::RIGHT_ACCES_VODECLIC],
- 'Lekiosk' => [Class_UserGroup::RIGHT_ACCES_LEKIOSK],
'ToutApprendre' => [Class_UserGroup::RIGHT_ACCES_TOUTAPPRENDRE],
'MusicMe' => [Class_UserGroup::RIGHT_ACCES_MUSICME],
'NumeriquePremium' => [Class_UserGroup::RIGHT_ACCES_NUMERIQUEPREMIUM],
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 01a2cec25dbae49d770cb6ac045906381d9b12bd..5adf61f55ec6804f7c265e1bdbc692c7533083e0 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -944,11 +944,6 @@ class Class_Users extends Storm_Model_Abstract {
}
- public function hasRightAccesLeKiosk() {
- return $this->isAbonneAndHasRightToAccess(Class_UserGroup::RIGHT_ACCES_LEKIOSK);
- }
-
-
public function hasRightAccessCyberlibris() {
return $this->isAbonneAndHasRightToAccess(Class_UserGroup::RIGHT_ACCES_CYBERLIBRIS);
}
diff --git a/library/digital_resources/Lekiosk/tests/catalogue.xml b/library/digital_resources/Lekiosk/tests/catalogue.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d331aa78de7606f736cdbeda0d05382f68ed020
Binary files /dev/null and b/library/digital_resources/Lekiosk/tests/catalogue.xml differ
diff --git a/tests/library/Class/Migration/DigitalResource/LeKioskTest.php b/tests/library/Class/Migration/DigitalResource/LeKioskTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2983888bca7906d714894135ed66218ff3ef0d03
--- /dev/null
+++ b/tests/library/Class/Migration/DigitalResource/LeKioskTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, 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 Class_Migration_DigitialResource_LeKioskTest extends ModelTestCase {
+ protected
+ $_storm_default_to_volatile = true,
+ $_migration;
+
+ public function setUp() {
+ parent::setUp();
+ Class_DigitalResource::resetInstance();
+
+ $cfg_menus = ['H' => ['libelle' => 'Menu horizontal',
+ 'picto' => 'vide.gif',
+ 'menus' => [
+ ['type_menu' => 'MENU',
+ 'libelle' => 'Pratique',
+ 'picto' => 'bookmark.png',
+ 'preferences' => [],
+ 'sous_menus' => [
+ ['type_menu' => 'ACCUEIL',
+ 'libelle' => 'Accueil',
+ 'picto' => 'vide.gif',
+ 'preferences' => [],
+ 'sous_menus' => ''],
+
+ ['type_menu' => 'LEKIOSK',
+ 'libelle' => 'Lien vers LeKiosk',
+ 'preferences' => [],
+ 'picto' => 'vide.gif'] ]]]]];
+
+ $cfg_menus_without_lekiosk = ['H' => ['libelle' => 'Menu horizontal',
+ 'picto' => 'vide.gif',
+ 'menus' => [
+ ['type_menu' => 'MENU',
+ 'libelle' => 'Pratique',
+ 'picto' => 'bookmark.png',
+ 'preferences' => [],
+ 'sous_menus' => [
+ ['type_menu' => 'ACCUEIL',
+ 'libelle' => 'Accueil',
+ 'picto' => 'vide.gif',
+ 'preferences' => [],
+ 'sous_menus' => ''] ]]]]];
+
+
+ $profil_adulte = $this->fixture('Class_Profil',
+ ['id' => 22,
+ 'rewrite_url' => 'adulte'])
+ ->setBrowser('opac')
+ ->setLibelle('Profil Adulte')
+ ->setCfgMenus($cfg_menus);
+
+ $profil_without_lekiosk = $this->fixture('Class_Profil',
+ ['id' => 23,
+ 'rewrite_url' => 'adulte'])
+ ->setBrowser('opac')
+ ->setLibelle('Profil Adulte')
+ ->setCfgMenus($cfg_menus_without_lekiosk);
+
+
+ Class_Profil::setCurrentProfil($profil_adulte);
+
+ $this->fixture('Class_UserGroup',
+ ['id' => 2,
+ 'libelle' => 'team ONE',
+ 'rights_token' => pow(2, 21)]);
+
+ $this->fixture('Class_AdminVar',
+ ['id' => 'LEKIOSK_ID',
+ 'valeur' => 1]);
+
+ $this->_migration = (new Class_Migration_DigitalResource_LeKiosk())
+ ->setMemoryCleaner(function(){})
+ ->run();
+ }
+
+
+ public function tearDown() {
+ Class_DigitalResource::resetInstance();
+ parent::tearDown();
+ }
+
+
+
+ /** @test */
+ public function profilMenuWithAssimilShouldContainsLekiosk() {
+ $this->assertEquals('Lekiosk', Class_Profil::find(22)->getCfgMenusAsArray()['H']['menus'][0]['sous_menus'][1]['type_menu']);
+ }
+
+
+ /** @test */
+ public function teamOneShouldHavePermissionOnLekiosk() {
+ if (!$permissions = Class_UserGroup::find(2)->getPermissions())
+ return $this->fail();
+ $this->assertEquals('Lekiosk', array_shift($permissions)->getCode());
+ }
+
+
+ /** @test */
+ public function teamOneRightsShouldBeCleaned() {
+ $this->assertEmpty(Class_UserGroup::find(2)->getRightsToken());
+ }
+}