Changeset 2947882
- Timestamp:
- 08/04/2023 07:16:10 PM (12 months ago)
- Location:
- akismet/trunk/views
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
akismet/trunk/views/connect-jp.php
r2708660 r2947882 8 8 <?php Akismet::view( 'title' ); ?> 9 9 <div class="akismet-jp-connect"> 10 <h3><?php esc_html_e( 'Connect with Jetpack', 'akismet' ); ?></h3><?php 11 if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) {?> 12 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 13 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 14 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 15 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 16 <input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 17 <input type="hidden" name="redirect" value="plugin-signup"/> 18 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> 19 </form> 20 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 21 <p><?php 22 /* translators: %s is the WordPress.com username */ 23 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> 10 <h3><?php esc_html_e( 'Connect with Jetpack', 'akismet' ); ?></h3> 11 <?php if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) { ?> 12 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 13 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 14 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 15 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 16 <input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 17 <input type="hidden" name="redirect" value="plugin-signup"/> 18 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack', 'akismet' ); ?>"/> 19 </form> 20 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 21 <p> 22 <?php 23 24 /* translators: %s is the WordPress.com username */ 25 echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); 26 27 ?> 28 <br /> 29 <span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span> 30 </p> 24 31 <?php } elseif ( $akismet_user->status == 'cancelled' ) { ?> 25 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 26 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 27 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 28 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 29 <input type="hidden" name="user_id" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 30 <input type="hidden" name="redirect" value="upgrade"/> 31 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> 32 </form> 33 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 34 <p><?php 35 /* translators: %s is the WordPress.com email address */ 36 echo esc_html( sprintf( __( 'Your subscription for %s is cancelled.' , 'akismet' ), $akismet_user->user_email ) ); ?><br /><span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span></p> 32 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 33 <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank"> 34 <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/> 35 <input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/> 36 <input type="hidden" name="user_id" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/> 37 <input type="hidden" name="redirect" value="upgrade"/> 38 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack', 'akismet' ); ?>"/> 39 </form> 40 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 41 <p> 42 <?php 43 44 /* translators: %s is the WordPress.com email address */ 45 echo esc_html( sprintf( __( 'Your subscription for %s is cancelled.', 'akismet' ), $akismet_user->user_email ) ); 46 47 ?> 48 <br /> 49 <span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span> 50 </p> 37 51 <?php } elseif ( $akismet_user->status == 'suspended' ) { ?> 38 <div class="akismet-right"> 39 <p><a href="https://akismet.com/contact" class="akismet-button akismet-is-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet' ); ?></a></p> 40 </div> 41 <p> 42 <span class="akismet-alert-text"><?php 43 /* translators: %s is the WordPress.com email address */ 44 echo esc_html( sprintf( __( 'Your subscription for %s is suspended.' , 'akismet' ), $akismet_user->user_email ) ); ?></span> 45 <?php esc_html_e( 'No worries! Get in touch and we’ll sort this out.', 'akismet' ); ?> 46 </p> 47 <?php } else { // ask do they want to use akismet account found using jetpack wpcom connection ?> 48 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 49 <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="akismet-right"> 50 <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/> 51 <input type="hidden" name="action" value="enter-key"> 52 <?php wp_nonce_field( Akismet_Admin::NONCE ) ?> 53 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/> 54 </form> 55 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 56 <p><?php 57 /* translators: %s is the WordPress.com username */ 58 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> 59 <?php } ?> 52 <div class="akismet-right"> 53 <p><a href="https://akismet.com/contact" class="akismet-button akismet-is-primary"><?php esc_html_e( 'Contact Akismet support', 'akismet' ); ?></a></p> 54 </div> 55 <p> 56 <span class="akismet-alert-text"> 57 <?php 58 59 /* translators: %s is the WordPress.com email address */ 60 echo esc_html( sprintf( __( 'Your subscription for %s is suspended.', 'akismet' ), $akismet_user->user_email ) ); 61 62 ?> 63 </span> 64 <?php esc_html_e( 'No worries! Get in touch and we’ll sort this out.', 'akismet' ); ?> 65 </p> 66 <?php } else { // ask do they want to use akismet account found using jetpack wpcom connection ?> 67 <p><?php esc_html_e( 'Use your Jetpack connection to set up Akismet.', 'akismet' ); ?></p> 68 <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="akismet-right"> 69 <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key ); ?>"/> 70 <input type="hidden" name="action" value="enter-key"> 71 <?php wp_nonce_field( Akismet_Admin::NONCE ); ?> 72 <input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack', 'akismet' ); ?>"/> 73 </form> 74 <?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> 75 <p> 76 <?php 77 78 /* translators: %s is the WordPress.com username */ 79 echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); 80 81 ?> 82 <br /> 83 <span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span> 84 </p> 85 <?php } ?> 60 86 </div> 61 87 <div class="akismet-ak-connect"> 62 <?php Akismet::view( 'setup' ); ?>88 <?php Akismet::view( 'setup' );?> 63 89 </div> 64 90 <div class="centered akismet-toggles"> … … 69 95 <br/> 70 96 <div class="akismet-box"> 71 <?php Akismet::view( 'enter' ); ?>97 <?php Akismet::view( 'enter' );?> 72 98 </div> -
akismet/trunk/views/notice.php
r2928208 r2947882 97 97 <?php elseif ( $type == 'new-key-valid' ) : 98 98 global $wpdb; 99 99 100 100 $check_pending_link = false; 101 101 102 102 $at_least_one_comment_in_moderation = !! $wpdb->get_var( "SELECT comment_ID FROM {$wpdb->comments} WHERE comment_approved = '0' LIMIT 1" ); 103 103 104 104 if ( $at_least_one_comment_in_moderation) { 105 105 $check_pending_link = 'edit-comments.php?akismet_recheck=' . wp_create_nonce( 'akismet_recheck' );
Note: See TracChangeset
for help on using the changeset viewer.