From 7ea53c1aa6d1b762e19e8d82a94ff99dbda1a9d1 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 22 Dec 2021 15:37:51 -0500
Subject: [PATCH] Fix notices in tag admin code.

---
 module/VuFind/src/VuFind/Controller/ConfirmController.php | 2 +-
 .../src/VuFindAdmin/Controller/TagsController.php         | 6 +++---
 themes/bootstrap3/templates/admin/tags/list.phtml         | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/VuFind/src/VuFind/Controller/ConfirmController.php b/module/VuFind/src/VuFind/Controller/ConfirmController.php
index 3bacfcea283..f7304581df8 100644
--- a/module/VuFind/src/VuFind/Controller/ConfirmController.php
+++ b/module/VuFind/src/VuFind/Controller/ConfirmController.php
@@ -57,7 +57,7 @@ public function confirmAction()
                 $flash = (true === is_array($message))
                     ? [
                         'msg' => $message['msg'],
-                        'tokens' => $message['tokens']
+                        'tokens' => $message['tokens'] ?? []
                     ]
                     : $message;
                 $this->flashMessenger()->addMessage($flash, 'info');
diff --git a/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php b/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
index 8370c9e98f0..08e60e47a60 100644
--- a/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
+++ b/module/VuFindAdmin/src/VuFindAdmin/Controller/TagsController.php
@@ -198,18 +198,18 @@ protected function getConfirmDeleteMessages($count)
         $user = $this->getTable('user')
             ->select(['id' => $this->getParam('user_id')])
             ->current();
-        $userMsg = (false !== $user)
+        $userMsg = is_object($user)
             ? $user->username . " (" . $user->id . ")" : "All";
 
         $tag = $this->getTable('tags')
             ->select(['id' => $this->getParam('tag_id')])
             ->current();
-        $tagMsg = (false !== $tag) ? $tag->tag . " (" . $tag->id . ")" : " All";
+        $tagMsg = is_object($tag) ? $tag->tag . " (" . $tag->id . ")" : " All";
 
         $resource = $this->getTable('resource')
             ->select(['id' => $this->getParam('resource_id')])
             ->current();
-        $resourceMsg = (false !== $resource)
+        $resourceMsg = is_object($resource)
             ? $resource->title . " (" . $resource->id . ")" : " All";
 
         $messages[] = [
diff --git a/themes/bootstrap3/templates/admin/tags/list.phtml b/themes/bootstrap3/templates/admin/tags/list.phtml
index 6443758f4d1..6799a56acdf 100644
--- a/themes/bootstrap3/templates/admin/tags/list.phtml
+++ b/themes/bootstrap3/templates/admin/tags/list.phtml
@@ -19,7 +19,7 @@
         <select name="user_id" id="user_id" class="form-control">
           <option value="ALL"><?=$this->translate('All')?></option>
           <?php foreach($this->uniqueUsers as $user):?>
-            <option value="<?=$this->escapeHtmlAttr($user['user_id'])?>"<?php if ($user['user_id'] == $this->params['user_id'] ?? null): ?> selected="selected"<?php endif;?>>
+            <option value="<?=$this->escapeHtmlAttr($user['user_id'])?>"<?php if ($user['user_id'] == ($this->params['user_id'] ?? null)): ?> selected="selected"<?php endif;?>>
               <?=$this->escapeHtml($user['username']) ?>
             </option>
           <?php endforeach;?>
@@ -30,7 +30,7 @@
         <select name="tag_id" id="tag_id" class="form-control">
           <option value="ALL"><?=$this->translate('All')?></option>
           <?php foreach($this->uniqueTags as $tag):?>
-          <option value="<?=$this->escapeHtmlAttr($tag['tag_id'])?>"<?php if ($tag['tag_id'] == $this->params['tag_id'] ?? null): ?> selected="selected"<?php endif;?>>
+          <option value="<?=$this->escapeHtmlAttr($tag['tag_id'])?>"<?php if ($tag['tag_id'] == ($this->params['tag_id'] ?? null)): ?> selected="selected"<?php endif;?>>
               <?=$this->escapeHtml($tag['tag']) ?>
           </option>
           <?php endforeach;?>
@@ -41,7 +41,7 @@
         <select name="resource_id" id="resource_id" class="form-control">
           <option value="ALL"><?=$this->translate('All')?></option>
           <?php foreach($this->uniqueResources as $resource):?>
-          <option value="<?=$this->escapeHtmlAttr($resource['resource_id'])?>" title="<?=$this->escapeHtmlAttr($resource['title']) ?>"<?php if ($resource['resource_id'] == $this->params['resource_id'] ?? null): ?> selected="selected"<?php endif;?>>
+          <option value="<?=$this->escapeHtmlAttr($resource['resource_id'])?>" title="<?=$this->escapeHtmlAttr($resource['title']) ?>"<?php if ($resource['resource_id'] == ($this->params['resource_id'] ?? null)): ?> selected="selected"<?php endif;?>>
               <?=$this->escapeHtml($this->truncate($resource['title'], 80)) ?> (<?=$this->escapeHtml($resource['resource_id']) ?>)
           </option>
           <?php endforeach;?>
@@ -49,7 +49,7 @@
       </label>
       <label for="taglistsubmit">
         <input type="submit" id="taglistsubmit" value="<?=$this->transEscAttr('Filter')?>" class="btn btn-primary">
-        <?php if ((null !== $this->params['user_id'] ?? null) || (null !== $this->params['tag_id'] ?? null) || (null !== $this->params['resource_id'] ?? null)):?>
+        <?php if ((null !== ($this->params['user_id'] ?? null)) || (null !== ($this->params['tag_id'] ?? null)) || (null !== ($this->params['resource_id'] ?? null))):?>
           <a href="<?= $this->url('admin/tags', ['action' => 'List']); ?>"><?=$this->translate('clear_tag_filter')?></a>
         <?php endif;?>
       </label>