From fa7c0e36c7470571e3c3e88a1a2f5f541208a4bc Mon Sep 17 00:00:00 2001 From: Dorian Merz <merz@ub.uni-leipzig.de> Date: Wed, 3 Mar 2021 14:24:38 +0100 Subject: [PATCH] refs #19252 [fid] replace PHP-Tags in fid theme --- themes/fid/templates/RecordTab/worldcat.phtml | 2 +- .../templates/ajax/resolverLinks-button.phtml | 2 +- .../templates/ajax/resolverLinks-print.phtml | 4 +-- themes/fid/templates/fid/admin/edit.phtml | 20 +++++++------- .../fid/record/acquisition-pda.phtml | 2 +- .../record/acquisition-subito-article.phtml | 2 +- .../acquisition-subito-partial-copy.phtml | 6 ++--- .../templates/fid/user/address-fieldset.phtml | 12 ++++----- themes/fid/templates/fid/user/create.phtml | 26 +++++++++---------- themes/fid/templates/fid/user/init.phtml | 16 ++++++------ themes/fid/templates/fid/user/policy.phtml | 2 +- themes/fid/templates/fid/user/terms.phtml | 4 +-- themes/fid/templates/fid/user/update.phtml | 18 ++++++------- .../templates/fid/user/username-change.phtml | 6 ++--- 14 files changed, 61 insertions(+), 61 deletions(-) diff --git a/themes/fid/templates/RecordTab/worldcat.phtml b/themes/fid/templates/RecordTab/worldcat.phtml index 38fb7af17c3..a267b5f628c 100644 --- a/themes/fid/templates/RecordTab/worldcat.phtml +++ b/themes/fid/templates/RecordTab/worldcat.phtml @@ -1,5 +1,5 @@ <!-- fid: recordtab - worldcat --> -<? $script = <<<JS +<?php $script = <<<JS $(document).ready(function() { var recordId = $('.hiddenId').val(); var recordSource = $('.hiddenSource').val(); diff --git a/themes/fid/templates/ajax/resolverLinks-button.phtml b/themes/fid/templates/ajax/resolverLinks-button.phtml index a25b35b62b3..62873ca8527 100644 --- a/themes/fid/templates/ajax/resolverLinks-button.phtml +++ b/themes/fid/templates/ajax/resolverLinks-button.phtml @@ -11,7 +11,7 @@ $controllerClass = 'controller:SolrMarcFincPDA'; <a class="btn btn-primary pda-button <?=$controllerClass?> full-order" data-lightbox href="<?=$this->url('record-fidsubitoarticle', array('id' => $this->recordId))?>" rel="nofollow"> <?=$this->transEsc('getit_order')?> </a> - <? $script = <<<JS + <?php $script = <<<JS $(document).ready(function() { // Use to register new lightbox window pda form VuFind.lightbox.bind(); diff --git a/themes/fid/templates/ajax/resolverLinks-print.phtml b/themes/fid/templates/ajax/resolverLinks-print.phtml index 45af2536d54..211079c3e74 100644 --- a/themes/fid/templates/ajax/resolverLinks-print.phtml +++ b/themes/fid/templates/ajax/resolverLinks-print.phtml @@ -18,7 +18,7 @@ $user = $account->isLoggedIn(); $url = '<a href="'.$this->url('myresearch-account').'?auth_method='.$account->getAuthMethod().'" target="_blank" data-lightbox>'.$this->transEsc('getit_text_3_2').'</a>'; ?> <?=sprintf($this->translate('getit_text_10'), $url)?> - <? $script = <<<JS + <?php $script = <<<JS $(document).ready(function() { // Use to register new lightbox window pda form VuFind.lightbox.bind(); @@ -52,7 +52,7 @@ JS; <?php /* finc-specific change #9274 - END */ ?> </div> <?php /* #17831 */ ?> -<? $script = <<<JS +<?php $script = <<<JS $(document).ready(function() { if ($(window).width() >= 1200) { var contentHeight = $('.media').height(); diff --git a/themes/fid/templates/fid/admin/edit.phtml b/themes/fid/templates/fid/admin/edit.phtml index e5451a2ecc3..1acfdfedafe 100644 --- a/themes/fid/templates/fid/admin/edit.phtml +++ b/themes/fid/templates/fid/admin/edit.phtml @@ -59,10 +59,10 @@ $this->headTitle($title = $this->translate("fid::user_edit_form_title", [ <?= $this->form()->openTag($form) ?> <br/> -<? /* id */ ?> +<?php /* id */ ?> <?= $this->formElement($form->get('id')) ?> -<? /* salutation */ ?> +<?php /* salutation */ ?> <?php /** @var Element\Select $elemSalutation */ $elemSalutation = $form->get('salutation'); @@ -74,7 +74,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']); <?= $this->formSelect($elemSalutation) ?> </div> -<? /* academic title */ ?> +<?php /* academic title */ ?> <?php /** @var Element\Text $elemAcademicTitle */ $elemAcademicTitle = $form->get('academic_title'); @@ -86,7 +86,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']); <?= $this->formElement($elemAcademicTitle) ?> </div> -<? /* firstname */ ?> +<?php /* firstname */ ?> <?php /** @var Element\Text $elemFirstname */ $elemFirstname = $form->get('firstname'); @@ -99,7 +99,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemFirstname) ?> </div> -<? /* lastname */ ?> +<?php /* lastname */ ?> <?php /** @var Element\Text $elemLastname */ $elemLastname = $form->get('lastname'); @@ -112,7 +112,7 @@ $elemLastname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLastname) ?> </div> -<? /* home library */ ?> +<?php /* home library */ ?> <?php /** @var Element\Select $elemHomeLibrary */ $elemHomeLibrary = $form->get('home_library'); @@ -125,7 +125,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemHomeLibrary) ?> </div> -<? /* user group */ ?> +<?php /* user group */ ?> <?php /** @var Element\Radio $elemJobTitle */ $elemJobTitle = $form->get('job_title'); @@ -142,7 +142,7 @@ $elemJobTitle = $form->get('job_title'); </div> </div> -<? /* Permissions */ ?> +<?php /* Permissions */ ?> <?php /** @var Element\Collection $elemPermissions */ /** @var Element\Select[] $elemPermissionsElems */ @@ -166,10 +166,10 @@ foreach ($permissions as $permission) { </div> <?php endforeach; ?> -<? /* addresses */ ?> +<?php /* addresses */ ?> <?= $this->render('fid/user/address-collection.phtml') ?> -<? /* submit button */ ?> +<?php /* submit button */ ?> <?php /** @var Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/record/acquisition-pda.phtml b/themes/fid/templates/fid/record/acquisition-pda.phtml index a2b8db2e495..a5bc87b75cb 100644 --- a/themes/fid/templates/fid/record/acquisition-pda.phtml +++ b/themes/fid/templates/fid/record/acquisition-pda.phtml @@ -70,7 +70,7 @@ $form->setAttribute('class','fid-acquisition-form'); <div class="row confirmation"> <div class="col col-xs-12"> - <? /* submit button */ ?> + <?php /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/record/acquisition-subito-article.phtml b/themes/fid/templates/fid/record/acquisition-subito-article.phtml index 4743cbe09cd..99612d70c71 100644 --- a/themes/fid/templates/fid/record/acquisition-subito-article.phtml +++ b/themes/fid/templates/fid/record/acquisition-subito-article.phtml @@ -69,7 +69,7 @@ $form->setAttribute('class','fid-acquisition-form'); <div class="row confirmation"> <div class="col col-xs-12"> - <? /* submit button */ ?> + <?php /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/record/acquisition-subito-partial-copy.phtml b/themes/fid/templates/fid/record/acquisition-subito-partial-copy.phtml index 264ff343009..ddaf79bf871 100644 --- a/themes/fid/templates/fid/record/acquisition-subito-partial-copy.phtml +++ b/themes/fid/templates/fid/record/acquisition-subito-partial-copy.phtml @@ -59,7 +59,7 @@ $form->setAttribute('class','fid-acquisition-form'); </div> </div> -<? /* pages */ ?> +<?php /* pages */ ?> <?php /** @var Element\Text $elemPages */ $elemPages = $form->get('pages'); @@ -67,7 +67,7 @@ $elemPages->setLabelAttributes(['class' => 'control-label']); $elemPages->setAttributes(['class' => 'form-control']); ?> -<? /* comments */ ?> +<?php /* comments */ ?> <?php /** @var Element\Text $elemComment */ $elemComment = $form->get('comment'); @@ -108,7 +108,7 @@ $elemComment->setAttributes(['class' => 'form-control']); <div class="row confirmation"> <div class="col col-xs-12"> - <? /* submit button */ ?> + <?php /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/user/address-fieldset.phtml b/themes/fid/templates/fid/user/address-fieldset.phtml index 865287dfcac..8d50ee05190 100644 --- a/themes/fid/templates/fid/user/address-fieldset.phtml +++ b/themes/fid/templates/fid/user/address-fieldset.phtml @@ -27,7 +27,7 @@ use Zend\Form\Element; $address = $this->address; ?> -<? /* id */ ?> +<?php /* id */ ?> <?php $elemId = $address->get('id'); if ($elemId->getValue()) { @@ -35,7 +35,7 @@ if ($elemId->getValue()) { } ?> -<? /* first line */ ?> +<?php /* first line */ ?> <?php /** @var Element\Text $elemLine1 */ $elemLine1 = $address->get('line1'); @@ -48,7 +48,7 @@ $elemLine1->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLine1) ?> </div> -<? /* second line */ ?> +<?php /* second line */ ?> <?php /** @var Element\Text $elemLine2 */ $elemLine2 = $address->get('line2'); @@ -61,7 +61,7 @@ $elemLine2->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLine2) ?> </div> -<? /* address zip */ ?> +<?php /* address zip */ ?> <?php /** @var Element\Text $elemZip */ $elemZip = $address->get('zip'); @@ -74,7 +74,7 @@ $elemZip->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemZip) ?> </div> -<? /* city */ ?> +<?php /* city */ ?> <?php /** @var Element\Text $elemCity */ $elemCity = $address->get('city'); @@ -87,7 +87,7 @@ $elemCity->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemCity) ?> </div> -<? /* country */ ?> +<?php /* country */ ?> <?php /** @var Element\Text $elemCountry */ $elemCountry = $address->get('country'); diff --git a/themes/fid/templates/fid/user/create.phtml b/themes/fid/templates/fid/user/create.phtml index 0db9f72cf45..e0433323de8 100644 --- a/themes/fid/templates/fid/user/create.phtml +++ b/themes/fid/templates/fid/user/create.phtml @@ -56,7 +56,7 @@ $this->headTitle($title = $this->translate("fid::user_create_form_title")); <?= $this->form()->openTag($form) ?> <br/> -<? /* username */ ?> +<?php /* username */ ?> <?php /** @var Element\Text $elemUsername */ $elemUsername = $form->get('username'); @@ -74,7 +74,7 @@ $elemUsername->setAttributes(['class' => 'form-control', 'disabled' => 1]); <?= $this->formElement($elemUsername) ?> </div> -<? /* password */ ?> +<?php /* password */ ?> <?php /** @var Element\Password $elemPassword */ $elemPassword = $form->get('password'); @@ -87,7 +87,7 @@ $elemPassword->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemPassword) ?> </div> -<? /* password confirmation */ ?> +<?php /* password confirmation */ ?> <?php /** @var Element\Password $elemPasswordConfirmation */ $elemPasswordConfirmation = $form->get('password_confirmation'); @@ -100,7 +100,7 @@ $elemPasswordConfirmation->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemPasswordConfirmation) ?> </div> -<? /* salutation */ ?> +<?php /* salutation */ ?> <?php /** @var Element\Select $elemSalutation */ $elemSalutation = $form->get('salutation'); @@ -112,7 +112,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']); <?= $this->formSelect($elemSalutation) ?> </div> -<? /* academic title */ ?> +<?php /* academic title */ ?> <?php /** @var Element\Text $elemAcademicTitle */ $elemAcademicTitle = $form->get('academic_title'); @@ -124,7 +124,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']); <?= $this->formElement($elemAcademicTitle) ?> </div> -<? /* firstname */ ?> +<?php /* firstname */ ?> <?php /** @var Element\Text $elemFirstname */ $elemFirstname = $form->get('firstname'); @@ -137,7 +137,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemFirstname) ?> </div> -<? /* lastname */ ?> +<?php /* lastname */ ?> <?php /** @var Element\Text $elemLastname */ $elemLastname = $form->get('lastname'); @@ -150,7 +150,7 @@ $elemLastname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLastname) ?> </div> -<? /* home library */ ?> +<?php /* home library */ ?> <?php /** @var Element\Select $elemHomeLibrary */ $elemHomeLibrary = $form->get('home_library'); @@ -163,7 +163,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemHomeLibrary) ?> </div> -<? /* user group */ ?> +<?php /* user group */ ?> <?php /** @var Element\Radio $elemJobTitle */ $elemJobTitle = $form->get('job_title'); @@ -178,7 +178,7 @@ $elemJobTitle = $form->get('job_title'); <?= $this->formElementErrors($elemJobTitle) ?> </div> -<? /* college */ ?> +<?php /* college */ ?> <?php /** @var Element\Text $elemCollege */ $elemCollege = $form->get('college'); @@ -191,10 +191,10 @@ $elemCollege->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemCollege) ?> </div> -<? /* addresses */ ?> +<?php /* addresses */ ?> <?= $this->render('address-collection.phtml') ?> -<? /* eula privacy policy */ ?> +<?php /* eula privacy policy */ ?> <?php /** @var Checkbox $elemEulaAccepted */ $elemEulaAccepted = $form->get('eula_accepted'); @@ -217,7 +217,7 @@ $elemEulaAccepted->setAttribute('id', 'eula-accepted'); <?= $this->formElementErrors($elemEulaAccepted) ?> </div> -<? /* submit button */ ?> +<?php /* submit button */ ?> <?php /** @var Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/user/init.phtml b/themes/fid/templates/fid/user/init.phtml index 956fc87bf8d..9f1354b3862 100644 --- a/themes/fid/templates/fid/user/init.phtml +++ b/themes/fid/templates/fid/user/init.phtml @@ -46,7 +46,7 @@ $this->headTitle($title = $this->translate("fid::user_init_form_title")); <?= $this->form()->openTag($form) ?> <br/> -<? /* username */ ?> +<?php /* username */ ?> <?php /** @var Element\Text $elemUsername */ $elemUsername = $form->get('username'); @@ -59,7 +59,7 @@ $elemUsername->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemUsername) ?> </div> -<? /* username confirmation */ ?> +<?php /* username confirmation */ ?> <?php /** @var Element\Text $elemUsernameConfirmation */ $elemUsernameConfirmation = $form->get('username_confirmation'); @@ -72,7 +72,7 @@ $elemUsernameConfirmation->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemUsernameConfirmation) ?> </div> -<? /* firstname */ ?> +<?php /* firstname */ ?> <?php /** @var Element\Text $elemFirstname */ $elemFirstname = $form->get('firstname'); @@ -85,7 +85,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemFirstname) ?> </div> -<? /* lastname */ ?> +<?php /* lastname */ ?> <?php /** @var Element\Text $elemLastname */ $elemLastname = $form->get('lastname'); @@ -98,7 +98,7 @@ $elemLastname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLastname) ?> </div> -<? /* eula privacy policy */ ?> +<?php /* eula privacy policy */ ?> <?php /** @var Element\Checkbox $elemEulaAccepted */ $elemEulaAccepted = $form->get('eula_accepted'); @@ -108,18 +108,18 @@ $elemEulaAccepted->setAttribute('id', 'eula-accepted'); <?= $this->formElement($elemEulaAccepted) ?> <?= $this->formLabel()->openTag($elemEulaAccepted) ?> <?= $this->translate("fid::policy_text") ?> - <? $url = $this->url('fid/user/policy') ?> + <?php $url = $this->url('fid/user/policy') ?> <a target="_blank" href="<?= $url ?>"> <?= $this->translate("fid::policy") ?> </a> <?= $this->translate("fid::terms_text") ?> - <? $url = $this->url('fid/user/terms') ?> + <?php $url = $this->url('fid/user/terms') ?> <a target="_blank" href="<?= $url ?>"> <?= $this->translate("fid::terms") ?></a>. <?= $this->formLabel()->closeTag($elemEulaAccepted) ?> <?= $this->formElementErrors($elemEulaAccepted) ?> </div> -<? /* submit button */ ?> +<?php /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/user/policy.phtml b/themes/fid/templates/fid/user/policy.phtml index e96cbc303f5..0c7e00bbb9e 100644 --- a/themes/fid/templates/fid/user/policy.phtml +++ b/themes/fid/templates/fid/user/policy.phtml @@ -1,5 +1,5 @@ <!-- fid - policy begin --> -<? $lang = $this->layout()->userLang; ?> +<?php $lang = $this->layout()->userLang; ?> <?php if (isset($backUrl) && $this->layout()->getTemplate() == 'layout/lightbox') $backButton = '<div class="form-group"> <a class="back-to-login btn btn-primary" href="'.$backUrl.'"> diff --git a/themes/fid/templates/fid/user/terms.phtml b/themes/fid/templates/fid/user/terms.phtml index 2362b9271ba..43abf76dd9e 100644 --- a/themes/fid/templates/fid/user/terms.phtml +++ b/themes/fid/templates/fid/user/terms.phtml @@ -1,6 +1,6 @@ <!-- fid - terms begin --> -<? $lang = $this->layout()->userLang; ?> -<? $fileExists = file_exists(dirname(__FILE__) . '/terms-'.$lang.'.phtml'); ?> +<?php $lang = $this->layout()->userLang; ?> +<?php $fileExists = file_exists(dirname(__FILE__) . '/terms-'.$lang.'.phtml'); ?> <?php if (isset($backUrl) && $this->layout()->getTemplate() == 'layout/lightbox') $backButton = '<div class="form-group"> <a class="back-to-login btn btn-primary" href="'.$backUrl.'"> diff --git a/themes/fid/templates/fid/user/update.phtml b/themes/fid/templates/fid/user/update.phtml index 3daf9ccf9a8..31d6932cf00 100644 --- a/themes/fid/templates/fid/user/update.phtml +++ b/themes/fid/templates/fid/user/update.phtml @@ -55,10 +55,10 @@ $this->headTitle($title = $this->translate("fid::user_update_form_title")); <?= $this->form()->openTag($form) ?> <br/> -<? /* id */ ?> +<?php /* id */ ?> <?= $this->formElement($form->get('id')) ?> -<? /* salutation */ ?> +<?php /* salutation */ ?> <?php /** @var Element\Select $elemSalutation */ $elemSalutation = $form->get('salutation'); @@ -70,7 +70,7 @@ $elemSalutation->setAttributes(['class' => 'form-control']); <?= $this->formSelect($elemSalutation) ?> </div> -<? /* academic title */ ?> +<?php /* academic title */ ?> <?php /** @var Element\Text $elemAcademicTitle */ $elemAcademicTitle = $form->get('academic_title'); @@ -82,7 +82,7 @@ $elemAcademicTitle->setAttributes(['class' => 'form-control']); <?= $this->formElement($elemAcademicTitle) ?> </div> -<? /* firstname */ ?> +<?php /* firstname */ ?> <?php /** @var Element\Text $elemFirstname */ $elemFirstname = $form->get('firstname'); @@ -95,7 +95,7 @@ $elemFirstname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemFirstname) ?> </div> -<? /* lastname */ ?> +<?php /* lastname */ ?> <?php /** @var Element\Text $elemLastname */ $elemLastname = $form->get('lastname'); @@ -108,7 +108,7 @@ $elemLastname->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemLastname) ?> </div> -<? /* home library */ ?> +<?php /* home library */ ?> <?php /** @var Element\Select $elemHomeLibrary */ $elemHomeLibrary = $form->get('home_library'); @@ -121,7 +121,7 @@ $elemHomeLibrary->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemHomeLibrary) ?> </div> -<? /* college */ ?> +<?php /* college */ ?> <?php /** @var Element\Text $elemCollege */ $elemCollege = $form->get('college'); @@ -134,10 +134,10 @@ $elemCollege->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemCollege) ?> </div> -<? /* addresses */ ?> +<?php /* addresses */ ?> <?= $this->render('address-collection.phtml') ?> -<? /* submit button */ ?> +<?php /* submit button */ ?> <?php /** @var Submit $elemSubmit */ $elemSubmit = $form->get('submit'); diff --git a/themes/fid/templates/fid/user/username-change.phtml b/themes/fid/templates/fid/user/username-change.phtml index c103e36f48c..4f7830436e7 100644 --- a/themes/fid/templates/fid/user/username-change.phtml +++ b/themes/fid/templates/fid/user/username-change.phtml @@ -58,7 +58,7 @@ $this->headTitle($this->translate("fid::username_change_form_title")); <?= $this->translate("fid::username_change_form_information") ?> <?= $this->form()->openTag($form) ?> <br/> -<? /* username */ ?> +<?php /* username */ ?> <?php /** @var Element\Text $elemUsername */ $elemUsername = $form->get('username'); @@ -71,7 +71,7 @@ $elemUsername->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemUsername) ?> </div> -<? /* username confirmation */ ?> +<?php /* username confirmation */ ?> <?php /** @var Element\Text $elemUsernameConfirmation */ $elemUsernameConfirmation = $form->get('usernameConfirmation'); @@ -84,7 +84,7 @@ $elemUsernameConfirmation->setAttributes(['class' => 'form-control']); <?= $this->formElementErrors($elemUsernameConfirmation) ?> </div> -<? /* submit button */ ?> +<?php /* submit button */ ?> <?php /** @var Element\Submit $elemSubmit */ $elemSubmit = $form->get('submit'); -- GitLab