From e448d1c384edb127ebf92ca4325dabb371af3ba9 Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Thu, 13 May 2021 20:16:21 +0200
Subject: [PATCH] php 8 compat for ML item insert into article

---
 include/admin/images.inc.php          |  4 ++--
 include/functions_images.inc.php      |  8 ++++++--
 templates/2k11/admin/media_choose.tpl | 16 +++++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 38300e78..4c65e08b 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -762,7 +762,7 @@ switch ($serendipity['GET']['adminAction']) {
         break;
 
     case 'choose':
-        if ($serendipity['GET']['fid']) {
+        if ($serendipity['GET']['fid'] ?? false) {
             $file          = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
             $media['file'] = &$file;
             if (!is_array($file)) {
@@ -802,7 +802,7 @@ switch ($serendipity['GET']['adminAction']) {
 
                     serendipity_prepareMedia($media['file']);
 
-                    $media['file']['props'] =& serendipity_fetchMediaProperties((int)$serendipity['GET']['fid']);
+                    $media['file']['props'] =& serendipity_fetchMediaProperties((int)($serendipity['GET']['fid'] ?? null));
                     serendipity_plugin_api::hook_event('media_getproperties_cached', $media['file']['props']['base_metadata'], $media['file']['realfile']);
                     $medias[] = $media;
                 }
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 3e125435..dae2c104 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -111,7 +111,9 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $
         if (! (isset($orderfields[$f]) || $f == "fileCategory") || empty($fval)) {
             continue;
         }
-
+        
+        $cond['parts']['filter'] = '';
+        
         if (is_array($fval)) {
             if (empty($fval['from']) || empty($fval['to'])) {
                 continue;
@@ -135,7 +137,7 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $
                                     (i.authorid = " . (int)$fval . ")
                                 )\n";
             $cond['joinparts']['hiddenproperties'] = true;
-        } elseif ($orderfields[$f]['type'] == 'int') {
+        } elseif (($orderfields[$f]['type'] ?? null) == 'int') {
             if (substr($f, 0, 3) === 'bp.') {
                 $realf = substr($f, 3);
                 $cond['parts']['filter'] .= " AND (bp2.property = '$realf' AND bp2.value = '" . serendipity_db_escape_string(trim($fval)) . "')\n";
@@ -3301,6 +3303,8 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
         $media['paths'] =& serendipity_getMediaPaths();
     }
 
+    if (! isset($media['filter']['fileCategory']) ) { $media['filter']['fileCategory'] = null; }
+
     $serendipity['smarty']->assignByRef('media', $media);
 
     if ($enclose) {
diff --git a/templates/2k11/admin/media_choose.tpl b/templates/2k11/admin/media_choose.tpl
index a7b62a2e..4e8fa75a 100644
--- a/templates/2k11/admin/media_choose.tpl
+++ b/templates/2k11/admin/media_choose.tpl
@@ -1,7 +1,7 @@
-{if $perm_denied}
+{if isset($perm_denied) and $perm_denied}
     <span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> {$CONST.PERM_DENIED}</span>
 {else}
-    {if $medias}
+    {if isset($medias) and $medias}
         <script>
             var blockSkip = false;
             var block = '';
@@ -41,7 +41,9 @@
         </script>
     {else}
          <!-- MEDIA SELECTION START -->
-        {$media.external}
+        {if isset($media.external)}
+            {$media.external}
+        {/if}
 
         <div class="clearfix">
         {if $media.file.is_image}
@@ -68,7 +70,7 @@
             {if $media.filename_only}
                 <input name="serendipity[filename_only]" type="hidden" value="{$media.filename_only|escape}">
             {/if}
-            {if $media.file.fast_select}
+            {if isset($media.file.fast_select) and $media.file.fast_select}
                 <script>
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_add_filenameonly' data=$media.file}
                     serendipity.serendipity_imageSelector_done('{$media.textarea|escape}');
@@ -153,19 +155,19 @@
 
                 <div id="image_comment" class="form_area">
                     <label for="serendipity_imagecomment">{$CONST.COMMENT}</label>
-                    <textarea id="serendipity_imagecomment" name="serendipity[imagecomment]" rows="5">{$media.file.props.base_property.COMMENT1|escape|escape}</textarea>
+                    <textarea id="serendipity_imagecomment" name="serendipity[imagecomment]" rows="5">{if isset($media.file.props.base_property.COMMENT1)}{$media.file.props.base_property.COMMENT1|escape|escape}{/if}</textarea>
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagecomment' data=$media.file}
                 </div>
 
                 <div id="image_alttext" class="form_field">
                     <label for="serendipity_alt">{$CONST.MEDIA_ALT}</label>
-                    <input id="serendipity_alt" name="serendipity[alt]" type="text" value="{$media.file.props.base_property.ALT|escape}">
+                    <input id="serendipity_alt" name="serendipity[alt]" type="text" value="{if isset($media.file.props.base_property.ALT)}{$media.file.props.base_property.ALT|escape}{/if}">
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_alt' data=$media.file}
                 </div>
 
                 <div id="image_title" class="form_field">
                     <label for="serendipity_title">{$CONST.MEDIA_TITLE}</label>
-                    <input id="serendipity_title" name="serendipity[title]" type="text" value="{$media.file.props.base_property.TITLE|escape}">
+                    <input id="serendipity_title" name="serendipity[title]" type="text" value="{if isset($media.file.props.base_property.TITLE)}{$media.file.props.base_property.TITLE|escape}{/if}">
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_title' data=$media.file}
                 </div>
                 {/if}