X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..03f2fa83c13c1b532284205fa7efcab9b8b2c41f:/wp-content/plugins/akismet/views/start.php

diff --git a/wp-content/plugins/akismet/views/start.php b/wp-content/plugins/akismet/views/start.php
index 692b8afe..75eb0324 100644
--- a/wp-content/plugins/akismet/views/start.php
+++ b/wp-content/plugins/akismet/views/start.php
@@ -1,81 +1,83 @@
 <div class="no-key config-wrap"><?php
 	if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
-		if ( $akismet_user->status == 'missing' ) :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. Register your email address below to get started.', 'akismet'); ?></p>
+		if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) :?>
+<p><?php esc_html_e('Akismet eliminates spam from your site. Register below to get started.', 'akismet'); ?></p>
 <div class="activate-highlight activate-option">
 	<div class="option-description">
 		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
-		<?php echo esc_attr( $akismet_user->user_email ); ?>
+		<?php echo esc_html( $akismet_user->user_email ); ?>
 	</div>
 	<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
-		<input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+		<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+		<input type="hidden" name="blog" value="<?php echo esc_url( get_bloginfo('url') ); ?>"/>
 		<input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
 		<input type="hidden" name="redirect" value="plugin-signup"/>
-		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register Akismet' , 'akismet'); ?>"/>
+		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register for Akismet' , 'akismet'); ?>"/>
 	</form>
 </div>
 <?php elseif ( $akismet_user->status == 'cancelled' ) :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<p><?php esc_html_e('Akismet eliminates spam from your site.', 'akismet'); ?></p>
 <div class="activate-highlight activate-option">
 	<div class="option-description" style="width:75%;">
 		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
 		<?php printf( esc_html__( 'Your subscription for %s is cancelled' , 'akismet'), $akismet_user->user_email ); ?>
 	</div>
 	<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
-		<input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+		<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+		<input type="hidden" name="blog" value="<?php echo esc_url( get_bloginfo('url') ); ?>"/>
 		<input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
 		<input type="hidden" name="redirect" value="upgrade"/>
 		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
 	</form>
 </div>
 <?php elseif ( $akismet_user->status == 'suspended' ) : ?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<p><?php esc_html_e('Akismet eliminates spam from your site.', 'akismet'); ?></p>
 <div class="activate-highlight centered activate-option">
 	<strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
 	<h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
-	<p><?php esc_html_e('No worries! Get in touch and we&#8217;ll help sort this out.', 'akismet'); ?></p>
+	<p><?php esc_html_e('No worries! Get in touch and we&#8217;ll sort this out.', 'akismet'); ?></p>
 	<a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
 </div>
 <?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
-<p style="margin-right:10px"><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<p style="margin-right:10px"><?php esc_html_e('Akismet eliminates spam from your site. To set up Akismet, select one of the options below.', 'akismet'); ?></p>
 <div class="activate-highlight activate-option">
 	<div class="option-description">
 		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
-		<?php echo esc_attr( $akismet_user->user_email ); ?>
+		<?php echo esc_html( $akismet_user->user_email ); ?>
 	</div>
 	<form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
 		<input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
 		<input type="hidden" name="action" value="enter-key">
 		<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
-		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this Akismet account' , 'akismet'); ?>"/>
+		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this account' , 'akismet'); ?>"/>
 	</form>
 </div>
 <?php endif;?>
 <div class="activate-highlight secondary activate-option">
 	<div class="option-description">
-		<strong><?php esc_html_e('Create a new API key with a different email address', 'akismet'); ?></strong>
-		<p><?php esc_html_e('Use this option if you want to setup a new Akismet account.', 'akismet'); ?></p>
+		<strong><?php esc_html_e('Sign up for a plan with a different email address', 'akismet'); ?></strong>
+		<p><?php esc_html_e('Use this option to use Akismet independently of your Jetpack connection.', 'akismet'); ?></p>
 	</div>
-	<?php Akismet::view( 'get', array( 'text' => __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
+	<?php Akismet::view( 'get', array( 'text' => __( 'Sign up with a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
 </div>
 <div class="activate-highlight secondary activate-option">
 	<div class="option-description">
-		<strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
-		<p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+		<strong><?php esc_html_e('Enter an API key', 'akismet'); ?></strong>
+		<p><?php esc_html_e('Already have your key? Enter it here.', 'akismet'); ?></p>
 	</div>
 	<form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
-		<input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+		<input id="key" name="key" type="text" size="15" value="" class="regular-text code">
 		<input type="hidden" name="action" value="enter-key">
 		<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
 		<input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
 	</form>
 </div>
 <?php else :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<p><?php esc_html_e('Akismet eliminates spam from your site. To set up Akismet, select one of the options below.', 'akismet'); ?></p>
 <div class="activate-highlight activate-option">
 	<div class="option-description">
 		<strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
-		<p><?php esc_html_e('Log in or create an account to get your API key.', 'akismet'); ?></p>
+		<p><?php esc_html_e('Log in or sign up now.', 'akismet'); ?></p>
 	</div>
 	<?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
 </div>
@@ -85,7 +87,7 @@
 		<p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
 	</div>
 	<form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
-		<input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+		<input id="key" name="key" type="text" size="15" value="<?php echo esc_attr( Akismet::get_api_key() ); ?>" class="regular-text code">
 		<input type="hidden" name="action" value="enter-key">
 		<?php wp_nonce_field( Akismet_Admin::NONCE ); ?>
 		<input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">