WordPress 4.1.2

[autoinstalls/wordpress.git] / wp-content / plugins / akismet / views / config.php

diff --git a/wp-content/plugins/akismet/views/config.php b/wp-content/plugins/akismet/views/config.php
index 154f2b2c052a301bcea69cee9121c936ccc63fa4..232d10789e6c61d6f635d8029901f0ac5c597856 100644 (file)
--- a/wp-content/plugins/akismet/views/config.php
+++ b/wp-content/plugins/akismet/views/config.php
@@ -64,13 +64,43 @@
                                                                                <tbody>
                                                                                        <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
                                                                                        <tr>
                                                                                <tbody>
                                                                                        <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
                                                                                        <tr>

-                                                                                               <th width="10%" align="left" scope="row"><?php esc_html_e('API Key', 'akismet');?></th>
+                                                                                               <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" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $akismet_user->status;?>"></span>
                                                                                                </td>
                                                                                        </tr>
                                                                                        <?php endif; ?>
                                                                                                <td width="5%"/>
                                                                                                <td align="left">
                                                                                                        <span class="api-key"><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $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 ( $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>
                                                                                        <tr>
                                                                                                <th align="left" scope="row"><?php esc_html_e('Comments', 'akismet');?></th>
                                                                                                <td></td>


@@ -95,7 +125,7 @@
                                                                                                        
                                                                                                        printf(
                                                                                                                _n(
                                                                                                        
                                                                                                        printf(
                                                                                                                _n(

-                                                                                                                       'Spam in the <a href="%s">spam folder</a> older than 1 day is deleted automatically.',
+                                                                                                                       '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'
                                                                                                                        'Spam in the <a href="%1$s">spam folder</a> older than %2$d days is deleted automatically.',
                                                                                                                        $delete_interval,
                                                                                                                        'akismet'