From 3d30764db13faefe3c14481e5d0c885906871454 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 25 Feb 2022 17:25:27 +0100
Subject: fixed PHP8 warnings in views resources/_common/_(resource|room)_tr

---
 app/views/resources/_common/_resource_tr.php | 10 +++++-----
 app/views/resources/_common/_room_tr.php     | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/resources/_common/_resource_tr.php b/app/views/resources/_common/_resource_tr.php
index d459013..eb593ca 100644
--- a/app/views/resources/_common/_resource_tr.php
+++ b/app/views/resources/_common/_resource_tr.php
@@ -75,7 +75,7 @@
  */
 ?>
 <tr>
-    <? if ($checkbox_data && $checkbox_data['name']): ?>
+    <? if (!empty($checkbox_data['name'])): ?>
         <?
         if ($checkbox_data['checked']) {
             $checkbox_data['checked'] = 'checked';
@@ -93,7 +93,7 @@
             ? $resource->getActionLink('booking_plan')
             : $resource->getActionLink('show')
         ) ?>"
-            <?= $user_has_booking_rights ? '' : 'data-dialog' ?>
+            <?= !empty($user_has_booking_rights) ? '' : 'data-dialog' ?>
            data-id="<?= htmlReady($resource->id) ?>"
            data-range_type="<?= $clipboard_range_type
                ? htmlReady($clipboard_range_type)
@@ -120,7 +120,7 @@
                 <?= Icon::create('link-intern')->asImg(['class' => 'text-bottom']) ?>
             <? endif ?>
         </a>
-        <? if ($resource_tooltip): ?>
+        <? if (!empty($resource_tooltip)): ?>
             <span class="text-bottom">
                 <?= tooltipIcon($resource_tooltip) ?>
             </span>
@@ -142,7 +142,7 @@
             </td>
         <? endforeach ?>
     <? endif ?>
-    <? if ($additional_columns): ?>
+    <? if (!empty($additional_columns)): ?>
         <? foreach ($additional_columns as $column): ?>
             <td>
                 <?= htmlReady($column) ?>
@@ -280,7 +280,7 @@
                         $action[0],
                         $action[1],
                         $action[2],
-                        is_array($action[3]) ? $action[3] : []
+                        $action[3] ?? []
                     );
                 }
             }
diff --git a/app/views/resources/_common/_room_tr.php b/app/views/resources/_common/_room_tr.php
index 7950211..c467ecf 100644
--- a/app/views/resources/_common/_room_tr.php
+++ b/app/views/resources/_common/_room_tr.php
@@ -52,22 +52,22 @@ if ($room->requestable && $show_autor_actions) {
 <?= $this->render_partial(
     'resources/_common/_resource_tr.php',
     [
-        'checkbox_data' => $checkbox_data,
-        'resource' => $room,
+        'checkbox_data' => $checkbox_data ?? null,
+        'resource' => $room ?? null,
         'booking_plan_link_on_name' => true,
-        'resource_tooltip' => $room_tooltip,
-        'show_global_admin_actions' => $show_global_admin_actions,
-        'show_admin_actions' => $show_admin_actions,
-        'show_tutor_actions' => $show_tutor_actions,
-        'show_autor_actions' => $show_autor_actions,
-        'show_user_actions' => $show_user_actions,
-        'user_has_booking_rights' => $user_has_booking_rights,
+        'resource_tooltip' => $room_tooltip ?? null,
+        'show_global_admin_actions' => $show_global_admin_actions ?? false,
+        'show_admin_actions' => $show_admin_actions ?? false,
+        'show_tutor_actions' => $show_tutor_actions ?? false,
+        'show_autor_actions' => $show_autor_actions ?? false,
+        'show_user_actions' => $show_user_actions ?? false,
+        'user_has_booking_rights' => $user_has_booking_rights ?? false,
         'show_picture' => true,
         'show_full_name' => false,
         'additional_properties' => ['seats'],
         'clipboard_range_type' => 'Room',
         'additional_actions' => (
-            is_array($additional_actions)
+            isset($additional_actions) && is_array($additional_actions)
             ? array_merge(
                 $room_actions,
                 $additional_actions
-- 
cgit v1.0