From 54286764cd827ce0d35fb20682bc9965239be250 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 12 Dec 2018 14:51:03 +0530 Subject: [PATCH] Add error message for wildcard case Signed-off-by: Riddhesh Sanghvi --- src/helper/class-ee-site.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/helper/class-ee-site.php b/src/helper/class-ee-site.php index 4fa6f337..0c1ce20a 100644 --- a/src/helper/class-ee-site.php +++ b/src/helper/class-ee-site.php @@ -312,12 +312,17 @@ public function update( $args, $assoc_args ) { */ protected function update_ssl( $assoc_args ) { - $ssl = get_flag_value( $assoc_args, 'ssl', false ); - $wildcard = get_flag_value( $assoc_args, 'wildcard', false ); + $ssl = get_flag_value( $assoc_args, 'ssl', false ); + $wildcard = get_flag_value( $assoc_args, 'wildcard', false ); + $show_error = $this->site_data->site_ssl ? true : false; + $wildcard_error = ( ! $this->site_data->site_ssl_wildcard && $wildcard ) ? true : false; - if ( $this->site_data->site_ssl ) { - EE::error( 'Site ' . $this->site_data->site_url . ' already contains SSL.' ); + $error = $wildcard_error ? 'Update from normal ssl to wildcard is not supported yet.' : 'Site ' . $this->site_data->site_url . ' already contains SSL.'; + + if ( $show_error ) { + EE::error( $error ); } + EE::log( 'Starting ssl update for: ' . $this->site_data->site_url ); try { $this->site_data->site_ssl = $ssl;