diff --git a/devops/docker/php/php.ini b/devops/docker/php/php.ini index 799a0b5897fa3f0d36c20276b5cf00b56e281e6b..abe39fa796940d546216f16ae4587f7a75417131 100644 --- a/devops/docker/php/php.ini +++ b/devops/docker/php/php.ini @@ -25,4 +25,5 @@ xdebug.remote_mode=req xdebug.remote_handler=dbgp xdebug.remote_connect_back=1 xdebug.remote_port=9000 -xdebug.remote_enable=1 \ No newline at end of file +xdebug.remote_enable=1 +short_open_tag=Off; \ No newline at end of file diff --git a/module/finc/src/finc/Resolver/Driver/Ezb.php b/module/finc/src/finc/Resolver/Driver/Ezb.php index f5bd012fa0ae0c8fbabf8fb33386cd58d63dfb25..f4d8ae4a279fc4a04d3667c33de6db79db0aba9b 100644 --- a/module/finc/src/finc/Resolver/Driver/Ezb.php +++ b/module/finc/src/finc/Resolver/Driver/Ezb.php @@ -80,7 +80,7 @@ class Ezb extends Base implements TranslatorAwareInterface /** * Constructor * - * @param string $config ezb configuration + * @param string $config ezb configuration * @param \Zend\Http\Client $httpClient HTTP client */ public function __construct($config, \Zend\Http\Client $httpClient) @@ -192,11 +192,11 @@ class Ezb extends Base implements TranslatorAwareInterface // limit results to ezb only (set to true) if (isset($this->config->ezb_only) && $this->config->ezb_only) { - $pid .= 'ezb=1'; + $pid .= '&ezb=1'; } // limit results to zdb only (set to true) if (isset($this->config->zdb_only) && $this->config->zdb_only) { - $pid .= 'zdb=1'; + $pid .= '&zdb=1'; } $openURL .= '&pid=' . urlencode($pid); @@ -226,7 +226,7 @@ class Ezb extends Base implements TranslatorAwareInterface // user return false; } - + /** * Extract electronic results from the EZB response and inject them into the * $records array. @@ -277,7 +277,8 @@ class Ezb extends Base implements TranslatorAwareInterface // get title from XPath Element defined in $xpathTitleSelector $titleXP = "/OpenURLResponseXML/Full/ElectronicData/ResultList/" . - "Result[@state={$state}][" . ($i + 1) . "]/" . static::$xpathTitleSelector; + "Result[@state={$state}][" . ($i + 1) . "]/" . + static::$xpathTitleSelector; $title = $xpath->query($titleXP, $result)->item(0); if (isset($title)) { $record['title'] = strip_tags($title->nodeValue); @@ -310,7 +311,8 @@ class Ezb extends Base implements TranslatorAwareInterface "Result[@state={$state}][" . ($i + 1) . "]/JournalURL"; $journalUrl = $xpath->query($journalUrlXP, $result)->item(0); - // return direct access URL if available otherwise journal URL as fallback + // return direct access URL if available + // otherwise journal URL as fallback if (isset($accessUrl->nodeValue)) { $record['href'] = $accessUrl->nodeValue; } elseif (isset($journalUrl)) { diff --git a/module/finc/src/finc/View/Helper/Root/RenderArray.php b/module/finc/src/finc/View/Helper/Root/RenderArray.php index e955a35db3d2d134ee9e3b10e3524815060a39b5..2c6a735d277c49ad6a3a40491f6c1a0a3f9fcd23 100644 --- a/module/finc/src/finc/View/Helper/Root/RenderArray.php +++ b/module/finc/src/finc/View/Helper/Root/RenderArray.php @@ -28,7 +28,6 @@ */ namespace finc\View\Helper\Root; - /** * View helper to render a portion of an array. * @@ -44,12 +43,12 @@ class RenderArray extends \VuFind\View\Helper\Root\RenderArray /** * Render a portion of an array. * - * @param string $tpl A template for displaying each row. This should + * @param string $tpl A template for displaying each row. This should * include %%LABEL%% and %%VALUE%% placeholders - * @param array $arr An associative array of possible values to display - * @param array $rows A label => profile key associative array specifying + * @param array $arr An associative array of possible values to display + * @param array $rows A label => profile key associative array specifying * which rows of $arr to display - * @param bool $hideEmpty enable hiding entry / row if value is empty + * @param bool $hideEmpty enable hiding entry / row if value is empty * * @return string */ diff --git a/themes/fid/templates/fid/order/list/entry.phtml b/themes/fid/templates/fid/order/list/entry.phtml index 84151437c2dd663edd2adce42f1fef2cca9f060d..9bd12a9706279058c6ef755f355646fb4f9fabbc 100644 --- a/themes/fid/templates/fid/order/list/entry.phtml +++ b/themes/fid/templates/fid/order/list/entry.phtml @@ -1,5 +1,5 @@ <!-- fid: fid - order - list - entry --> -<?php foreach($this->displayCols as $col): ?> +<?php foreach ($this->displayCols as $col): ?> <?php switch ($col): case 'user': ?> <td> @@ -29,7 +29,7 @@ <?php break; ?> <?php case 'status': ?> <td> - <?=$order->getStatus() ? $this->translate('fid::status_'.$order->getStatus()) : ''?> + <?=$order->getStatus() ? $this->translate('fid::status_' . $order->getStatus()) : ''?> </td> <?php break; ?> <?php case 'dueDate': ?> diff --git a/themes/fid/templates/fid/order/list/headers.phtml b/themes/fid/templates/fid/order/list/headers.phtml index 3196ce965304ca1724a7ea5857cd67ce0f4678cf..f468a656231d804c912b63087a0097f8f9c3443f 100644 --- a/themes/fid/templates/fid/order/list/headers.phtml +++ b/themes/fid/templates/fid/order/list/headers.phtml @@ -1,10 +1,10 @@ <!-- fid: fid - order - list - headers --> -<?php foreach($displayCols as $col): ?> +<?php foreach ($displayCols as $col): ?> <?php switch ($col): case 'user': ?> <th><?=$this->translate('fid::order_user')?></th> <?php break; ?> - <? case 'type': ?> + <?php case 'type': ?> <th><?=$this->translate('fid::order_type')?></th> <?php break; ?> <?php case 'date': ?> diff --git a/themes/fid/templates/fid/order/list/table.phtml b/themes/fid/templates/fid/order/list/table.phtml index 4d1dbd23acdde696ddd64c022f550ee7f099a5aa..ade598386a41d4e5188e8cf9bfde73fcbcae5f4f 100644 --- a/themes/fid/templates/fid/order/list/table.phtml +++ b/themes/fid/templates/fid/order/list/table.phtml @@ -1,5 +1,5 @@ <!-- fid: fid - order - list - table --> -<table class="table"> +<table class="table table-striped table-resp-data-md"> <?php /* Table head */ ?> <tr> <?=$this->render('fid/order/list/headers')?>