From da99aa18b6a01322de968151bb3269f8fd8b44d4 Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Fri, 18 Mar 2022 19:19:19 +0100
Subject: [PATCH] refs #19089 [fid_adlr] finc/dbis: remove redundant code and
update package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* remove redundant configuration
* remove redundant MyResearchController
* remove redundant templates
* remove redundant German translations
** use "devops/i18n-merge.sh data/i18n/languages/de.ini themes/fid_adlr/languages/de.ini themes/fid/languages/de.ini":
** remove duplicate token "Username " and E-Mail-Adresse with parent file.
** remove duplicate token "dbis_hint " and "Hinweis" with parent file.
** remove duplicate token "dbis_licenses_name_long " and "Zugang zu freien und lizenzierten Fachdatenbanken" with parent file.
** remove duplicate token "dbis_name " and "Fachdatenbanken" with parent file.
** remove duplicate token "licenses " and "Datenbanken" with parent file.
** remove duplicate token "licenses_desc_1 " and "Momentan haben Sie Zugriff auf:" with parent file.
** remove duplicate token "licenses_not_available " and "Diese Lizenzen sind derzeit leider nicht verfügbar." with parent
* remove redundant English translations
** use "devops/i18n-merge.sh data/i18n/languages/en.ini themes/fid_adlr/languages/en.ini themes/fid/languages/en.ini":
** remove duplicate token "Username " and Email address with parent file.
** remove duplicate token "dbis_hint " and "Notice" with parent file.
** remove duplicate token "dbis_licenses_name_long " and "Access to free and licensed databases" with parent file.
** remove duplicate token "dbis_name " and "subject-specific Databases" with parent file.
** remove duplicate token "dbis_text " and "The subject-specific databases shown below and provided by DBIS are free to access. If you are logged in with your user account, additional databases which are specifically licensed by your home library are also listed. As a rule, these can only be accessed via your respective university network or VPN access." with parent file.
** remove duplicate token "licenses " and "Databases" with parent file.
** remove duplicate token "licenses_desc_1 " and "Currently, you have access to:" with parent file.
** remove duplicate token "licenses_desc_2 " and "Further license offers are in preparation. You may also write us your suggestions, which offers should also be licensed. Please use our <a href="../Contact/ContactForm">contact form</a>.<br /><br /><br />Our <a href="../AdlrRegistration/Terms">terms of use</a> apply." with parent file.
** remove duplicate token "licenses_forbidden_login_required " and "These licenses are only available for registered users in certain user groups." with parent file.
** remove duplicate token "licenses_forbidden_permission_denied " and "Licensed resources are not available for your user group." with parent file.
** remove duplicate token "licenses_not_available " and "Licensed resources temporarily not available." with parent file.
** remove duplicate token "licenses_notice_html " and "Please use the newspaper archives for normal searches only. The licences granted are not designed for mass retrieval of newspaper pages (e.g. for text mining). Downloads beyond the usual level will lead to premature expiry of the licensed quotas and is at the expense of your colleagues.<br /><br />Please always contact us in advance by e-mail or via our <a data-lightbox href="%%contact_url%%">contact form</a> if you would like to retrieve a larger number of documents for a research project or use text mining. We will then get in touch with you. <br /><br />Please also note our <a data-lightbox href="%%terms_url%%">Terms of Use</a>.<br /><br />Thank you for your understanding." with parent file.
* finc/dbis: update package version to 4.0.1 for short open tags
---
composer.local.2.fid-adlr.json | 2 +-
composer.lock | 10 +-
fid_adlr/config/vufind/permissions.ini | 10 -
module/fid_adlr/config/module.config.php | 7 +-
.../src/Controller/MyResearchController.php | 218 ------------------
.../MyResearchControllerFactory.php | 51 ----
themes/fid_adlr/languages/de.ini | 8 -
themes/fid_adlr/languages/en.ini | 13 --
.../templates/myresearch/databases.phtml | 57 -----
.../templates/myresearch/dbis-content.phtml | 30 ---
10 files changed, 9 insertions(+), 397 deletions(-)
delete mode 100644 module/fid_adlr/src/Controller/MyResearchController.php
delete mode 100644 module/fid_adlr/src/Controller/MyResearchControllerFactory.php
delete mode 100644 themes/fid_adlr/templates/myresearch/databases.phtml
delete mode 100644 themes/fid_adlr/templates/myresearch/dbis-content.phtml
diff --git a/composer.local.2.fid-adlr.json b/composer.local.2.fid-adlr.json
index 8b1c60798da..e7c141b478e 100644
--- a/composer.local.2.fid-adlr.json
+++ b/composer.local.2.fid-adlr.json
@@ -6,7 +6,7 @@
},
"require": {
"finc/boss-module": "^0.0.13",
- "finc/dbis-module": "^4.0.0",
+ "finc/dbis-module": "^4.0.1",
"finc/worldcat-search-module": "^1.0.1"
},
"extra": {
diff --git a/composer.lock b/composer.lock
index a77f9fd62ff..38f7a865d8d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -553,11 +553,11 @@
},
{
"name": "finc/dbis-module",
- "version": "v4.0.0",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://git.sc.uni-leipzig.de/ubl/finc/fid/dbis-module.git",
- "reference": "0159b9d75278af7c8889201e3783a70f9dee3bc6"
+ "reference": "b4690c979e64e4859fe4bfc4fe935becdccf8ea4"
},
"require": {
"finc/symfony-serializer-zend-bridge": "^0.0.1",
@@ -595,7 +595,7 @@
"email": "lange@ub.uni-leipzig.de"
}
],
- "time": "2021-08-26T08:21:00+00:00"
+ "time": "2022-03-20T08:18:41+00:00"
},
{
"name": "finc/rules-evaluator",
@@ -7955,6 +7955,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2017-11-27T05:48:46+00:00"
},
{
@@ -8416,6 +8417,7 @@
],
"description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
"homepage": "https://github.com/sebastianbergmann/finder-facade",
+ "abandoned": true,
"time": "2017-11-18T17:31:49+00:00"
},
{
@@ -8704,7 +8706,6 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "abandoned": true,
"time": "2015-07-28T20:34:47+00:00"
},
{
@@ -9593,6 +9594,7 @@
],
"description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
"homepage": "https://github.com/theseer/fDOMDocument",
+ "abandoned": true,
"time": "2017-06-30T11:53:12+00:00"
},
{
diff --git a/fid_adlr/config/vufind/permissions.ini b/fid_adlr/config/vufind/permissions.ini
index 3379f644456..0619f2c205a 100644
--- a/fid_adlr/config/vufind/permissions.ini
+++ b/fid_adlr/config/vufind/permissions.ini
@@ -21,16 +21,6 @@ relative_path = ../../../fid/config/vufind/permissions.ini
;##################### DO NOT DELETE THIS HEADER ####################
;####################################################################
-[default.DBIS]
-role[] = guest
-role[] = loggedin
-permission = access.DBIS
-
-[default.Licenses]
-role[] = loggedin
-FidApiPermission[] = full_access
-permission = access.Licenses
-
[default.Worldcat]
role[] = guest
role[] = loggedin
diff --git a/module/fid_adlr/config/module.config.php b/module/fid_adlr/config/module.config.php
index 6c895ddf2ff..ff6ce5949a8 100644
--- a/module/fid_adlr/config/module.config.php
+++ b/module/fid_adlr/config/module.config.php
@@ -20,11 +20,10 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU GPLv2
*/
+use fid\Controller\MyResearchController;
use fid\FormModel\PasswordChangeModel;
use fid_adlr\Controller\FeedbackController;
use fid_adlr\Controller\FeedbackControllerDelegatorFactory;
-use fid_adlr\Controller\MyResearchController;
-use fid_adlr\Controller\MyResearchControllerFactory;
use fid_adlr\Controller\RecordController;
use fid_adlr\Controller\RecordControllerDelegatorFactory;
use fid_adlr\Controller\SearchController;
@@ -42,13 +41,11 @@ $config = [
],
'controllers' => [
'factories' => [
- MyResearchController::class => MyResearchControllerFactory::class,
FeedbackController::class => 'VuFind\Controller\AbstractBaseFactory',
RecordController::class => AbstractBaseWithConfigFactory::class,
SearchController::class => AbstractBaseWithConfigFactory::class,
],
'aliases' => [
- 'my-research' => MyResearchController::class,
'feedback' => FeedbackController::class,
'Feedback' => FeedbackController::class,
'Search' => SearchController::class,
@@ -224,4 +221,4 @@ $routeGenerator = new \VuFind\Route\RouteGenerator($nonTabRecordActions);
$routeGenerator->addRecordRoutes($config, $recordRoutes);
$routeGenerator->addStaticRoutes($config, $staticRoutes);
-return $config;
\ No newline at end of file
+return $config;
diff --git a/module/fid_adlr/src/Controller/MyResearchController.php b/module/fid_adlr/src/Controller/MyResearchController.php
deleted file mode 100644
index 71ba00246c7..00000000000
--- a/module/fid_adlr/src/Controller/MyResearchController.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * MyResearch Controller
- *
- * PHP version 7
- *
- * Copyright (C) 2019 Leipzig University Library
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * @category VuFind
- * @package Controller
- * @author Robert Lange <lange@ub.uni-leipzig.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link https://vufind.org Main Site
- */
-namespace fid_adlr\Controller;
-
-use fid\Service\Client;
-use fid\Service\ClientException;
-use fid\Service\DataTransferObject\Library;
-use VuFind\Exception\Forbidden;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-/**
- * Controller for the user account area.
- *
- * @category VuFind
- * @package Controller
- * @author Robert Lange <lange@ub.uni-leipzig.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link https://vufind.org Main Site
- */
-class MyResearchController extends \VuFind\Controller\MyResearchController
-{
- /**
- * @var \Zend\Config\Config
- */
- protected $mainConfig;
-
- /**
- * @var \fid\Service\Client
- */
- protected $fidClient;
-
- /**
- * MyResearchController constructor.
- *
- * @param ServiceLocatorInterface $serviceLocator
- * @param array fid config $config
- */
- public function __construct(
- ServiceLocatorInterface $serviceLocator
- ) {
- parent::__construct($serviceLocator);
- $this->mainConfig = $this->getConfig();
- }
-
- /**
- * @param Client $fidClient
- */
- public function setFidClient(Client $fidClient): void
- {
- $this->fidClient = $fidClient;
- }
-
- /**
- * Show links for Access to Specific and Press Databases, E-Books
- *
- * @return mixed
- * @throws \VuFind\Exception\ILS
- */
- public function databasesAction()
- {
- if (($user = $this->getUser())) {
- $patron = $this->catalogLogin();
- }
-
- $hasDbis = $this->hasDbis();
- $hasLicenses = $this->hasLicenses();
-
- if (!$hasDbis && !$hasLicenses) {
- return $this->forwardTo('MyResearch', 'Profile');
- }
-
- $view = $this->createViewModel(['user' => $user ?? null]);
-
- if ($hasDbis) {
- $view->isDbisAvailable = true;
-
- if ($this->fidClient->isLoggedOn() && isset($patron['user'])) {
-
- try {
- $library = $this->getHomeLibrary($patron);
- $view->homeLibrary = $library->getDbis();
- $view->map_bibid_to_dbis = false;
- } catch (ClientException $exception) {
- // TODO: Implement logging (in database?)
- $view->homeLibrary = $patron['user']->getHomeLibrary();
- $view->map_bibid_to_dbis = true;
- }
- }
- }
-
- if ($hasLicenses) {
- $view->licenses = $this->getLicenses();
- }
-
- if (!empty($patron)) {
- $catalog = $this->getILS();
- $this->addAccountBlocksToFlashMessenger($catalog, $patron);
- }
-
- $view->setTemplate('myresearch/databases');
- return $view;
- }
-
- /**
- * Check if DBIS module is active and user has permission
- *
- * @return bool
- */
- public function hasDbis(): bool
- {
- // Is module activated?
- if (!isset($this->mainConfig['ExternalDatabases']['DBIS'])
- || $this->mainConfig['ExternalDatabases']['DBIS'] != true) {
- return false;
- }
-
- // Has user rights to access?
- try {
- return $this->permission()->check('access.DBIS', 'exception') == null;
- } catch (Forbidden $e) {
- // Permission Plugin needs cumbersome exception for logged-in users
- }
-
- return false;
- }
-
- /**
- * @param $patron
- * @return \fid\Service\DataTransferObject\Library | null
- * @throws \fid\Service\ClientException
- */
- protected function getHomeLibrary($patron): ?Library
- {
- if (is_a($patron['user'], 'fid\Service\DataTransferObject\User')
- && $patron['user']->getHomeLibrary())
- {
- if (isset($patron['libs'][$patron['user']->getHomeLibrary()])) {
- return $patron['libs'][$patron['user']->getHomeLibrary()];
- }
-
- /* no home library found in patron object? => fetch library from api directly */
- return $this->fidClient->requestLibraryById($patron['user']->getHomeLibrary());
- }
-
- return null;
- }
-
- /**
- * Check if licenses are specified and user has permission
- *
- * @return bool
- */
- public function hasLicenses(): bool
- {
- // Are licenses configured
- if (!isset($this->mainConfig['MediaLicenses']) || count($this->mainConfig['MediaLicenses']) == 0) {
- return false;
- }
-
- // Has user rights to access?
- try {
- return $this->permission()->check('access.Licenses', 'exception') == null;
- } catch (Forbidden $e) {
- // Permission Plugin needs cumbersome exception for logged-in users
- }
-
- return false;
- }
-
- /**
- * Get links for licensed resources
- *
- * @return mixed
- */
- protected function getLicenses()
- {
- $licenses = false;
- $configLicenses = $this->mainConfig['MediaLicenses'] ?? [];
-
- if (count($configLicenses) > 0) {
- $licenses = [];
- $i = 0;
- foreach ($configLicenses as $key => $value) {
- $licenses[$i]['name'] = $key;
- $licenses[$i]['url'] = $value;
- $licenses[$i]['desc'] = $this->translate('licenses_' . $key . '_desc', [], '');
- $i++;
- }
- }
-
- return $licenses;
- }
-}
diff --git a/module/fid_adlr/src/Controller/MyResearchControllerFactory.php b/module/fid_adlr/src/Controller/MyResearchControllerFactory.php
deleted file mode 100644
index 89d971c4c1f..00000000000
--- a/module/fid_adlr/src/Controller/MyResearchControllerFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Service MyResearchControllerFactory
- *
- * PHP version 7
- *
- * Copyright (C) 2019 Leipzig University Library
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * @category VuFind
- * @package Controller
- * @author Robert Lange <lange@ub.uni-leipzig.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link https://vufind.org/wiki/development Wiki
- */
-
-namespace fid_adlr\Controller;
-
-use fid\Service\Client;
-use Psr\Container\ContainerInterface;
-use Zend\ServiceManager\ServiceManager;
-
-class MyResearchControllerFactory
-{
- public function __construct()
- {
- return null;
- }
-
- public function __invoke(ContainerInterface $container)
- {
- /** @var ServiceManager $serviceManager */
- $serviceManager = $container->get(ServiceManager::class);
- $controller = new MyResearchController($serviceManager);
- $controller->setFidClient($container->get(Client::class));
-
- return $controller;
- }
-}
diff --git a/themes/fid_adlr/languages/de.ini b/themes/fid_adlr/languages/de.ini
index 1134f668d44..9c9cd43d046 100644
--- a/themes/fid_adlr/languages/de.ini
+++ b/themes/fid_adlr/languages/de.ini
@@ -1,7 +1,6 @@
Your Profile = Mein Konto
Forgot Password = Passwort vergessen?
Services for subject specialists = Service für Fachreferate
-Username = E-Mail-Adresse
offcanvas-toggler-myresearch = "Profilmenü einblenden"
; Branding for Source Ids (result list)
@@ -22,24 +21,17 @@ contact_form_subject_main = "Betreff"
contact_form_response = "Herzlichen Dank für Ihre Anfrage. Wir kümmern uns schnellstmöglich um Ihr Anliegen und melden uns in Kürze bei Ihnen zurück."
; DBIS / Licenses
-dbis_hint = "Hinweis"
dbis_licenses_name = "Datenbanken mit adlr.link-Lizenz"
-dbis_licenses_name_long = "Zugang zu freien und lizenzierten Fachdatenbanken"
-dbis_name = "Fachdatenbanken"
dbis_text = "Diese Übersicht zeigt Ihnen alle frei verfügbaren Datenbanken aus DBIS zum Fachgebiet der Kommunikations- und Medienwissenschaft an. Wenn Sie mit Ihrem Konto eingeloggt sind, werden Ihnen zusätzlich die bei Ihrer Heimatbibliothek lizenzierten Datenbanken angezeigt. Diese sind i. d. R. nur über Ihr jeweiliges Universitätsnetz bzw. per VPN-Zugang abrufbar."
-licenses = "Datenbanken"
licenses_FAZ = "Frankfurter Allgemeine Zeitung/Frankfurter Rundschau"
licenses_FAZ_desc = "Pressedatenbank mit allen Artikeln der F.A.Z. (ab 1949), der Frankfurter Allgemeinen Sonntagszeitung (ab 1990), FAZ.NET (ab 2001), Frankfurter Allgemeine Woche (ab 2016), Frankfurter Allgemeine Quarterly (ab 2016) und Frankfurt Allgemeine Metropol (ab 2016) sowie der Frankfurter Rundschau (ab 1995). Artikel können auch als faksimilierte Artikel-Clips im Original-Layout bzw. als Ganzseite (als PDF) abgerufen werden."
licenses_SZ = "Süddeutsche Zeitung"
licenses_SZ_desc = "Pressedatenbank mit allen Artikel der Süddeutschen Zeitung (Ausgaben jeweils für Deutschland, Bayern und München) ab 1992, SZ-Landkreisausgaben ab 1994, SZ-Supplements wie beispielsweise SZ Magazin, SZ für Kinder, jetzt sowie SZ.de. Die Artikel sind auch als Ganzseiten (PDF) verfügbar."
licenses_WISO = "WISO (BILD/BILD am Sonntag/FOCUS/DER SPIEGEL/Stern/DIE ZEIT)"
licenses_WISO_desc = "Pressedatenbank mit allen Artikeln der BILD-Zeitung (incl. aller Regionalausgaben) und der BILD am Sonntag (ab 2014, auch als Ganzseiten-PDF), von FOCUS (ab 3/1993) und FOCUS Money (ab 2000) (Ganzseiten-PDF ab 4/2017), DER SPIEGEL (ab 1993), SPIEGEL ONLINE (ab 3/2002), SPIEGEL special (ab 3/2003), kulturSPIEGEL (ab 1/2003) und uniSPIEGEL (ab 5/2003), Stern (ab 1/1996) sowie der ZEIT (ab 1994, auch als Ganzseiten-PDF)."
-licenses_desc_1 = "Momentan haben Sie Zugriff auf:"
licenses_forbidden_login_required = "Diese Lizenzen sind nur in bestimmten Nutzer:innengruppen verfügbar."
licenses_forbidden_permission_denied = "Diese Lizenzen sind für Ihre Nutzer:innengruppe leider nicht verfügbar."
-licenses_not_available = "Diese Lizenzen sind derzeit leider nicht verfügbar."
licenses_notice_html = "Bitte nutzen Sie die Zeitungsarchive nur für Recherchen in üblichen Maßen. Die eingeräumten Lizenzen sind nicht für einen massenhaften Abruf von Zeitungsseiten ausgelegt (auch nicht für Textmining). Ein Abruf über das übliche Maß hinaus führt zu einem frühen Erschöpfen der lizenzierten Kontingente und geht zu Lasten Ihrer Kolleg:innen.<br /><br />Bitte kontaktieren Sie uns immer vorab per E-Mail oder über unser <a data-lightbox href="%%contact_url%%">Kontaktformular</a>, wenn Sie für ein Forschungsprojekt eine größere Anzahl an Dokumenten abrufen bzw. Textmining nutzen möchten. Wir setzen uns dann mit Ihnen in Verbindung. <br /><br />Bitte beachten Sie auch unsere <a data-lightbox="" href="%%terms_url%%">Nutzungsbedingungen</a><br /><br />Herzlichen Dank für Ihr Verständnis!"
-licenses_search = "Datenbanken"
licenses_text = "Hier haben Sie Zugang zu Datenbanken, die speziell durch adlr.link für Sie lizenziert wurden. Die Kosten übernehmen wir für Sie."
; Home Section
diff --git a/themes/fid_adlr/languages/en.ini b/themes/fid_adlr/languages/en.ini
index e71aa3671ab..3882fc2c60a 100644
--- a/themes/fid_adlr/languages/en.ini
+++ b/themes/fid_adlr/languages/en.ini
@@ -1,7 +1,6 @@
Your Profile = My account
Forgot Password = Forgot your password?
Services for subject specialists = Services for Subject Specialists
-Username = Email address
offcanvas-toggler-myresearch = "Show profile options"
; Branding for Source Ids (result list)
@@ -22,25 +21,13 @@ contact_form_subject_main = "How can we help you?"
contact_form_response = "Thank you very much for your inquiry. We will deal with your request as soon as possible and get back to you shortly."
; DBIS / Licenses
-dbis_hint = "Notice"
dbis_licenses_name = "Databases with adlr.link license"
-dbis_licenses_name_long = "Access to free and licensed databases"
-dbis_name = "subject-specific Databases"
-dbis_text = "The subject-specific databases shown below and provided by DBIS are free to access. If you are logged in with your user account, additional databases which are specifically licensed by your home library are also listed. As a rule, these can only be accessed via your respective university network or VPN access."
-licenses = "Databases"
licenses_FAZ = "F.A.Z.-Corporate (Frankfurter Allgemeine Zeitung/Frankfurter Rundschau)"
licenses_FAZ_desc = "Press database with all articles of the F.A.Z. (since 1949), the Frankfurter Allgemeine Sonntagszeitung (since 1990), FAZ.NET (since 2001), Frankfurter Allgemeine Woche (from 2016), Frankfurter Allgemeine Quarterly (since 2016) and Frankfurt Allgemeine Metropol (since 2016) as well as the Frankfurter Rundschau (since 1995). Articles can also be called up as facsimilized article clips in the original layout or as full page (PDF)."
licenses_SZ = "SZ-Library Net (Süddeutsche Zeitung)"
licenses_SZ_desc = "Press database with all articles of the Süddeutsche Zeitung (German-wide, Bavarian und Munich issue, respectively) since 1992, SZ-Landkreisausgaben since 1994, SZ supplements like SZ Magazin, SZ für Kinder, jetzt, and SZ.de. The articles are also available as full pages (PDF)."
licenses_WISO = "WISO (BILD/BILD am Sonntag/FOCUS/DER SPIEGEL/Stern/DIE ZEIT)"
licenses_WISO_desc = "Press database with all articles of BILD (incl. all regional editions) and BILD am Sonntag (since 2014, also as full-page PDF), FOCUS (since 3/1993) and FOCUS Money (since 2000) (full-page PDF since 4/2017), DER SPIEGEL (since 1993), SPIEGEL ONLINE (since 3/2002), SPIEGEL special (since 3/2003), kulturSPIEGEL (since 1/2003) and uniSPIEGEL (since 5/2003), Stern (since 1/1996) and DIE ZEIT (since 1994, also as full-page PDF)."
-licenses_desc_1 = "Currently, you have access to:"
-licenses_desc_2 = "Further license offers are in preparation. You may also write us your suggestions, which offers should also be licensed. Please use our <a href="../Contact/ContactForm">contact form</a>.<br /><br /><br />Our <a href="../AdlrRegistration/Terms">terms of use</a> apply."
-licenses_forbidden_login_required = "These licenses are only available for registered users in certain user groups."
-licenses_forbidden_permission_denied = "Licensed resources are not available for your user group."
-licenses_not_available = "Licensed resources temporarily not available."
-licenses_notice_html = "Please use the newspaper archives for normal searches only. The licences granted are not designed for mass retrieval of newspaper pages (e.g. for text mining). Downloads beyond the usual level will lead to premature expiry of the licensed quotas and is at the expense of your colleagues.<br /><br />Please always contact us in advance by e-mail or via our <a data-lightbox href="%%contact_url%%">contact form</a> if you would like to retrieve a larger number of documents for a research project or use text mining. We will then get in touch with you. <br /><br />Please also note our <a data-lightbox href="%%terms_url%%">Terms of Use</a>.<br /><br />Thank you for your understanding."
-licenses_search = "Databases"
licenses_text = "Here you have access to databases that have been specially licensed for you by adlr.link. We cover the costs for you."
; Home Section
diff --git a/themes/fid_adlr/templates/myresearch/databases.phtml b/themes/fid_adlr/templates/myresearch/databases.phtml
deleted file mode 100644
index 8bc174cd8da..00000000000
--- a/themes/fid_adlr/templates/myresearch/databases.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- fid-adlr: databases -->
-<?php
-
-// Set up breadcrumbs:
-$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('fid::dbis_licenses_name') . '</li>';
-
-// Convenience variable:
-$account = $this->auth()->getManager();
-?>
-
-<div class="<?= $this->layoutClass('mainbody') ?>">
- <?php if ($account->isLoggedIn()): ?>
- <?php /* finc V5: adds offcanvas-toggler missing in VF5, compare with finc/fid themes during update - CK */ ?>
- <?=$this->render('RecordDriver/DefaultRecord/offcanvas-toggler-myresearch'); ?>
- <?php endif; ?>
-
- <!-- fid-adlr: licenses -->
- <br />
- <h3><?= $this->translate('dbis_licenses_name') ?></h3>
- <?php if (!$account->isLoggedIn()): ?>
- <?= $this->translate('licenses_forbidden_login_required') ?><br/><br/>
- <?php elseif (!$this->permission()->allowDisplay('access.Licenses')) : ?>
- <?= $this->translate('licenses_forbidden_permission_denied') ?><br/><br/>
- <?php elseif (empty($licenses)) : ?>
- <?= $this->translate('licenses_not_available') ?><br/><br/>
- <?php else: ?>
- <?= $this->translate('licenses_text') ?><br/><br/>
- <div class="dbis_description">
- <button class="title collapsed" data-toggle="collapse" href="#fid_terms"><?= $this->translate('dbis_hint') ?></button>
- <div id="fid_terms" class="collapse">
- <p>
- <?= $this->translate('licenses_notice_html', ['%%contact_url%%' => $this->url('feedback-home'), '%%terms_url%%' => $this->url('fid/user/terms')]) ?><br/><br/>
- </p>
- </div>
- </div><br/><br/>
- <div><?= $this->transEsc('licenses_desc_1') ?></div><br/>
- <ul class="licenses">
- <?php foreach ($licenses as $license): ?>
- <li>
- <a href="<?= $license['url'] ?>" target="_blank"><?= $this->translate('licenses_' . $license['name']) ?></a><br/>
- <span><?= $license['desc'] ?></span>
- <br/><br/>
- </li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- <!-- fid-adlr: licenses - END -->
-
- <?php if ($this->isDbisAvailable) : ?>
- <?= $this->render('myresearch/dbis-content'); ?>
- <?php endif; ?>
-</div>
-
-<div class="<?= $this->layoutClass('sidebar') ?>">
- <?= $this->context($this)->renderInContext("myresearch/menu.phtml", ['active' => 'databases']) ?>
-</div>
-<!-- fid-adlr: databases - END -->
diff --git a/themes/fid_adlr/templates/myresearch/dbis-content.phtml b/themes/fid_adlr/templates/myresearch/dbis-content.phtml
deleted file mode 100644
index e48097a12fb..00000000000
--- a/themes/fid_adlr/templates/myresearch/dbis-content.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- fid-adlr: dbis -->
-<br/>
-<h3><?= $this->translate('dbis_name') ?></h3>
-<div class="dbis_description">
- <button class="title collapsed" data-toggle="collapse" href="#dbis_description"><?= $this->translate('dbis_hint') ?></button>
- <div id="dbis_description" class="collapse">
- <p><?= $this->translate('dbis_text') ?></p>
- </div>
-</div>
-<br/>
-<div class="dbis_content" id="dbis_content"><i class="fa fa-spinner fa-spin"></i> <?= $this->transEsc("Loading") ?> ...
-</div>
-<?php
-
-$dbisId = $this->homeLibrary ?? '';
-
-$dbisRequest = "$(document).ready(function () {
- $.ajax({
- dataType: 'json',
- method: 'GET',
- url: VuFind.path + '/AJAX/JSON?method=getDbis&bibId=$dbisId&map_bibid_to_dbis=$this->map_bibid_to_dbis'
- })
- .done(function(response) {
- $('#dbis_content').html(response.data.html);
- });
-});";
-
-echo $this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $dbisRequest, 'SET');
-?>
-<!-- fid-adlr: dbis - END -->
--
GitLab