Merge branch 'finc' into instance/fid

install-codestylechecker.sh

+#!/bin/bash
+
+red="\e[0;91m"
+green="\e[0;92m"
+clean="\e[0m"
+
+
+if [ $(which curl) != "/usr/bin/curl" ] 
+then
+
+	echo -e "\n${red}Benötigt curl.\n"
+	exit 1
+fi
+
+reset
+
+gitdir=$(pwd)
+
+echo -e "${green}Installiere Codestylechecker...${clean}\n"
+
+mkdir -p $HOME/bin/codestylechecker
+
+cd $HOME/bin/codestylechecker
+
+curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
+curl -OL https://alpha.finc.info/vufind2/logs/alpha/CodeSniffer.conf
+
+chmod +x $HOME/bin/codestylechecker/phpcs.phar
+
+echo -e "\n${green}Kopiere Hooks nach ${gitdir}/.git/hooks\n${clean}"
+
+cd $gitdir/.git/hooks/
+
+curl -OL https://alpha.finc.info/vufind2/logs/alpha/pre-commit
+curl -OL https://alpha.finc.info/vufind2/logs/alpha/pre-push
+
+chmod +x $gitdir/.git/hooks/pre-commit
+chmod +x $gitdir/.git/hooks/pre-push
+
+echo -e "\n${green}Fertig!${clean}\n"
+
+exit 0
+
+#heiko.wolf@uni-leipzig.de, 2021

module/finc/src/finc/View/Helper/Root/Record.php

@@ -197,7 +197,8 @@ class Record extends \VuFind\View\Helper\Root\Record
             $type == 'author'
                 ? $this->removeAuthorDates($lookfor) : $lookfor
         );
-        return parent::getLink($type, $lookfor);
+        /* remove invalid new line in link templates, remove after fixed in templates or VuFind parent */
+        return str_replace(["\n"], '', parent::getLink($type, $lookfor) ?? '');
     }
 
     /**

themes/finc/templates/RecordTab/holdingsils.phtml

@@ -179,7 +179,7 @@ if (!empty($holdingTitleHold)): ?>
   <h2><?=$this->transEsc("external_access")?></h2>
   <?php if (!empty($extUrls)): ?>
     <?php foreach ($extUrls as $current): ?>
-      <a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>"><?=$this->translate($current['desc'])?></a>
+      <?=$this->externalLink($this->escapeHtmlAttr($this->proxyUrl($current['url'])), $this->translate($current['desc']))?>
       <br/>
     <?php endforeach; ?>
   <?php endif; ?>