| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | |
| 13 | 13 | use Automattic\Jetpack\Plugins_Installer; |
| 14 | 14 | |
| 15 | 15 | if ( ! defined( 'ABSPATH' ) ) { |
| 16 | - exit; | |
| 16 | + exit( 0 ); | |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | const PLUGIN_SLUG = 'creative-mail-by-constant-contact'; |
| 20 | 20 | const PLUGIN_FILE = 'creative-mail-by-constant-contact/creative-mail-plugin.php'; |
| @@ -33,14 +33,16 @@ | ||
| 33 | 33 | /** |
| 34 | 34 | * Verify the intent to install Creative Mail, and kick off installation. |
| 35 | 35 | * |
| 36 | 36 | * This works in tandem with a JITM set up in the JITM package. |
| 37 | + * | |
| 38 | + * @return never | |
| 37 | 39 | */ |
| 38 | 40 | function try_install() { |
| 39 | 41 | check_admin_referer( 'creative-mail-install' ); |
| 40 | 42 | |
| 41 | 43 | $result = false; |
| 42 | - $redirect = admin_url( 'edit.php?post_type=feedback' ); | |
| 44 | + $redirect = admin_url( 'admin.php?page=jetpack-forms-admin' ); | |
| 43 | 45 | |
| 44 | 46 | // Attempt to install and activate the plugin. |
| 45 | 47 | if ( current_user_can( 'activate_plugins' ) ) { |
| 46 | 48 | switch ( $_GET['creative-mail-action'] ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated -- Function only hooked if set. |
| @@ -62,9 +64,9 @@ | ||
| 62 | 64 | } |
| 63 | 65 | |
| 64 | 66 | wp_safe_redirect( $redirect ); |
| 65 | 67 | |
| 66 | - exit; | |
| 68 | + exit( 0 ); | |
| 67 | 69 | } |
| 68 | 70 | |
| 69 | 71 | /** |
| 70 | 72 | * Install and activate the Creative Mail plugin. |
| @@ -96,13 +98,15 @@ | ||
| 96 | 98 | /** |
| 97 | 99 | * Notify the user that the installation of Creative Mail failed. |
| 98 | 100 | */ |
| 99 | 101 | function error_notice() { |
| 100 | - ?> | |
| 101 | - <div class="notice notice-error is-dismissible"> | |
| 102 | - <p><?php esc_html_e( 'There was an error installing Creative Mail.', 'jetpack' ); ?></p> | |
| 103 | - </div> | |
| 104 | - <?php | |
| 102 | + wp_admin_notice( | |
| 103 | + esc_html__( 'There was an error installing Creative Mail.', 'jetpack' ), | |
| 104 | + array( | |
| 105 | + 'type' => 'error', | |
| 106 | + 'dismissible' => true, | |
| 107 | + ) | |
| 108 | + ); | |
| 105 | 109 | } |
| 106 | 110 | |
| 107 | 111 | /** |
| 108 | 112 | * Set some options when first activating the plugin via Jetpack. |