From 9c1237c01fc2cde63d1bc472ae73050d1094f229 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 30 Nov 2020 15:28:22 +0100 Subject: [PATCH] Plugin: Fix warnings trying to delete unexisting icons of previously installed plugins --- plugin/bbb/lib/bbb_plugin.class.php | 4 +++- plugin/google_meet/src/google_meet_plugin.class.php | 4 +++- plugin/mindmap/mindmap_plugin.class.php | 4 +++- plugin/zoom/lib/ZoomPlugin.php | 6 ++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/plugin/bbb/lib/bbb_plugin.class.php b/plugin/bbb/lib/bbb_plugin.class.php index cc69e8fe9c..1a0f0e59bd 100755 --- a/plugin/bbb/lib/bbb_plugin.class.php +++ b/plugin/bbb/lib/bbb_plugin.class.php @@ -360,7 +360,9 @@ class BBBPlugin extends Plugin $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/'; foreach ($iconsList as $icon) { $dest = $destinationDir.$icon; - unlink($dest); + if (is_file($dest)) { + @unlink($dest); + } } } } diff --git a/plugin/google_meet/src/google_meet_plugin.class.php b/plugin/google_meet/src/google_meet_plugin.class.php index 982ba2a1c9..da2301219e 100644 --- a/plugin/google_meet/src/google_meet_plugin.class.php +++ b/plugin/google_meet/src/google_meet_plugin.class.php @@ -146,7 +146,9 @@ class GoogleMeetPlugin extends Plugin $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/'; foreach ($iconsList as $icon) { $dest = $destinationDir.$icon; - unlink($dest); + if (is_file($dest)) { + @unlink($dest); + } } } diff --git a/plugin/mindmap/mindmap_plugin.class.php b/plugin/mindmap/mindmap_plugin.class.php index e1f56f3f6e..15db33ee37 100644 --- a/plugin/mindmap/mindmap_plugin.class.php +++ b/plugin/mindmap/mindmap_plugin.class.php @@ -100,7 +100,9 @@ class MindmapPlugin extends Plugin $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/'; foreach ($iconsList as $icon) { $dest = $destinationDir.$icon; - unlink($dest); + if (is_file($dest)) { + @unlink($dest); + } } // Deleting course settings and course home icons diff --git a/plugin/zoom/lib/ZoomPlugin.php b/plugin/zoom/lib/ZoomPlugin.php index 795506fb0e..9c3f5a6131 100644 --- a/plugin/zoom/lib/ZoomPlugin.php +++ b/plugin/zoom/lib/ZoomPlugin.php @@ -222,7 +222,7 @@ class ZoomPlugin extends Plugin $dest = $destinationDir.$icon; copy($src, $dest); } - + $this->install_course_fields_in_all_courses(true, 'zoom_meet.png'); } @@ -255,7 +255,9 @@ class ZoomPlugin extends Plugin $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/'; foreach ($iconsList as $icon) { $dest = $destinationDir.$icon; - unlink($dest); + if (is_file($dest)) { + @unlink($dest); + } } }