Changeset 2177137
- Timestamp:
- 10/21/2019 06:44:02 PM (5 years ago)
- Location:
- akismet/trunk
- Files:
-
- 6 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
akismet/trunk/_inc/akismet.css
r2080141 r2177137 545 545 .akismet-boxes .akismet-box:first-child { 546 546 margin-top: 1.5rem; 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 547 585 } 548 586 -
akismet/trunk/_inc/akismet.js
r2101241 r2177137 315 315 } ); 316 316 } ); 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 317 349 }); -
akismet/trunk/readme.txt
r2177071 r2177137 35 35 * Prevented an attacker from being able to cause a user to unknowingly recheck their Pending comments for spam. 36 36 * Improved compatibility with Jetpack 7.7+. 37 37 38 38 39 = 4.1.2 = -
akismet/trunk/views/start.php
r1691611 r2177137 8 8 </div> 9 9 <div class="akismet-lower"> 10 <?php Akismet_Admin::display_status(); ?> 11 12 <div class="akismet-box"> 13 <h2><?php esc_html_e( 'Eliminate spam from your site', 'akismet' ); ?></h2> 14 <p><?php esc_html_e( 'Select one of the options below to get started.', 'akismet' ); ?></p> 15 </div> 16 <div class="akismet-boxes"> 17 <?php if ( ! Akismet::predefined_api_key() ) { ?> 18 <?php if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { ?> 19 <?php if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) { ?> 20 <div class="akismet-box"> 21 <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> 22 <p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p> 23 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 24 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 25 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 26 <input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 27 <input type="hidden" name="redirect" value="plugin-signup"/> 28 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> 29 </form> 30 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 31 <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> 32 </div> 33 <?php } elseif ( $akismet_user->status == 'cancelled' ) { ?> 34 <div class="akismet-box"> 35 <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> 36 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 37 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 38 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 39 <input type="hidden" name="user_id" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 40 <input type="hidden" name="redirect" value="upgrade"/> 41 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet' ); ?>"/> 42 </form> 43 <p><?php echo esc_html( sprintf( __( 'Your subscription for %s is cancelled.' , 'akismet' ), $akismet_user->user_email ) ); ?></p> 44 </div> 45 <?php } elseif ( $akismet_user->status == 'suspended' ) { ?> 46 <div class="centered akismet-box"> 47 <h3><?php esc_html_e( 'Connected via Jetpack' , 'akismet' ); ?></h3> 48 <p class="akismet-alert-text"><?php echo esc_html( sprintf( __( 'Your subscription for %s is suspended.' , 'akismet' ), $akismet_user->user_email ) ); ?></p> 49 <p><?php esc_html_e( 'No worries! Get in touch and we’ll sort this out.', 'akismet' ); ?></p> 50 <p><a href="https://akismet.com/contact" class="akismet-button akismet-is-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet' ); ?></a></p> 51 </div> 52 <?php } else { // ask do they want to use akismet account found using jetpack wpcom connection ?> 53 <div class="akismet-box"> 54 <h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3> 55 <p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p> 56 <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="akismet-right"> 57 <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/> 58 <input type="hidden" name="action" value="enter-key"> 59 <?php wp_nonce_field( Akismet_Admin::NONCE ) ?> 60 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> 61 </form> 62 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 63 <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> 64 </div> 65 <?php } ?> 66 <div class="akismet-box"> 67 <h3><?php esc_html_e( 'Or sign up with a different email address', 'akismet' ); ?></h3> 68 <div class="akismet-right"> 69 <?php Akismet::view( 'get', array( 'text' => __( 'Sign up with a different email address' , 'akismet' ), 'classes' => array( 'akismet-button' ) ) ); ?> 70 </div> 71 <p><?php esc_html_e( 'Choose this option to use Akismet independently of your Jetpack connection.', 'akismet' ); ?></p> 72 </div> 73 <?php } else { ?> 74 <div class="akismet-box"> 75 <h3><?php esc_html_e( 'Activate Akismet' , 'akismet' );?></h3> 76 <div class="akismet-right"> 77 <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> 78 </div> 79 <p><?php esc_html_e( 'Log in or sign up now.', 'akismet' ); ?></p> 80 </div> 81 <?php } ?> 82 <div class="akismet-box"> 83 <h3><?php esc_html_e( 'Or enter an API key', 'akismet' ); ?></h3> 84 <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> 85 <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post"> 86 <?php wp_nonce_field( Akismet_Admin::NONCE ) ?> 87 <input type="hidden" name="action" value="enter-key"> 88 <p style="width: 100%; display: flex; flex-wrap: nowrap; box-sizing: border-box;"> 89 <input id="key" name="key" type="text" size="15" value="" class="regular-text code" style="flex-grow: 1; margin-right: 1rem;"> 90 <input type="submit" name="submit" id="submit" class="akismet-button" value="<?php esc_attr_e( 'Connect with API key', 'akismet' );?>"> 91 </p> 92 </form> 93 </div> 94 <?php } else { ?> 95 <div class="akismet-box"> 96 <h2><?php esc_html_e( 'Manual Configuration', 'akismet' ); ?></h2> 97 <p><?php echo sprintf( esc_html__( 'An Akismet API key has been defined in the %s file for this site.', 'akismet' ), '<code>wp-config.php</code>' ); ?></p> 98 </div> 99 <?php } ?> 10 <?php Akismet_Admin::display_status();?> 11 <div class="akismet-boxes"><?php 12 if ( Akismet::predefined_api_key() ) { 13 Akismet::view( 'predefined' ); 14 } elseif ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { 15 Akismet::view( 'connect-jp', compact( 'akismet_user' ) ); 16 } else { 17 Akismet::view( 'activate' ); 18 }?> 100 19 </div> 101 20 </div>
Note: See TracChangeset
for help on using the changeset viewer.