diff options
Diffstat (limited to 'plugins/akismet/views')
| -rw-r--r-- | plugins/akismet/views/config.php | 402 | ||||
| -rw-r--r-- | plugins/akismet/views/get.php | 2 | ||||
| -rw-r--r-- | plugins/akismet/views/notice.php | 108 | ||||
| -rw-r--r-- | plugins/akismet/views/start.php | 184 | ||||
| -rw-r--r-- | plugins/akismet/views/stats.php | 13 | ||||
| -rw-r--r-- | plugins/akismet/views/strict.php | 17 |
6 files changed, 370 insertions, 356 deletions
diff --git a/plugins/akismet/views/config.php b/plugins/akismet/views/config.php index bc8cb977..f7b232ed 100644 --- a/plugins/akismet/views/config.php +++ b/plugins/akismet/views/config.php @@ -1,216 +1,232 @@ -<div class="wrap"> - - <h2><?php esc_html_e( 'Akismet' , 'akismet');?></h2> - - <div class="have-key"> - +<div id="akismet-plugin-container"> + <div class="akismet-masthead"> + <div class="akismet-masthead__inside-container"> + <div class="akismet-masthead__logo-container"> + <img class="akismet-masthead__logo" src="<?php echo esc_url( plugins_url( '../_inc/img/logo-full-2x.png', __FILE__ ) ); ?>" alt="Akismet" /> + </div> + </div> + </div> + <div class="akismet-lower"> + <?php if ( Akismet::get_api_key() ) { ?> + <?php Akismet_Admin::display_status(); ?> + <?php } ?> + <?php if ( ! empty( $notices ) ) { ?> + <?php foreach ( $notices as $notice ) { ?> + <?php Akismet::view( 'notice', $notice ); ?> + <?php } ?> + <?php } ?> <?php if ( $stat_totals && isset( $stat_totals['all'] ) && (int) $stat_totals['all']->spam > 0 ) : ?> - - <div class="new-snapshot stats"> - - <span style="float:right;margin:10px 15px -5px 0px"> - <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>" class=""><?php esc_html_e( 'Summaries' , 'akismet');?></a> - </span> - - <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 215px; overflow: hidden;" src="<?php printf( '//akismet.com/web/1.0/snapshot.php?blog=%s&api_key=%s&height=180&locale=%s', urlencode( get_option( 'home' ) ), Akismet::get_api_key(), get_locale() );?>"></iframe> - <ul> - <li> - <h3><?php esc_html_e( 'Past six months' , 'akismet');?></h3> - <span><?php echo number_format( $stat_totals['6-months']->spam );?></span> - <?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['6-months']->spam, 'akismet' ) ); ?> - </li> - <li> - <h3><?php esc_html_e( 'All time' , 'akismet');?></h3> - <span><?php echo number_format( $stat_totals['all']->spam );?></span> - <?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['all']->spam, 'akismet' ) ); ?> - </li> - <li> - <h3><?php esc_html_e( 'Accuracy' , 'akismet');?></h3> - <span><?php echo floatval( $stat_totals['all']->accuracy ); ?>%</span> - <?php printf( _n( '%s missed spam', '%s missed spam', $stat_totals['all']->missed_spam, 'akismet' ), number_format( $stat_totals['all']->missed_spam ) ); ?> - | - <?php printf( _n( '%s false positive', '%s false positives', $stat_totals['all']->false_positives, 'akismet' ), number_format( $stat_totals['all']->false_positives ) ); ?> - </li> - </ul> - <div class="clearfix"></div> + <div class="akismet-card"> + <div class="akismet-section-header"> + <div class="akismet-section-header__label"> + <span><?php esc_html_e( 'Statistics' , 'akismet'); ?></span> + </div> + <div class="akismet-section-header__actions"> + <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>"> + <?php esc_html_e( 'Detailed Stats' , 'akismet');?> + </a> + </div> + </div> + + <div class="akismet-new-snapshot"> + <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 220px; overflow: hidden;" src="<?php printf( '//akismet.com/web/1.0/snapshot.php?blog=%s&api_key=%s&height=200&locale=%s', urlencode( get_option( 'home' ) ), Akismet::get_api_key(), get_locale() );?>"></iframe> + <ul> + <li> + <h3><?php esc_html_e( 'Past six months' , 'akismet');?></h3> + <span><?php echo number_format( $stat_totals['6-months']->spam );?></span> + <?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['6-months']->spam, 'akismet' ) ); ?> + </li> + <li> + <h3><?php esc_html_e( 'All time' , 'akismet');?></h3> + <span><?php echo number_format( $stat_totals['all']->spam );?></span> + <?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['all']->spam, 'akismet' ) ); ?> + </li> + <li> + <h3><?php esc_html_e( 'Accuracy' , 'akismet');?></h3> + <span><?php echo floatval( $stat_totals['all']->accuracy ); ?>%</span> + <?php printf( _n( '%s missed spam', '%s missed spam', $stat_totals['all']->missed_spam, 'akismet' ), number_format( $stat_totals['all']->missed_spam ) ); ?> + | + <?php printf( _n( '%s false positive', '%s false positives', $stat_totals['all']->false_positives, 'akismet' ), number_format( $stat_totals['all']->false_positives ) ); ?> + </li> + </ul> + </div> </div> <?php endif;?> <?php if ( $akismet_user ):?> + <div class="akismet-card"> + <div class="akismet-section-header"> + <div class="akismet-section-header__label"> + <span><?php esc_html_e( 'Settings' , 'akismet'); ?></span> + </div> + </div> - <div id="wpcom-stats-meta-box-container" class="metabox-holder"><?php - wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); - wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); - ?> - <script type="text/javascript"> - jQuery(document).ready( function($) { - jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed'); - if(typeof postboxes !== 'undefined') - postboxes.add_postbox_toggles( 'plugins_page_akismet-key-config' ); - }); - </script> - <div class="postbox-container" style="width: 55%;margin-right: 10px;"> - <div id="normal-sortables" class="meta-box-sortables ui-sortable"> - <div id="referrers" class="postbox "> - <div class="handlediv" title="Click to toggle"><br></div> - <h3 class="hndle"><span><?php esc_html_e( 'Settings' , 'akismet');?></span></h3> - <form name="akismet_conf" id="akismet-conf" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST"> - <div class="inside"> - <table cellspacing="0" class="akismet-settings"> - <tbody> - <?php if ( !defined( 'WPCOM_API_KEY' ) ):?> - <tr> - <th class="akismet-api-key" width="10%" align="left" scope="row"><?php esc_html_e('API Key', 'akismet');?></th> - <td width="5%"/> - <td align="left"> - <span class="api-key"><input id="key" name="key" type="text" size="15" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="<?php echo esc_attr( 'regular-text code ' . $akismet_user->status ); ?>"></span> - </td> - </tr> - <?php endif; ?> - <?php if ( isset( $_GET['ssl_status'] ) ) { ?> - <tr> - <th align="left" scope="row"><?php esc_html_e( 'SSL Status', 'akismet' ); ?></th> - <td></td> - <td align="left"> - <p> - <?php + <div class="inside"> + <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST"> + <table cellspacing="0" class="akismet-settings"> + <tbody> + <?php if ( !defined( 'WPCOM_API_KEY' ) ):?> + <tr> + <th class="akismet-api-key" width="10%" align="left" scope="row"><?php esc_html_e('API Key', 'akismet');?></th> + <td width="5%"/> + <td align="left"> + <span class="api-key"><input id="key" name="key" type="text" size="15" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="<?php echo esc_attr( 'regular-text code ' . $akismet_user->status ); ?>"></span> + </td> + </tr> + <?php endif; ?> + <?php if ( isset( $_GET['ssl_status'] ) ) { ?> + <tr> + <th align="left" scope="row"><?php esc_html_e( 'SSL Status', 'akismet' ); ?></th> + <td></td> + <td align="left"> + <p> + <?php - if ( ! function_exists( 'wp_http_supports' ) ) { - ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php printf( esc_html( 'Your WordPress installation does not include the function %s; upgrade to the latest version of WordPress.', 'akismet' ), '<code>wp_http_supports</code>' ); ?><?php - } - else if ( ! wp_http_supports( array( 'ssl' ) ) ) { - ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Your Web server cannot make SSL requests; contact your Web host and ask them to add support for SSL requests.', 'akismet' ); ?><?php - } - else { - $ssl_disabled = get_option( 'akismet_ssl_disabled' ); + if ( ! function_exists( 'wp_http_supports' ) ) { + ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php printf( esc_html( 'Your WordPress installation does not include the function %s; upgrade to the latest version of WordPress.', 'akismet' ), '<code>wp_http_supports</code>' ); ?><?php + } + else if ( ! wp_http_supports( array( 'ssl' ) ) ) { + ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Your Web server cannot make SSL requests; contact your Web host and ask them to add support for SSL requests.', 'akismet' ); ?><?php + } + else { + $ssl_disabled = get_option( 'akismet_ssl_disabled' ); - if ( $ssl_disabled ) { - ?><b><?php esc_html_e( 'Temporarily disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Akismet encountered a problem with a previous SSL request and disabled it temporarily. It will begin using SSL for requests again shortly.', 'akismet' ); ?><?php - } - else { - ?><b><?php esc_html_e( 'Enabled.', 'akismet' ); ?></b> <?php esc_html_e( 'All systems functional.', 'akismet' ); ?><?php - } - } + if ( $ssl_disabled ) { + ?><b><?php esc_html_e( 'Temporarily disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Akismet encountered a problem with a previous SSL request and disabled it temporarily. It will begin using SSL for requests again shortly.', 'akismet' ); ?><?php + } + else { + ?><b><?php esc_html_e( 'Enabled.', 'akismet' ); ?></b> <?php esc_html_e( 'All systems functional.', 'akismet' ); ?><?php + } + } - ?> - </p> - </td> - </tr> - <?php } ?> - <tr> - <th align="left" scope="row"><?php esc_html_e('Comments', 'akismet');?></th> - <td></td> - <td align="left"> - <p> - <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' , 'akismet'); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="1" type="checkbox" <?php checked('1', get_option('akismet_show_user_comments_approved')); ?>> <?php esc_html_e('Show the number of approved comments beside each comment author', 'akismet'); ?></label> - </p> - </td> - </tr> - <tr> - <th class="strictness" align="left" scope="row"><?php esc_html_e('Strictness', 'akismet'); ?></th> - <td></td> - <td align="left"> - <fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend> - <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Silently discard the worst and most pervasive spam so I never see it.', 'akismet'); ?></label></p> - <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Always put spam in the Spam folder for review.', 'akismet'); ?></label></p> - </fieldset> - <span class="note"><strong><?php esc_html_e('Note:', 'akismet');?></strong> + ?> + </p> + </td> + </tr> + <?php } ?> + <tr> + <th align="left" scope="row"><?php esc_html_e('Comments', 'akismet');?></th> + <td></td> + <td align="left"> + <p> + <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' , 'akismet'); ?>"> + <input + name="akismet_show_user_comments_approved" + id="akismet_show_user_comments_approved" + value="1" + type="checkbox" <?php - $delete_interval = max( 1, intval( apply_filters( 'akismet_delete_comment_interval', 15 ) ) ); - - printf( - _n( - 'Spam in the <a href="%1$s">spam folder</a> older than 1 day is deleted automatically.', - 'Spam in the <a href="%1$s">spam folder</a> older than %2$d days is deleted automatically.', - $delete_interval, - 'akismet' - ), - admin_url( 'edit-comments.php?comment_status=spam' ), - $delete_interval - ); + // If the option isn't set, or if it's enabled ('1'), or if it was enabled a long time ago ('true'), check the checkbox. + checked( true, ( in_array( get_option( 'akismet_show_user_comments_approved' ), array( false, '1', 'true' ), true ) ) ); ?> - </td> - </tr> - </tbody> - </table> - </div> - <div id="major-publishing-actions"> - <?php if ( !defined( 'WPCOM_API_KEY' ) ):?> - <div id="delete-action"> - <a class="submitdelete deletion" href="<?php echo esc_url( Akismet_Admin::get_page_url( 'delete_key' ) ); ?>"><?php esc_html_e('Disconnect this account', 'akismet'); ?></a> - </div> - <?php endif; ?> - <?php wp_nonce_field(Akismet_Admin::NONCE) ?> - <div id="publishing-action"> - <input type="hidden" name="action" value="enter-key"> - <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>"> - - </div> - <div class="clear"></div> - </div> - </form> + /> + <?php esc_html_e( 'Show the number of approved comments beside each comment author', 'akismet' ); ?> + </label> + </p> + </td> + </tr> + <tr> + <th class="strictness" align="left" scope="row"><?php esc_html_e('Strictness', 'akismet'); ?></th> + <td></td> + <td align="left"> + <fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend> + <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Silently discard the worst and most pervasive spam so I never see it.', 'akismet'); ?></label></p> + <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Always put spam in the Spam folder for review.', 'akismet'); ?></label></p> + </fieldset> + <span class="akismet-note"><strong><?php esc_html_e('Note:', 'akismet');?></strong> + <?php + + $delete_interval = max( 1, intval( apply_filters( 'akismet_delete_comment_interval', 15 ) ) ); + + printf( + _n( + 'Spam in the <a href="%1$s">spam folder</a> older than 1 day is deleted automatically.', + 'Spam in the <a href="%1$s">spam folder</a> older than %2$d days is deleted automatically.', + $delete_interval, + 'akismet' + ), + admin_url( 'edit-comments.php?comment_status=spam' ), + $delete_interval + ); + + ?> + </td> + </tr> + </tbody> + </table> + <div class="akismet-card-actions"> + <?php if ( !defined( 'WPCOM_API_KEY' ) ):?> + <div id="delete-action"> + <a class="submitdelete deletion" href="<?php echo esc_url( Akismet_Admin::get_page_url( 'delete_key' ) ); ?>"><?php esc_html_e('Disconnect this account', 'akismet'); ?></a> + </div> + <?php endif; ?> + <?php wp_nonce_field(Akismet_Admin::NONCE) ?> + <div id="publishing-action"> + <input type="hidden" name="action" value="enter-key"> + <input type="submit" name="submit" id="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>"> + </div> + <div class="clear"></div> </div> + </form> + </div> + </div> + + <div class="akismet-card"> + <div class="akismet-section-header"> + <div class="akismet-section-header__label"> + <span><?php esc_html_e( 'Account' , 'akismet'); ?></span> </div> </div> - <div class="postbox-container" style="width:44%;"> - <div id="normal-sortables" class="meta-box-sortables ui-sortable"> - <div id="referrers" class="postbox "> - <div class="handlediv" title="Click to toggle"><br></div> - <h3 class="hndle"><span><?php esc_html_e( 'Account' , 'akismet');?></span></h3> - <div class="inside"> - <table cellspacing="0"> - <tbody> - <tr> - <th scope="row" align="left"><?php esc_html_e( 'Subscription Type' , 'akismet');?></th> - <td width="5%"/> - <td align="left"> - <span><?php echo esc_html( $akismet_user->account_name ); ?></span> - </td> - </tr> - <tr> - <th scope="row" align="left"><?php esc_html_e( 'Status' , 'akismet');?></th> - <td width="5%"/> - <td align="left"> - <span><?php - if ( 'cancelled' == $akismet_user->status ) : - esc_html_e( 'Cancelled', 'akismet' ); - elseif ( 'suspended' == $akismet_user->status ) : - esc_html_e( 'Suspended', 'akismet' ); - elseif ( 'missing' == $akismet_user->status ) : - esc_html_e( 'Missing', 'akismet' ); - elseif ( 'no-sub' == $akismet_user->status ) : - esc_html_e( 'No Subscription Found', 'akismet' ); - else : - esc_html_e( 'Active', 'akismet' ); - endif; ?></span> - </td> - </tr> - <?php if ( $akismet_user->next_billing_date ) : ?> - <tr> - <th scope="row" align="left"><?php esc_html_e( 'Next Billing Date' , 'akismet');?></th> - <td width="5%"/> - <td align="left"> - <span><?php echo date( 'F j, Y', $akismet_user->next_billing_date ); ?></span> - </td> - </tr> - <?php endif; ?> - </tbody> - </table> - </div> - <div id="major-publishing-actions"> - <div id="publishing-action"> - <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' && $akismet_user->status == 'active' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?> - </div> - <div class="clear"></div> - </div> + + <div class="inside"> + <table cellspacing="0" border="0" class="akismet-settings"> + <tbody> + <tr> + <th scope="row" align="left"><?php esc_html_e( 'Subscription Type' , 'akismet');?></th> + <td width="5%"/> + <td align="left"> + <p><?php echo esc_html( $akismet_user->account_name ); ?></p> + </td> + </tr> + <tr> + <th scope="row" align="left"><?php esc_html_e( 'Status' , 'akismet');?></th> + <td width="5%"/> + <td align="left"> + <p><?php + if ( 'cancelled' == $akismet_user->status ) : + esc_html_e( 'Cancelled', 'akismet' ); + elseif ( 'suspended' == $akismet_user->status ) : + esc_html_e( 'Suspended', 'akismet' ); + elseif ( 'missing' == $akismet_user->status ) : + esc_html_e( 'Missing', 'akismet' ); + elseif ( 'no-sub' == $akismet_user->status ) : + esc_html_e( 'No Subscription Found', 'akismet' ); + else : + esc_html_e( 'Active', 'akismet' ); + endif; ?></p> + </td> + </tr> + <?php if ( $akismet_user->next_billing_date ) : ?> + <tr> + <th scope="row" align="left"><?php esc_html_e( 'Next Billing Date' , 'akismet');?></th> + <td width="5%"/> + <td align="left"> + <p><?php echo date( 'F j, Y', $akismet_user->next_billing_date ); ?></p> + </td> + </tr> + <?php endif; ?> + </tbody> + </table> + <div class="akismet-card-actions"> + <div id="publishing-action"> + <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' && $akismet_user->status == 'active' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?> </div> + <div class="clear"></div> </div> </div> </div> - <?php endif;?> - </div> </div>
\ No newline at end of file diff --git a/plugins/akismet/views/get.php b/plugins/akismet/views/get.php index 4bd6a9c5..c9dbf108 100644 --- a/plugins/akismet/views/get.php +++ b/plugins/akismet/views/get.php @@ -2,5 +2,5 @@ <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_option( 'home' ) ); ?>"/> <input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/> - <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'button button-primary';?>" value="<?php echo esc_attr( $text ); ?>"/> + <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'akismet-button akismet-is-primary';?>" value="<?php echo esc_attr( $text ); ?>"/> </form>
\ No newline at end of file diff --git a/plugins/akismet/views/notice.php b/plugins/akismet/views/notice.php index 8e6e5080..e82f1685 100644 --- a/plugins/akismet/views/notice.php +++ b/plugins/akismet/views/notice.php @@ -5,10 +5,10 @@ <div class="aa_a">A</div> <div class="aa_button_container"> <div class="aa_button_border"> - <input type="submit" class="aa_button" value="<?php esc_attr_e( 'Activate your Akismet account', 'akismet' ); ?>" /> + <input type="submit" class="aa_button" value="<?php esc_attr_e( 'Set up your Akismet account', 'akismet' ); ?>" /> </div> </div> - <div class="aa_description"><?php _e('<strong>Almost done</strong> - activate Akismet and say goodbye to spam', 'akismet');?></div> + <div class="aa_description"><?php _e('<strong>Almost done</strong> - configure Akismet and say goodbye to spam', 'akismet');?></div> </div> </form> </div> @@ -20,8 +20,6 @@ <p><?php echo $link_text; ?></p> <?php } ?> </div> -<?php elseif ( $type == 'version' ) :?> -<div id="akismet-warning" class="updated fade"><p><strong><?php printf( esc_html__('Akismet %s requires WordPress 3.0 or higher.', 'akismet'), AKISMET_VERSION);?></strong> <?php printf(__('Please <a href="%1$s">upgrade WordPress</a> to a current version, or <a href="%2$s">downgrade to version 2.4 of the Akismet plugin</a>.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'https://wordpress.org/extend/plugins/akismet/download/');?></p></div> <?php elseif ( $type == 'alert' ) :?> <div class='error'> <p><strong><?php printf( esc_html__( 'Akismet Error Code: %s', 'akismet' ), $code ); ?></strong></p> @@ -35,88 +33,102 @@ </p> </div> <?php elseif ( $type == 'notice' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php echo $notice_header; ?></h3> - <p class="description"> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php echo $notice_header; ?></h3> + <p class="akismet-description"> <?php echo $notice_text; ?> </p> </div> <?php elseif ( $type == 'missing-functions' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3> - <p class="description"><?php printf( __('Your web host or server administrator has disabled PHP’s <code>gethostbynamel</code> function. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet’s system requirements</a>.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('Your web host or server administrator has disabled PHP’s <code>gethostbynamel</code> function. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet’s system requirements</a>.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> </div> <?php elseif ( $type == 'servers-be-down' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php esc_html_e("Akismet can’t connect to your site.", 'akismet'); ?></h3> - <p class="description"><?php printf( __('Your firewall may be blocking Akismet. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php esc_html_e("Akismet can’t connect to your site.", 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('Your firewall may be blocking Akismet. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> </div> <?php elseif ( $type == 'active-dunning' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status"><?php esc_html_e("Please update your payment information.", 'akismet'); ?></h3> - <p class="description"><?php printf( __('We cannot process your payment. Please <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status"><?php esc_html_e("Please update your payment information.", 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('We cannot process your payment. Please <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p> </div> <?php elseif ( $type == 'cancelled' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status"><?php esc_html_e("Your Akismet plan has been cancelled.", 'akismet'); ?></h3> - <p class="description"><?php printf( __('Please visit your <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status"><?php esc_html_e("Your Akismet plan has been cancelled.", 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('Please visit your <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p> </div> <?php elseif ( $type == 'suspended' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php esc_html_e("Your Akismet subscription is suspended.", 'akismet'); ?></h3> - <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php esc_html_e("Your Akismet subscription is suspended.", 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p> </div> <?php elseif ( $type == 'active-notice' && $time_saved ) :?> -<div class="wrap alert active"> - <h3 class="key-status"><?php echo esc_html( $time_saved ); ?></h3> - <p class="description"><?php printf( __('You can help us fight spam and upgrade your account by <a href="%s" target="_blank">contributing a token amount</a>.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?></p> +<div class="akismet-alert akismet-active"> + <h3 class="akismet-key-status"><?php echo esc_html( $time_saved ); ?></h3> + <p class="akismet-description"><?php printf( __('You can help us fight spam and upgrade your account by <a href="%s" target="_blank">contributing a token amount</a>.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?></p> </div> <?php elseif ( $type == 'missing' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php esc_html_e( 'There is a problem with your API key.', 'akismet'); ?></h3> - <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php esc_html_e( 'There is a problem with your API key.', 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p> </div> <?php elseif ( $type == 'no-sub' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status failed"><?php esc_html_e( 'You don’t have an Akismet plan.', 'akismet'); ?></h3> - <p class="description"> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status failed"><?php esc_html_e( 'You don’t have an Akismet plan.', 'akismet'); ?></h3> + <p class="akismet-description"> <?php printf( __( 'In 2012, Akismet began using subscription plans for all accounts (even free ones). A plan has not been assigned to your account, and we’d appreciate it if you’d <a href="%s" target="_blank">sign into your account</a> and choose one.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?> <br /><br /> <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/' ); ?> </p> </div> -<?php elseif ( $type == 'new-key-valid' ) :?> -<div class="wrap alert active"> - <h3 class="key-status"><?php esc_html_e('Akismet is now activated. Happy blogging!', 'akismet'); ?></h3> +<?php elseif ( $type == 'new-key-valid' ) : + global $wpdb; + + $check_pending_link = false; + + $at_least_one_comment_in_moderation = !! $wpdb->get_var( "SELECT comment_ID FROM {$wpdb->comments} WHERE comment_approved = '0' LIMIT 1" ); + + if ( $at_least_one_comment_in_moderation) { + $check_pending_link = 'edit-comments.php?akismet_recheck=' . wp_create_nonce( 'akismet_recheck' ); + } + + ?> +<div class="akismet-alert akismet-active"> + <h3 class="akismet-key-status"><?php esc_html_e( 'Akismet is now protecting your site from spam. Happy blogging!', 'akismet' ); ?></h3> + <?php if ( $check_pending_link ) { ?> + <p class="akismet-description"><?php printf( __( 'Would you like to <a href="%s">check pending comments</a>?', 'akismet' ), esc_url( $check_pending_link ) ); ?></p> + <?php } ?> </div> <?php elseif ( $type == 'new-key-invalid' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status"><?php esc_html_e( 'The key you entered is invalid. Please double-check it.' , 'akismet'); ?></h3> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status"><?php esc_html_e( 'The key you entered is invalid. Please double-check it.' , 'akismet'); ?></h3> </div> <?php elseif ( $type == 'existing-key-invalid' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status"><?php esc_html_e( 'Your API key is no longer valid. Please enter a new key or contact support@akismet.com.' , 'akismet'); ?></h3> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status"><?php esc_html_e( 'Your API key is no longer valid. Please enter a new key or contact support@akismet.com.' , 'akismet'); ?></h3> </div> <?php elseif ( $type == 'new-key-failed' ) :?> -<div class="wrap alert critical"> - <h3 class="key-status"><?php esc_html_e( 'The API key you entered could not be verified.' , 'akismet'); ?></h3> - <p class="description"><?php printf( __('The connection to akismet.com could not be established. Please refer to <a href="%s" target="_blank">our guide about firewalls</a> and check your server configuration.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> +<div class="akismet-alert akismet-critical"> + <h3 class="akismet-key-status"><?php esc_html_e( 'The API key you entered could not be verified.' , 'akismet'); ?></h3> + <p class="akismet-description"><?php printf( __('The connection to akismet.com could not be established. Please refer to <a href="%s" target="_blank">our guide about firewalls</a> and check your server configuration.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p> </div> <?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?> -<div class="wrap alert critical"> +<div class="akismet-alert akismet-critical"> <?php if ( $level == 'yellow' ): ?> - <h3 class="key-status failed"><?php esc_html_e( 'You’re using your Akismet key on more sites than your Pro subscription allows.', 'akismet' ); ?></h3> - <p class="description"> + <h3 class="akismet-key-status failed"><?php esc_html_e( 'You’re using your Akismet key on more sites than your Pro subscription allows.', 'akismet' ); ?></h3> + <p class="akismet-description"> <?php printf( __( 'Your Pro subscription allows the use of Akismet on only one site. Please <a href="%s" target="_blank">purchase additional Pro subscriptions</a> or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.', 'akismet' ), 'https://docs.akismet.com/billing/add-more-sites/' ); ?> <br /><br /> <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/'); ?> </p> <?php elseif ( $level == 'red' ): ?> - <h3 class="key-status failed"><?php esc_html_e( 'You’re using Akismet on far too many sites for your Pro subscription.', 'akismet' ); ?></h3> - <p class="description"> - <?php printf( __( 'To continue your service, <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>, which covers an unlimited number of sites.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?></p> + <h3 class="akismet-key-status failed"><?php esc_html_e( 'You’re using Akismet on far too many sites for your Pro subscription.', 'akismet' ); ?></h3> + <p class="akismet-description"> + <?php printf( __( 'To continue your service, <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>, which covers an unlimited number of sites.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?> <br /><br /> - <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/'); ?></p> + <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/'); ?> </p> <?php endif; ?> </div> diff --git a/plugins/akismet/views/start.php b/plugins/akismet/views/start.php index 751da6e6..d17b53dc 100644 --- a/plugins/akismet/views/start.php +++ b/plugins/akismet/views/start.php @@ -1,97 +1,93 @@ -<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 ( 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_html( $akismet_user->user_email ); ?> +<div id="akismet-plugin-container"> + <div class="akismet-masthead"> + <div class="akismet-masthead__inside-container"> + <div class="akismet-masthead__logo-container"> + <img class="akismet-masthead__logo" src="<?php echo esc_url( plugins_url( '../_inc/img/logo-full-2x.png', __FILE__ ) ); ?>" alt="Akismet" /> + </div> + </div> </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_url( Akismet_Admin::get_page_url() ); ?>"/> - <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> - <input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> - <input type="hidden" name="redirect" value="plugin-signup"/> - <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 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 echo esc_html( sprintf( __( 'Your subscription for %s is cancelled' , 'akismet'), $akismet_user->user_email ) ); ?> + <div class="akismet-lower"> + <?php Akismet_Admin::display_status(); ?> + <div class="akismet-box"> + <h2><?php esc_html_e( 'Eliminate spam from your site', 'akismet' ); ?></h2> + <p><?php esc_html_e( 'Select one of the options below to get started.', 'akismet' ); ?></p> + </div> + <div class="akismet-boxes"> + <?php if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { ?> + <?php if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) { ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> + <p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p> + <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> + <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_option( 'home' ) ); ?>"/> + <input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> + <input type="hidden" name="redirect" value="plugin-signup"/> + <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> + </form> + <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> + <p><?php echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); ?><br /><span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span></p> + </div> + <?php } elseif ( $akismet_user->status == 'cancelled' ) { ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> + <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> + <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_option( 'home' ) ); ?>"/> + <input type="hidden" name="user_id" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> + <input type="hidden" name="redirect" value="upgrade"/> + <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet' ); ?>"/> + </form> + <p><?php echo esc_html( sprintf( __( 'Your subscription for %s is cancelled.' , 'akismet' ), $akismet_user->user_email ) ); ?></p> + </div> + <?php } elseif ( $akismet_user->status == 'suspended' ) { ?> + <div class="centered akismet-box"> + <h3><?php esc_html_e( 'Connected via Jetpack' , 'akismet' ); ?></h3> + <p class="akismet-alert-text"><?php echo esc_html( sprintf( __( 'Your subscription for %s is suspended.' , 'akismet' ), $akismet_user->user_email ) ); ?></p> + <p><?php esc_html_e( 'No worries! Get in touch and we’ll sort this out.', 'akismet' ); ?></p> + <p><a href="https://akismet.com/contact" class="akismet-button akismet-is-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet' ); ?></a></p> + </div> + <?php } else { // ask do they want to use akismet account found using jetpack wpcom connection ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> + <p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p> + <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="akismet-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="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> + </form> + <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> + <p><?php echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); ?><br /><span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span></p> + </div> + <?php } ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Or sign up with a different email address', 'akismet' ); ?></h3> + <div class="akismet-right"> + <?php Akismet::view( 'get', array( 'text' => __( 'Sign up with a different email address' , 'akismet' ), 'classes' => array( 'akismet-button' ) ) ); ?> + </div> + <p><?php esc_html_e( 'Choose this option to use Akismet independently of your Jetpack connection.', 'akismet' ); ?></p> + </div> + <?php } else { ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Activate Akismet' , 'akismet' );?></h3> + <div class="akismet-right"> + <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> + </div> + <p><?php esc_html_e( 'Log in or sign up now.', 'akismet' ); ?></p> + </div> + <?php } ?> + <div class="akismet-box"> + <h3><?php esc_html_e( 'Or enter an API key', 'akismet' ); ?></h3> + <p><?php esc_html_e( 'Already have your key? Enter it here.', 'akismet' ); ?> <a href="https://docs.akismet.com/getting-started/api-key/" target="_blank"><?php esc_html_e( '(What is an API key?)', 'akismet' ); ?></a></p> + <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post"> + <?php wp_nonce_field( Akismet_Admin::NONCE ) ?> + <input type="hidden" name="action" value="enter-key"> + <p style="width: 100%; display: flex; flex-wrap: nowrap; box-sizing: border-box;"> + <input id="key" name="key" type="text" size="15" value="" class="regular-text code" style="flex-grow: 1; margin-right: 1rem;"> + <input type="submit" name="submit" id="submit" class="akismet-button" value="<?php esc_attr_e( 'Connect with API key', 'akismet' );?>"> + </p> + </form> + </div> </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_url( Akismet_Admin::get_page_url() ); ?>"/> - <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> - <input type="hidden" name="user_id" value="<?php echo esc_attr( $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 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 echo esc_html( sprintf( __( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ) ); ?></h3> - <p><?php esc_html_e('No worries! Get in touch and we’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 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_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 account' , 'akismet'); ?>"/> - </form> -</div> -<?php endif;?> -<div class="activate-highlight secondary activate-option"> - <div class="option-description"> - <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' => __( '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('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" 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 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 sign up now.', 'akismet'); ?></p> - </div> - <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?> -</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> - </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" 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');?>"> - </form> -</div><?php - endif;?> </div>
\ No newline at end of file diff --git a/plugins/akismet/views/stats.php b/plugins/akismet/views/stats.php index a536f3a0..2302c11a 100644 --- a/plugins/akismet/views/stats.php +++ b/plugins/akismet/views/stats.php @@ -1,4 +1,11 @@ -<div class="wrap"> - <h2><?php esc_html_e( 'Akismet Stats' , 'akismet');?><?php if ( !isset( $hide_settings_link ) ): ?> <a href="<?php echo esc_url( Akismet_Admin::get_page_url() );?>" class="add-new-h2"><?php esc_html_e( 'Settings' , 'akismet');?></a><?php endif;?></h2> - <iframe src="<?php echo esc_url( sprintf( '//akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s&locale=%s', urlencode( get_option( 'home' ) ), Akismet::get_api_key(), get_locale() ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe> +<div id="akismet-plugin-container"> + <div class="akismet-masthead"> + <div class="akismet-masthead__inside-container"> + <a href="<?php echo esc_url( Akismet_Admin::get_page_url() );?>" class="akismet-right"><?php esc_html_e( 'Akismet Settings' , 'akismet' ); ?></a> + <div class="akismet-masthead__logo-container"> + <img class="akismet-masthead__logo" src="<?php echo esc_url( plugins_url( '../_inc/img/logo-full-2x.png', __FILE__ ) ); ?>" alt="Akismet" /> + </div> + </div> + </div> + <iframe src="<?php echo esc_url( sprintf( '//akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s&locale=%s', urlencode( get_option( 'home' ) ), Akismet::get_api_key(), get_locale() ) ); ?>" width="100%" height="2500px" frameborder="0"></iframe> </div>
\ No newline at end of file diff --git a/plugins/akismet/views/strict.php b/plugins/akismet/views/strict.php deleted file mode 100644 index 83d7a505..00000000 --- a/plugins/akismet/views/strict.php +++ /dev/null @@ -1,17 +0,0 @@ -<fieldset> - <legend class="screen-reader-text"> - <span><?php esc_html_e( 'Akismet anti-spam strictness', 'akismet' ); ?></span> - </legend> - <p> - <label for="akismet_strictness_1"> - <input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked( '1', get_option( 'akismet_strictness' ) ); ?> /> - <?php esc_html_e( 'Strict: silently discard the worst and most pervasive spam.', 'akismet' ); ?> - </label> - </p> - <p> - <label for="akismet_strictness_0"> - <input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked( '0', get_option( 'akismet_strictness' ) ); ?> /> - <?php esc_html_e( 'Safe: always put spam in the Spam folder for review.', 'akismet' ); ?> - </label> - </p> -</fieldset> |