From f6bf5fdb6ecd830b54a60d97960a9d2611ff87bf Mon Sep 17 00:00:00 2001
From: Ignacio Cruz <igmoweb@gmail.com>
Date: Tue, 17 Dec 2019 11:19:19 +0100
Subject: [PATCH 1/3] Added admin notice when Imagick is not installed

---
 gaussholder.php         |  3 +++
 inc/admin/namespace.php | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 inc/admin/namespace.php

diff --git a/gaussholder.php b/gaussholder.php
index ec5322e..163e2bb 100644
--- a/gaussholder.php
+++ b/gaussholder.php
@@ -19,6 +19,7 @@
 
 require_once __DIR__ . '/inc/class-plugin.php';
 require_once __DIR__ . '/inc/frontend/namespace.php';
+require_once __DIR__ . '/inc/admin/namespace.php';
 require_once __DIR__ . '/inc/jpeg/namespace.php';
 
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
@@ -27,8 +28,10 @@
 }
 
 add_action( 'plugins_loaded', __NAMESPACE__ . '\\Frontend\\bootstrap' );
+add_action( 'admin_init', __NAMESPACE__ . '\\Admin\\bootstrap' );
 add_filter( 'wp_update_attachment_metadata', __NAMESPACE__ . '\\queue_generate_placeholders_on_save', 10, 2 );
 add_action( 'gaussholder.generate_placeholders', __NAMESPACE__ . '\\generate_placeholders' );
+
 // We <3 you!
 if ( WP_DEBUG && ! defined( 'WP_I_AM_A_GRUMPY_PANTS' ) ) {
 	add_action( 'admin_head-plugins.php', function () {
diff --git a/inc/admin/namespace.php b/inc/admin/namespace.php
new file mode 100644
index 0000000..fad3b8d
--- /dev/null
+++ b/inc/admin/namespace.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Gaussholder\Admin;
+
+/**
+ * Set up hooked callbacks on admin_init
+ */
+function bootstrap() {
+	if ( ! current_user_can( 'manage_options' ) ) {
+		return;
+	}
+
+	add_action( 'admin_notices', __NAMESPACE__ . '\\maybe_display_imagick_notice' );
+}
+
+/**
+ * Display a notice when Imagick PHP extension is not available.
+ */
+function maybe_display_imagick_notice() {
+	if ( ! class_exists( 'Imagick' ) ) {
+		?>
+		<div class="notice notice-error">
+			<p><?php _e( 'The Imagick PHP extension is not installed. Gaussholder cannot process images without it. Please, install and activate Imagick extension.', 'gaussholder' ); ?></p>
+		</div>
+		<?php
+	}
+}

From 7abfaa28c82c0c28a7c395f442e96871c99132e6 Mon Sep 17 00:00:00 2001
From: Ignacio Cruz <igmoweb@gmail.com>
Date: Tue, 17 Dec 2019 11:26:44 +0100
Subject: [PATCH 2/3] Check for imagick before adding the admin_notice action
 for a better performance

---
 inc/admin/namespace.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/inc/admin/namespace.php b/inc/admin/namespace.php
index fad3b8d..ac99faf 100644
--- a/inc/admin/namespace.php
+++ b/inc/admin/namespace.php
@@ -10,18 +10,18 @@ function bootstrap() {
 		return;
 	}
 
-	add_action( 'admin_notices', __NAMESPACE__ . '\\maybe_display_imagick_notice' );
+	if ( ! class_exists( 'Imagick' ) ) {
+		add_action( 'admin_notices', __NAMESPACE__ . '\\display_imagick_notice' );
+	}
 }
 
 /**
  * Display a notice when Imagick PHP extension is not available.
  */
-function maybe_display_imagick_notice() {
-	if ( ! class_exists( 'Imagick' ) ) {
-		?>
-		<div class="notice notice-error">
-			<p><?php _e( 'The Imagick PHP extension is not installed. Gaussholder cannot process images without it. Please, install and activate Imagick extension.', 'gaussholder' ); ?></p>
-		</div>
-		<?php
-	}
+function display_imagick_notice() {
+	?>
+	<div class="notice notice-error">
+		<p><?php _e( 'The Imagick PHP extension is not installed. Gaussholder cannot process images without it. Please, install and activate Imagick extension.', 'gaussholder' ); ?></p>
+	</div>
+	<?php
 }

From 368b0f3656800329eef5c70d961b15c96f884310 Mon Sep 17 00:00:00 2001
From: Ignacio Cruz <ignacio@humanmade.com>
Date: Mon, 19 Apr 2021 12:09:57 +0200
Subject: [PATCH 3/3] Escape HTML output

Co-authored-by: Robert O'Rourke <robert@o-rourke.org>
---
 inc/admin/namespace.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/admin/namespace.php b/inc/admin/namespace.php
index ac99faf..47e4cc9 100644
--- a/inc/admin/namespace.php
+++ b/inc/admin/namespace.php
@@ -21,7 +21,7 @@ function bootstrap() {
 function display_imagick_notice() {
 	?>
 	<div class="notice notice-error">
-		<p><?php _e( 'The Imagick PHP extension is not installed. Gaussholder cannot process images without it. Please, install and activate Imagick extension.', 'gaussholder' ); ?></p>
+		<p><?php esc_html_e( 'The Imagick PHP extension is not installed. Gaussholder cannot process images without it. Please, install and activate Imagick extension.', 'gaussholder' ); ?></p>
 	</div>
 	<?php
 }