diff --git a/wp-content/plugins/akismet/.htaccess b/wp-content/plugins/akismet/.htaccess
new file mode 100644
index 0000000..6d8b4ec
--- /dev/null
+++ b/wp-content/plugins/akismet/.htaccess
@@ -0,0 +1,11 @@
+Order Deny,Allow
+Deny from all
+
+
+ Allow from all
+
+
+#allow access to any image
+
+ Allow from all
+
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/_inc/akismet.css b/wp-content/plugins/akismet/_inc/akismet.css
index e1d6fd5..ff076aa 100644
--- a/wp-content/plugins/akismet/_inc/akismet.css
+++ b/wp-content/plugins/akismet/_inc/akismet.css
@@ -75,8 +75,8 @@ h2.ak-header {
display: inline-block !important;
}
.checkforspam-spinner {
- display: none;
- margin-top: 10px;
+ display: inline-block;
+ margin-top: 7px;
}
.config-wrap {
diff --git a/wp-content/plugins/akismet/_inc/akismet.js b/wp-content/plugins/akismet/_inc/akismet.js
index ed65220..aa0aab4 100644
--- a/wp-content/plugins/akismet/_inc/akismet.js
+++ b/wp-content/plugins/akismet/_inc/akismet.js
@@ -125,7 +125,7 @@ jQuery( function ( $ ) {
});
$('.checkforspam:not(.button-disabled)').click( function(e) {
$('.checkforspam:not(.button-disabled)').addClass('button-disabled');
- $('.checkforspam-spinner').show();
+ $('.checkforspam-spinner').addClass( 'spinner' );
akismet_check_for_spam(0, 100);
e.preventDefault();
});
diff --git a/wp-content/plugins/akismet/_inc/form.js b/wp-content/plugins/akismet/_inc/form.js
index ec5e56e..3a5be8a 100644
--- a/wp-content/plugins/akismet/_inc/form.js
+++ b/wp-content/plugins/akismet/_inc/form.js
@@ -1,17 +1,30 @@
-jQuery( function ( $ ) {
- var ak_js = $( '#ak_js' );
+var ak_js = document.getElementById( "ak_js" );
- // If the form field already exists just use that
- if ( ak_js.length == 0 ) {
- ak_js = $( '' );
+if ( ! ak_js ) {
+ ak_js = document.createElement( 'input' );
+ ak_js.setAttribute( 'id', 'ak_js' );
+ ak_js.setAttribute( 'name', 'ak_js' );
+ ak_js.setAttribute( 'type', 'hidden' );
+}
+else {
+ ak_js.parentNode.removeChild( ak_js );
+}
+
+ak_js.setAttribute( 'value', ( new Date() ).getTime() );
+
+var commentForm = document.getElementById( 'commentform' );
+
+if ( commentForm ) {
+ commentForm.appendChild( ak_js );
+}
+else {
+ var replyRowContainer = document.getElementById( 'replyrow' );
+
+ if ( replyRowContainer ) {
+ var children = replyRowContainer.getElementsByTagName( 'td' );
+
+ if ( children.length > 0 ) {
+ children[0].appendChild( ak_js );
+ }
}
- else {
- ak_js.remove();
- }
-
- ak_js.val( ( new Date() ).getTime() );
-
- // single page, front-end comment form
- // inline comment reply, wp-admin
- $( '#commentform, #replyrow td:first' ).append( ak_js );
-} );
+}
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php
index 811ab71..7fc1e9d 100644
--- a/wp-content/plugins/akismet/akismet.php
+++ b/wp-content/plugins/akismet/akismet.php
@@ -6,7 +6,7 @@
Plugin Name: Akismet
Plugin URI: http://akismet.com/
Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) Sign up for an Akismet API key, and 3) Go to your Akismet configuration page, and save your API key.
-Version: 3.0.0
+Version: 3.0.1
Author: Automattic
Author URI: http://automattic.com/wordpress-plugins/
License: GPLv2 or later
@@ -35,8 +35,8 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-define( 'AKISMET_VERSION', '3.0.0' );
-define( 'AKISMET__MINIMUM_WP_VERSION', '3.0' );
+define( 'AKISMET_VERSION', '3.0.1' );
+define( 'AKISMET__MINIMUM_WP_VERSION', '3.1' );
define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'AKISMET_DELETE_LIMIT', 100000 );
diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php
index 15f5d47..7a62ccb 100644
--- a/wp-content/plugins/akismet/class.akismet-admin.php
+++ b/wp-content/plugins/akismet/class.akismet-admin.php
@@ -33,7 +33,6 @@ class Akismet_Admin {
add_action( 'activity_box_end', array( 'Akismet_Admin', 'dashboard_stats' ) );
add_action( 'rightnow_end', array( 'Akismet_Admin', 'rightnow_stats' ) );
add_action( 'manage_comments_nav', array( 'Akismet_Admin', 'check_for_spam_button' ) );
- add_action( 'transition_comment_status', array( 'Akismet_Admin', 'transition_comment_status' ), 10, 3 );
add_action( 'admin_action_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
add_action( 'wp_ajax_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
add_action( 'wp_ajax_comment_author_deurl', array( 'Akismet_Admin', 'remove_comment_author_url' ) );
@@ -44,6 +43,8 @@ class Akismet_Admin {
add_filter( 'comment_text', array( 'Akismet_Admin', 'text_add_link_class' ) );
add_filter( 'plugin_action_links_'.plugin_basename( plugin_dir_path( __FILE__ ) . 'akismet.php'), array( 'Akismet_Admin', 'admin_plugin_settings_link' ) );
+
+ add_filter( 'wxr_export_skip_commentmeta', array( 'Akismet_Admin', 'exclude_commentmeta_from_export' ), 10, 3 );
}
public static function admin_init() {
@@ -64,7 +65,7 @@ class Akismet_Admin {
}
public static function admin_plugin_settings_link( $links ) {
- $settings_link = ''.__('Settings', 'akismet').'';
+ $settings_link = ''.__('Settings', 'akismet').'';
array_unshift( $links, $settings_link );
return $links;
}
@@ -331,51 +332,7 @@ class Akismet_Admin {
else
$link = add_query_arg( array( 'page' => 'akismet-admin', 'recheckqueue' => 'true', 'noheader' => 'true' ), admin_url( 'edit-comments.php' ) );
- echo '
' . esc_html__('Check for Spam', 'akismet') . '';
- echo '';
- }
-
- public static function transition_comment_status( $new_status, $old_status, $comment ) {
- if ( $new_status == $old_status )
- return;
-
- # we don't need to record a history item for deleted comments
- if ( $new_status == 'delete' )
- return;
-
- if ( !is_admin() )
- return;
-
- if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
- return;
-
- if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
- return;
-
- // if this is present, it means the status has been changed by a re-check, not an explicit user action
- if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- return;
-
- global $current_user;
- $reporter = '';
- if ( is_object( $current_user ) )
- $reporter = $current_user->user_login;
-
- // Assumption alert:
- // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
- // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
- // determine why the transition_comment_status action was triggered. And there are several different ways by which
- // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
- // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
- if ( isset($_POST['action']) || isset($_GET['action']) ) {
- if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
- return self::submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return self::submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- Akismet::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ echo '
' . esc_html__('Check for Spam', 'akismet') . '';
}
public static function recheck_queue() {
@@ -410,7 +367,7 @@ class Akismet_Admin {
add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
- $response = Akismet::http_post( http_build_query( $c ), 'comment-check' );
+ $response = Akismet::http_post( build_query( $c ), 'comment-check' );
if ( 'true' == $response[1] ) {
wp_set_comment_status( $c['comment_ID'], 'spam' );
update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
@@ -514,7 +471,10 @@ class Akismet_Admin {
if ( $desc )
echo ''.esc_html( $desc ).'';
- if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) ) {
+ $show_user_comments = apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') );
+ $show_user_comments = $show_user_comments === 'false' ? false : $show_user_comments; //option used to be saved as 'false' / 'true'
+
+ if ( $show_user_comments ) {
$comment_count = Akismet::get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
$comment_count = intval( $comment_count );
echo ' '. sprintf( esc_html( _n( '%s approved', '%s approved', $comment_count , 'akismet') ), number_format_i18n( $comment_count ) ) . '';
@@ -557,102 +517,6 @@ class Akismet_Admin {
return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', array( 'Akismet_Admin', 'text_add_link_callback' ), $comment_text );
}
- public static function submit_spam_comment( $comment_id ) {
- global $wpdb, $current_user, $current_site;
-
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
-
- if ( !$comment ) // it was deleted
- return;
-
- if ( 'spam' != $comment->comment_approved )
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
-
- if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
- $comment = (object) array_merge( (array)$comment, $as_submitted );
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
-
- if ( is_object($current_user) )
- $comment->reporter = $current_user->user_login;
-
- if ( is_object($current_site) )
- $comment->site_domain = $current_site->domain;
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
-
- if ( Akismet::is_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $response = Akismet::http_post( http_build_query( $comment ), 'submit-spam' );
- if ( $comment->reporter ) {
- Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
-
- do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
- }
-
- public static function submit_nonspam_comment( $comment_id ) {
- global $wpdb, $current_user, $current_site;
-
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
- if ( !$comment ) // it was deleted
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
-
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
- $comment = (object) array_merge( (array)$comment, $as_submitted );
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink( $comment->comment_post_ID );
- $comment->user_role = '';
-
- if ( is_object($current_user) )
- $comment->reporter = $current_user->user_login;
-
- if ( is_object($current_site) )
- $comment->site_domain = $current_site->domain;
-
- if ( isset( $comment->user_ID ) )
- $comment->user_role = Akismet::get_user_roles($comment->user_ID);
-
- if ( Akismet::is_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $response = Akismet::http_post( http_build_query( $comment ), 'submit-ham' );
- if ( $comment->reporter ) {
- Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
-
- do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
- }
-
// Total spam in queue
// get_option( 'akismet_spam_count' ) is the total caught ever
public static function get_spam_count( $type = false ) {
@@ -672,53 +536,73 @@ class Akismet_Admin {
return $count;
} elseif ( 'comments' == $type || 'comment' == $type ) { // comments
$type = '';
- } else { // pingback, trackback, ...
- $type = $wpdb->escape( $type );
}
- return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type='$type'");
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type = %s", $type ) );
}
// Check connectivity between the WordPress blog and Akismet's servers.
// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
- public static function check_server_connectivity() {
- $test_host = 'rest.akismet.com';
+ public static function check_server_ip_connectivity() {
+
+ $servers = $ips = array();
- // Some web hosts may disable one or both functions
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- return array();
-
- $ips = gethostbynamel( $test_host );
- if ( !$ips || !is_array($ips) || !count($ips) )
- return array();
-
- $api_key = Akismet::get_api_key();
-
- $servers = array();
- foreach ( $ips as $ip ) {
- $response = Akismet::verify_key( $api_key, $ip );
- // even if the key is invalid, at least we know we have connectivity
- if ( $response == 'valid' || $response == 'invalid' )
- $servers[$ip] = true;
- else
- $servers[$ip] = false;
+ // Some web hosts may disable this function
+ if ( function_exists('gethostbynamel') ) {
+
+ $ips = gethostbynamel( 'rest.akismet.com' );
+ if ( $ips && is_array($ips) && count($ips) ) {
+ $api_key = Akismet::get_api_key();
+
+ foreach ( $ips as $ip ) {
+ $response = Akismet::verify_key( $api_key, $ip );
+ // even if the key is invalid, at least we know we have connectivity
+ if ( $response == 'valid' || $response == 'invalid' )
+ $servers[$ip] = 'connected';
+ else
+ $servers[$ip] = $response ? $response : 'unable to connect';
+ }
+ }
}
+
return $servers;
}
-
- // Check the server connectivity and store the results in an option.
- // Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
- // Returns the same associative array as check_server_connectivity()
- public static function get_server_connectivity( $cache_timeout = 86400 ) {
+
+ // Simpler connectivity check
+ public static function check_server_connectivity($cache_timeout = 86400) {
+
+ $debug = array();
+ $debug[ 'PHP_VERSION' ] = PHP_VERSION;
+ $debug[ 'WORDPRESS_VERSION' ] = $GLOBALS['wp_version'];
+ $debug[ 'AKISMET_VERSION' ] = AKISMET_VERSION;
+ $debug[ 'AKISMET__PLUGIN_DIR' ] = AKISMET__PLUGIN_DIR;
+ $debug[ 'SITE_URL' ] = site_url();
+ $debug[ 'HOME_URL' ] = home_url();
+
$servers = get_option('akismet_available_servers');
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
- return $servers;
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false ) {
+ $servers = self::check_server_ip_connectivity();
+ update_option('akismet_available_servers', $servers);
+ update_option('akismet_connectivity_time', time());
+ }
+
+ $response = wp_remote_get( 'http://rest.akismet.com/1.1/test' );
+
+ $debug[ 'gethostbynamel' ] = function_exists('gethostbynamel') ? 'exists' : 'not here';
+ $debug[ 'Servers' ] = $servers;
+ $debug[ 'Test Connection' ] = $response;
+
+ Akismet::log( $debug );
+
+ if ( $response && 'connected' == wp_remote_retrieve_body( $response ) )
+ return true;
+
+ return false;
+ }
- // There's a race condition here but the effect is harmless.
- $servers = self::check_server_connectivity();
- update_option('akismet_available_servers', $servers);
- update_option('akismet_connectivity_time', time());
- return $servers;
+ // Check the server connectivity and store the available servers in an option.
+ public static function get_server_connectivity($cache_timeout = 86400) {
+ return self::check_server_connectivity( $cache_timeout );
}
public static function get_number_spam_waiting() {
@@ -741,7 +625,7 @@ class Akismet_Admin {
}
public static function get_akismet_user( $api_key ) {
- $akismet_user = Akismet::http_post( http_build_query( array( 'key' => $api_key ) ), 'get-subscription' );
+ $akismet_user = Akismet::http_post( build_query( array( 'key' => $api_key ) ), 'get-subscription' );
if ( ! empty( $akismet_user[1] ) )
$akismet_user = json_decode( $akismet_user[1] );
@@ -755,7 +639,7 @@ class Akismet_Admin {
$stat_totals = array();
foreach( array( '6-months', 'all' ) as $interval ) {
- $response = Akismet::http_post( http_build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
+ $response = Akismet::http_post( build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
if ( ! empty( $response[1] ) ) {
$stat_totals[$interval] = json_decode( $response[1] );
@@ -765,7 +649,7 @@ class Akismet_Admin {
}
public static function verify_wpcom_key( $api_key, $user_id, $token = '' ) {
- $akismet_account = Akismet::http_post( http_build_query( array(
+ $akismet_account = Akismet::http_post( build_query( array(
'user_id' => $user_id,
'api_key' => $api_key,
'token' => $token,
@@ -790,9 +674,11 @@ class Akismet_Admin {
public static function display_spam_check_warning() {
Akismet::fix_scheduled_recheck();
+
+ $link_text = apply_filters( 'akismet_spam_check_warning_link_text', sprintf( __( 'Please check your Akismet configuration and contact your web host if problems persist.', 'akismet'), esc_url( self::get_page_url() ) ) );
if ( self::get_number_spam_waiting() > 0 && wp_next_scheduled('akismet_schedule_cron_recheck') > time() )
- Akismet::view( 'notice', array( 'type' => 'spam-check' ) );
+ Akismet::view( 'notice', array( 'type' => 'spam-check', 'link_text' => $link_text ) );
}
public static function display_invalid_version() {
@@ -869,7 +755,7 @@ class Akismet_Admin {
if ( empty( self::$notices ) ) {
//show status
- if ( $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
+ if ( ! empty( $stat_totals['all'] ) && isset( $stat_totals['all']->time_saved ) && $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
$time_saved = false;
@@ -920,16 +806,11 @@ class Akismet_Admin {
}
public static function display_status() {
- $servers = self::get_server_connectivity();
- $fail_count = count( $servers ) - count( array_filter( $servers ) );
- $type = '';
+ $type = '';
- if ( empty( $servers ) || $fail_count > 0 )
+ if ( !self::get_server_connectivity() )
$type = 'servers-be-down';
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- $type = 'missing-functions';
-
if ( !empty( $type ) )
Akismet::view( 'notice', compact( 'type' ) );
elseif ( !empty( self::$notices ) ) {
@@ -961,4 +842,20 @@ class Akismet_Admin {
}
return false;
}
+
+ /**
+ * Some commentmeta isn't useful in an export file. Suppress it (when supported).
+ *
+ * @param bool $exclude
+ * @param string $key The meta key
+ * @param object $meta The meta object
+ * @return bool Whether to exclude this meta entry from the export.
+ */
+ public static function exclude_commentmeta_from_export( $exclude, $key, $meta ) {
+ if ( in_array( $key, array( 'akismet_as_submitted', 'akismet_rechecking', 'akismet_delayed_moderation_email' ) ) ) {
+ return true;
+ }
+
+ return $exclude;
+ }
}
\ No newline at end of file
diff --git a/wp-content/plugins/akismet/class.akismet.php b/wp-content/plugins/akismet/class.akismet.php
index 7cf813d..17f6b00 100644
--- a/wp-content/plugins/akismet/class.akismet.php
+++ b/wp-content/plugins/akismet/class.akismet.php
@@ -33,12 +33,14 @@ class Akismet {
if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
add_action( 'comment_form', array( 'Akismet', 'add_comment_nonce' ), 1 );
- add_action( 'admin_footer-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'admin_head-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
add_action( 'comment_form', array( 'Akismet', 'load_form_js' ) );
add_action( 'comment_form', array( 'Akismet', 'inject_ak_js' ) );
add_filter( 'comment_moderation_recipients', array( 'Akismet', 'disable_moderation_emails_if_unreachable' ), 1000, 2 );
add_filter( 'pre_comment_approved', array( 'Akismet', 'last_comment_status' ), 10, 2 );
+
+ add_action( 'transition_comment_status', array( 'Akismet', 'transition_comment_status' ), 10, 3 );
if ( '3.0.5' == $GLOBALS['wp_version'] ) {
remove_filter( 'comment_text', 'wp_kses_data' );
@@ -48,11 +50,11 @@ class Akismet {
}
public static function get_api_key() {
- return defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key');
+ return apply_filters( 'akismet_get_api_key', defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key') );
}
public static function check_key_status( $key, $ip = null ) {
- return self::http_post( http_build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
+ return self::http_post( build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
}
public static function verify_key( $key, $ip = null ) {
@@ -115,19 +117,24 @@ class Akismet {
$post = get_post( $comment['comment_post_ID'] );
$comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
- $response = self::http_post( http_build_query( $comment ), 'comment-check' );
+ $response = self::http_post( build_query( $comment ), 'comment-check' );
do_action( 'akismet_comment_check_response', $response );
self::update_alert( $response );
- $commentdata['comment_as_submitted'] = $comment;
+ $commentdata['comment_as_submitted'] = array_intersect_key( $comment, array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ) );
$commentdata['akismet_result'] = $response[1];
if ( isset( $response[0]['x-akismet-pro-tip'] ) )
$commentdata['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
- if ( 'true' == $response[1] ) {
+ if ( isset( $response[0]['x-akismet-error'] ) ) {
+ // An error occurred that we anticipated (like a suspended key) and want the user to act on.
+ // Send to moderation.
+ self::$last_comment_result = '0';
+ }
+ else if ( 'true' == $response[1] ) {
// akismet_spam_count will be incremented later by comment_is_spam()
self::$last_comment_result = 'spam';
@@ -363,10 +370,155 @@ class Akismet {
if ( self::is_test_mode() )
$c['is_test'] = 'true';
- $response = self::http_post( http_build_query( $c ), 'comment-check' );
+ $response = self::http_post( build_query( $c ), 'comment-check' );
return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
}
+
+
+
+ public static function transition_comment_status( $new_status, $old_status, $comment ) {
+
+ if ( $new_status == $old_status )
+ return;
+
+ # we don't need to record a history item for deleted comments
+ if ( $new_status == 'delete' )
+ return;
+
+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+ return;
+
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+ return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
+
+ global $current_user;
+ $reporter = '';
+ if ( is_object( $current_user ) )
+ $reporter = $current_user->user_login;
+
+ // Assumption alert:
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+ // We'll assume that this is an explicit user action if certain POST/GET variables exist.
+ if ( ( isset( $_POST['status'] ) && in_array( $_POST['status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['spam'] ) && (int) $_POST['spam'] == 1 ) ||
+ ( isset( $_POST['unspam'] ) && (int) $_POST['unspam'] == 1 ) ||
+ ( isset( $_POST['comment_status'] ) && in_array( $_POST['comment_status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['action'] ) && in_array( $_POST['action'], array( 'editedcomment' ) ) )
+ ) {
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+ return self::submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ return self::submit_nonspam_comment( $comment->comment_ID );
+ }
+ }
+
+ self::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ }
+
+ public static function submit_spam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+
+ if ( !$comment ) // it was deleted
+ return;
+
+ if ( 'spam' != $comment->comment_approved )
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
+
+ if ( self::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = Akismet::http_post( build_query( $comment ), 'submit-spam' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
+ }
+
+ public static function submit_nonspam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+ if ( !$comment ) // it was deleted
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink( $comment->comment_post_ID );
+ $comment->user_role = '';
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles($comment->user_ID);
+
+ if ( Akismet::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = self::http_post( build_query( $comment ), 'submit-ham' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
+ }
public static function cron_recheck() {
global $wpdb;
@@ -670,7 +822,14 @@ class Akismet {
}
public static function load_form_js() {
- wp_enqueue_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array( 'jquery' ), AKISMET_VERSION );
+ // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
+ // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
+ wp_register_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array(), AKISMET_VERSION, true );
+ add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
+ add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
+ }
+
+ public static function print_form_js() {
wp_print_scripts( 'akismet-form' );
}
diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt
index 4360476..c9dce67 100644
--- a/wp-content/plugins/akismet/readme.txt
+++ b/wp-content/plugins/akismet/readme.txt
@@ -1,27 +1,26 @@
=== Akismet ===
Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic
Tags: akismet, comments, spam
-Requires at least: 3.0
-Tested up to: 3.9
-Stable tag: 3.0.0
+Requires at least: 3.1
+Tested up to: 3.9.1
+Stable tag: 3.0.1
License: GPLv2 or later
-Akismet checks your comments against the Akismet web service to see if they look like spam or not.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
== Description ==
-Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
-review the spam it catches under your blog's "Comments" admin screen.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not and lets you review the spam it catches under your blog's "Comments" admin screen.
-Major new features in Akismet 2.5 include:
+Major features in Akismet include:
-* A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
-* Links are highlighted in the comment body, to reveal hidden or misleading links
-* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
-* Moderators can see the number of approved comments for each user
-* Spam and Unspam reports now include more information, to help improve accuracy
+* Automatically checks all comments and filters out the ones that look like spam.
+* Each comment has a status history, so you can easily see which comments were caught or cleared by Akismet and which were spammed or unspammed by a moderator.
+* URLs are shown in the comment body to reveal hidden or misleading links.
+* Moderators can see the number of approved comments for each user.
+* A discard feature that outright blocks the worst spam, saving you disk space and speeding up your site.
-PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
+PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites.
== Installation ==
@@ -31,6 +30,13 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
+= 3.0.1 =
+* Removed dependency on PHP's fsockopen function
+* Fix spam/ham reports to work when reported outside of the WP dashboard, e.g., from Notifications or the WP app
+* Remove jQuery dependency for comment form JavaScript
+* Remove unnecessary data from some Akismet comment meta
+* Suspended keys will now result in all comments being put in moderation, not spam.
+
= 3.0.0 =
* Move Akismet to Settings menu
* Drop Akismet Stats menu
@@ -38,7 +44,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Add Akismet subscription details and status to Akismet settings
* Add contextual help for each page
* Improve Akismet setup to use Jetpack to automate plugin setup
-* Fix Update Check for Spam to use ajax to avoid page timing out
+* Fix "Check for Spam" to use AJAX to avoid page timing out
* Fix Akismet settings page to be responsive
* Drop legacy code
* Tidy up CSS and Javascript
diff --git a/wp-content/plugins/akismet/views/notice.php b/wp-content/plugins/akismet/views/notice.php
index f613c37..0476929 100644
--- a/wp-content/plugins/akismet/views/notice.php
+++ b/wp-content/plugins/akismet/views/notice.php
@@ -34,7 +34,7 @@
-
fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet’s system requirements.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?>
+
gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet’s system requirements.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?>
markdown - Markdown that has been entered in the relevant field. PHP Markdown must be installed for this to work. Can be true or false', GCE_TEXT_DOMAIN ); ?>
+
limit -
+
format - PHP date format string', GCE_TEXT_DOMAIN ); ?>
+
newwindow - true or false', GCE_TEXT_DOMAIN ); ?>
+
precision -
+
offset -
+
autolink - true or false', GCE_TEXT_DOMAIN ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/admin/delete.php b/wp-content/plugins/google-calendar-events/admin/delete.php
new file mode 100644
index 0000000..1e43e73
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/admin/delete.php
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/admin/edit.php b/wp-content/plugins/google-calendar-events/admin/edit.php
new file mode 100644
index 0000000..c90a542
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/admin/edit.php
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+
+
+
+
+ http://www.google.com/calendar/feeds/your-email@gmail.com/public/full.', GCE_TEXT_DOMAIN); ?>
+
+ http://www.google.com/calendar/feeds/your-email@gmail.com/private-d65741b037h695ff274247f90746b2ty/basic.', GCE_TEXT_DOMAIN); ?>
+
+
+
+ UNIX timestamp in the text-box.', GCE_TEXT_DOMAIN); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PHP date format. Leave this blank if you\'d rather stick with the default format for your blog.', GCE_TEXT_DOMAIN); ?>
+
+
+
+ PHP date format. Again, leave this blank to stick with the default.', GCE_TEXT_DOMAIN); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ />
+
markdown - Markdown that has been entered in the relevant field. PHP Markdown must be installed for this to work. Can be true or false', GCE_TEXT_DOMAIN ); ?>
+
limit -
+
format - PHP date format string', GCE_TEXT_DOMAIN ); ?>
+
newwindow - true or false', GCE_TEXT_DOMAIN ); ?>
+
precision -
+
offset -
+
autolink - true or false', GCE_TEXT_DOMAIN ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ value="on" />
+
+
+
+
+
+
+ value="on" />
+
+
+
+
+
+
+
+
+
+
+ value="on" />
+
+
+ value="on" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/admin/main.php b/wp-content/plugins/google-calendar-events/admin/main.php
new file mode 100644
index 0000000..4c2bcf0
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/admin/main.php
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $event){ ?>
+
+
+
+
+
+ | |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ google-calendar-events directory) and then enter its URL below.', GCE_TEXT_DOMAIN); ?>
+
+
+
+
+
+
+
+
+ value="on" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ value="on" />
+
+
+
+
+
+
+ value="on" />
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/admin/refresh.php b/wp-content/plugins/google-calendar-events/admin/refresh.php
new file mode 100644
index 0000000..b74c32a
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/admin/refresh.php
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/admin/timezone-choices.php b/wp-content/plugins/google-calendar-events/admin/timezone-choices.php
new file mode 100644
index 0000000..cc3d613
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/admin/timezone-choices.php
@@ -0,0 +1,429 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+}
+?>
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/css/gce-old-style.css b/wp-content/plugins/google-calendar-events/css/gce-old-style.css
new file mode 100644
index 0000000..75e343d
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/css/gce-old-style.css
@@ -0,0 +1,28 @@
+.gce-page-grid .gce-calendar th{
+ padding:0 !important;
+}
+
+.gce-page-grid .gce-calendar th abbr,
+.gce-widget-grid .gce-calendar th abbr{
+ border-bottom:none !important;
+}
+
+.gce-page-list .gce-list p{
+ margin:0 !important;
+}
+
+.gce-page-list .gce-list ul,
+.gce-widget-list .gce-list ul{
+ margin:0 !important;
+ padding:0 !important;
+}
+
+.gce-event-info .gce-tooltip-title{
+ margin:5px !important;
+}
+
+.gce-event-info ul{
+ padding:0 !important;
+ margin:5px !important;
+ list-style-type:none !important;
+}
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/css/gce-style.css b/wp-content/plugins/google-calendar-events/css/gce-style.css
new file mode 100644
index 0000000..fd36360
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/css/gce-style.css
@@ -0,0 +1,203 @@
+/* PAGE GRID */
+
+.gce-page-grid .gce-calendar .gce-caption{ /* Caption at top of calendar */
+ color:#333333;
+ text-align:center;
+}
+
+.gce-page-grid .gce-calendar{ /* Main calendar table */
+ width:100%;
+ border-collapse:collapse;
+ border:1px solid #CCCCCC;
+ color:#CCCCCC;
+}
+
+.gce-page-grid .gce-calendar th{ /* Day headings (S, M etc.) */
+ border:1px solid #CCCCCC;
+ text-align:center;
+ width:14.29%;
+ padding:0;
+}
+
+.gce-page-grid .gce-calendar td{ /* Day table cells */
+ border:1px solid #CCCCCC;
+ text-align:center;
+ height:80px;
+ vertical-align:middle;
+ padding:0;
+}
+
+.gce-page-grid .gce-calendar .gce-has-events{ /* Table cells with events */
+ color:#333333;
+ cursor:pointer;
+}
+
+.gce-page-grid .gce-calendar .gce-event-info{ /* Event information */
+ display:none; /* Important! */
+}
+
+.gce-page-grid .gce-calendar .gce-day-number{ /* Day number span */
+ font-size:2em;
+}
+
+.gce-page-grid .gce-calendar .gce-today{ /* Table cell that represents today */
+ background-color:#DDDDDD;
+}
+
+.gce-page-grid .gce-calendar .gce-next,
+.gce-page-grid .gce-calendar .gce-prev{ /* Previous and next month links */
+ cursor:pointer;
+ display:inline-block;
+ width:3%;
+}
+
+.gce-page-grid .gce-calendar .gce-month-title{ /* Month title */
+ display:inline-block;
+ width:90%;
+}
+
+.gce-page-grid .gce-calendar th abbr{ /* Day letter abbreviation */
+ border-bottom:none;
+}
+
+/* PAGE LIST */
+
+.gce-page-list .gce-list p{ /* Each piece of information in the list */
+ margin:0;
+}
+
+.gce-page-list .gce-list p span,
+.gce-page-list .gce-list div span{ /* The text displayed before each piece of info, 'Starts:' for example */
+ color:#999999;
+}
+
+.gce-page-list .gce-list .gce-list-event{ /* The event title */
+ background-color:#DDDDDD;
+}
+
+.gce-page-list .gce-list .gce-list-title{ /* The title (not the same as event title) */
+ font-weight:bold;
+}
+
+.gce-page-list .gce-list ul{
+ list-style-type:none;
+ margin:0;
+ padding:0;
+}
+
+/* WIDGET GRID */
+
+.gce-widget-grid .gce-calendar .gce-caption{
+ text-align:center;
+}
+
+.gce-widget-grid .gce-calendar{ /* Main calendar table */
+ width:100%;
+ border:1px solid #CCCCCC;
+ border-collapse:collapse;
+}
+
+.gce-widget-grid .gce-calendar th{ /* Day headings (S, M etc.) */
+ width:14.29%;
+ border:1px solid #CCCCCC;
+ text-align:center;
+}
+
+.gce-widget-grid .gce-calendar td{ /* Day table cells */
+ color:#CCCCCC;
+ width:14.29%;
+ border:1px solid #CCCCCC;
+ text-align:center;
+}
+
+.gce-widget-grid .gce-calendar .gce-has-events{ /* Table cells with events */
+ cursor:pointer;
+ color:#666666;
+}
+
+.gce-widget-grid .gce-calendar .gce-today{ /* Table cell that represents today */
+ background-color:#DDDDDD;
+}
+
+.gce-widget-grid .gce-calendar .gce-event-info{ /* Event information */
+ display:none; /* Important! */
+}
+
+.gce-widget-grid .gce-calendar .gce-next,
+.gce-widget-grid .gce-calendar .gce-prev{ /* Prev and next month links */
+ cursor:pointer;
+ display:inline-block;
+ width:5%;
+}
+
+.gce-widget-grid .gce-calendar .gce-month-title{ /* Month title in caption at top of table */
+ display:inline-block;
+ width:80%;
+}
+
+.gce-widget-grid .gce-calendar th abbr{ /* Day name abbreviations */
+ border-bottom:none;
+}
+
+/* WIDGET LIST */
+
+.gce-widget-list .gce-list p{ /* Each piece of information in the list */
+ margin:0;
+}
+
+.gce-widget-list .gce-list p span,
+.gce-widget-list .gce-list div span{ /* The text displayed before each piece of info, 'Starts:' for example */
+ color:#999999;
+}
+
+.gce-widget-list .gce-list .gce-list-event{ /* The event title */
+ background-color:#DDDDDD;
+}
+
+.gce-widget-list .gce-list .gce-list-title{ /* The title (not the same as event title) */
+ font-weight:bold;
+}
+
+.gce-widget-list .gce-list ul{
+ list-style-type:none;
+ margin:0;
+ padding:0;
+}
+
+/* TOOLTIP */
+
+.gce-event-info{ /* Tooltip container */
+ background-color:#FFFFFF;
+ border:1px solid #333333;
+ max-width:300px;
+}
+
+.gce-event-info .gce-tooltip-title{ /* 'Events on...' text */
+ margin:5px;
+ font-weight:bold;
+ font-size:1.2em;
+}
+
+.gce-event-info ul{ /* Events list */
+ padding:0;
+ margin:5px;
+ list-style-type:none;
+}
+
+.gce-event-info ul li{ /* Event list item */
+ margin:10px 0 0 0;
+}
+
+.gce-event-info ul li p{ /* Each piece of information */
+ margin:0;
+}
+
+.gce-event-info ul li p span,
+.gce-event-info ul li div span{ /* The text displayed before each piece of info, 'Starts:' for example */
+ color:#999999;
+}
+
+.gce-event-info .gce-tooltip-event{ /* The event title */
+ background-color:#DDDDDD;
+ font-weight:bold;
+}
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/google-calendar-events.php b/wp-content/plugins/google-calendar-events/google-calendar-events.php
new file mode 100644
index 0000000..103b2ef
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/google-calendar-events.php
@@ -0,0 +1,697 @@
+have this requirement. You should get in touch with your web hosting provider and ask them to update PHP.
Back to Plugins' );
+ }
+ }
+ }
+
+ //If any new options have been added between versions, this will update any saved feeds with defaults for new options (shouldn't overwrite anything saved)
+ function update_settings() {
+ //If there are some plugin options in the database, but no version info, then this must be an upgrade from version 0.5 or below, so add flag that will provide user with option to clear old transients
+ if ( get_option( GCE_OPTIONS_NAME ) && ! get_option( 'gce_version' ) )
+ add_option( 'gce_clear_old_transients', true );
+
+ add_option( 'gce_version', GCE_VERSION );
+
+ add_option( GCE_OPTIONS_NAME );
+ add_option( GCE_GENERAL_OPTIONS_NAME );
+
+ //Get feed options
+ $options = get_option( GCE_OPTIONS_NAME );
+
+ if ( ! empty( $options ) ) {
+ foreach ( $options as $key => $saved_feed_options ) {
+ $defaults = array(
+ 'id' => 1,
+ 'title' => '',
+ 'url' => '',
+ 'retrieve_from' => 'today',
+ 'retrieve_from_value' => 0,
+ 'retrieve_until' => 'any',
+ 'retrieve_until_value' => 0,
+ 'max_events' => 25,
+ 'date_format' => '',
+ 'time_format' => '',
+ 'timezone' => 'default',
+ 'cache_duration' => 43200,
+ 'multiple_day' => 'false',
+ 'display_start' => 'time',
+ 'display_end' => 'time-date',
+ 'display_location' => '',
+ 'display_desc' => '',
+ 'display_link' => 'on',
+ 'display_start_text' => 'Starts:',
+ 'display_end_text' => 'Ends:',
+ 'display_location_text' => 'Location:',
+ 'display_desc_text' => 'Description:',
+ 'display_desc_limit' => '',
+ 'display_link_text' => 'More details',
+ 'display_link_target' => '',
+ 'display_separator' => ', ',
+ 'use_builder' => 'false',
+ 'builder' => ''
+ );
+
+ //If necessary, copy saved behaviour of old show_past_events and day_limit options into the new from / until options
+ if ( isset( $saved_feed_options['show_past_events'] ) ) {
+ if ( 'true' == $saved_feed_options['show_past_events'] ) {
+ $saved_feed_options['retrieve_from'] = 'month-start';
+ } else {
+ $saved_feed_options['retrieve_from'] = 'today';
+ }
+ }
+
+ if ( isset( $saved_feed_options['day_limit'] ) && '' != $saved_feed_options['day_limit'] ) {
+ $saved_feed_options['retrieve_until'] = 'today';
+ $saved_feed_options['retrieve_until_value'] = (int) $saved_feed_options['day_limit'] * 86400;
+ }
+
+ //Update old display_start / display_end values
+ if ( ! isset( $saved_feed_options['display_start'] ) )
+ $saved_feed_options['display_start'] = 'none';
+ elseif ( 'on' == $saved_feed_options['display_start'] )
+ $saved_feed_options['display_start'] = 'time';
+
+ if( ! isset( $saved_feed_options['display_end'] ) )
+ $saved_feed_options['display_end'] = 'none';
+ elseif ( 'on' == $saved_feed_options['display_end'] )
+ $saved_feed_options['display_end'] = 'time-date';
+
+ //Merge saved options with defaults
+ foreach ( $saved_feed_options as $option_name => $option ) {
+ $defaults[$option_name] = $saved_feed_options[$option_name];
+ }
+
+ $options[$key] = $defaults;
+ }
+ }
+
+ //Save feed options
+ update_option( GCE_OPTIONS_NAME, $options );
+
+ //Get general options
+ $options = get_option( GCE_GENERAL_OPTIONS_NAME );
+
+ $defaults = array(
+ 'stylesheet' => '',
+ 'javascript' => false,
+ 'loading' => 'Loading...',
+ 'error' => 'Events cannot currently be displayed, sorry! Please check back later.',
+ 'fields' => true,
+ 'old_stylesheet' => false
+ );
+
+ $old_stylesheet_option = get_option( 'gce_stylesheet' );
+
+ //If old custom stylesheet option was set, add it to general options, then delete old option
+ if( false !== $old_stylesheet_option ) {
+ $defaults['stylesheet'] = $old_stylesheet_option;
+ delete_option( 'gce_stylesheet' );
+ } elseif ( isset($options['stylesheet'] ) ) {
+ $defaults['stylesheet'] = $options['stylesheet'];
+ }
+
+ if ( isset($options['javascript'] ) )
+ $defaults['javascript'] = $options['javascript'];
+
+ if ( isset( $options['loading'] ) )
+ $defaults['loading'] = $options['loading'];
+
+ if ( isset($options['error'] ) )
+ $defaults['error'] = $options['error'];
+
+ if ( isset($options['fields'] ) )
+ $defaults['fields'] = $options['fields'];
+
+ if( isset( $options['old_stylesheet'] ) )
+ $defaults['old_stylesheet'] = $options['old_stylesheet'];
+
+ //Save general options
+ update_option( GCE_GENERAL_OPTIONS_NAME, $defaults );
+ }
+
+ function init_plugin() {
+ //Load text domain for i18n
+ load_plugin_textdomain( GCE_TEXT_DOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+ }
+
+ //Adds 'Settings' link to main WordPress Plugins page
+ function add_settings_link( $links ) {
+ array_unshift( $links, '' . __( 'Settings', GCE_TEXT_DOMAIN ) . '' );
+ return $links;
+ }
+
+ //Setup admin settings page
+ function setup_admin(){
+ global $gce_settings_page;
+
+ $gce_settings_page = add_options_page( 'Google Calendar Events', 'Google Calendar Events', 'manage_options', basename( __FILE__ ), array( $this, 'admin_page' ) );
+
+ add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
+ }
+
+ //Add admin JavaScript (to GCE settings page only)
+ function enqueue_admin_scripts( $hook_suffix ) {
+ global $gce_settings_page;
+
+ if ( $gce_settings_page == $hook_suffix )
+ wp_enqueue_script( 'gce_scripts', WP_PLUGIN_URL . '/' . GCE_PLUGIN_NAME . '/js/gce-admin-script.js', array( 'jquery' ) );
+ }
+
+ //Prints admin settings page
+ function admin_page() {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update_settings();
+
+ //If the message about old transients was displayed, check authority and intention, and then either clear transients or clear flag
+ if ( isset( $_GET['gce_action'] ) && current_user_can( 'manage_options' ) ) {
+ switch ( $_GET['gce_action'] ) {
+ case 'clear_old_transients':
+ check_admin_referer( 'gce_action_clear_old_transients' );
+ $this->clear_old_transients();
+ add_settings_error( 'gce_options', 'gce_cleared_old_transients', __( 'Old cached data cleared.', GCE_TEXT_DOMAIN ), 'updated' );
+ break;
+ case 'ignore_old_transients':
+ check_admin_referer( 'gce_action_ignore_old_transients' );
+ delete_option( 'gce_clear_old_transients' );
+ }
+ }
+
+ register_setting( 'gce_options', 'gce_options', array( $this, 'validate_feed_options' ) );
+ register_setting( 'gce_general', 'gce_general', array( $this, 'validate_general_options' ) );
+
+ require_once 'admin/add.php';
+ require_once 'admin/edit.php';
+ require_once 'admin/delete.php';
+ require_once 'admin/refresh.php';
+ }
+
+ //Clears any expired transients from the database
+ function clear_old_transients() {
+ global $wpdb;
+
+ //Retrieve names of all transients
+ $transients = $wpdb->get_results( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%transient%' AND option_name NOT LIKE '%transient_timeout%'" );
+
+ if ( ! empty( $transients ) ) {
+ foreach ( $transients as $transient ) {
+ //Attempt to retrieve the transient. If it has expired, it will be deleted
+ get_transient( str_replace( '_transient_', '', $transient->option_name ) );
+ }
+ }
+
+ //Remove the flag
+ delete_option( 'gce_clear_old_transients' );
+ }
+
+ //Register the widget
+ function add_widget() {
+ require_once 'widget/gce-widget.php';
+ return register_widget( 'GCE_Widget' );
+ }
+
+ //Check / validate submitted feed options data before being stored
+ function validate_feed_options( $input ) {
+ //Get saved options
+ $options = get_option( GCE_OPTIONS_NAME );
+
+ if ( isset( $input['submit_delete'] ) ) {
+ //If delete button was clicked, delete feed from options array and remove associated transients
+ unset( $options[$input['id']] );
+ $this->delete_feed_transients( (int) $input['id'] );
+ add_settings_error( 'gce_options', 'gce_deleted', __( sprintf('Feed %s deleted.', absint( $input['id'] ) ), GCE_TEXT_DOMAIN ), 'updated' );
+ } elseif ( isset($input['submit_refresh'] ) ) {
+ //If refresh button was clicked, delete transients associated with feed
+ $this->delete_feed_transients( (int) $input['id'] );
+ add_settings_error( 'gce_options', 'gce_refreshed', __( sprintf('Cached data for feed %s cleared.', absint( $input['id'] ) ), GCE_TEXT_DOMAIN ), 'updated' );
+ } else {
+ //Otherwise, validate options and add / update them
+
+ //Check id is positive integer
+ $id = absint( $input['id'] );
+ //Escape title text
+ $title = esc_html( $input['title'] );
+ //Escape feed url
+ $url = esc_url( $input['url'] );
+
+ //Array of valid options for retrieve_from and retrieve_until settings
+ $valid_retrieve_options = array( 'now', 'today', 'week', 'month-start', 'month-end', 'any', 'date' );
+
+ $retrieve_from = 'today';
+ $retrieve_from_value = 0;
+
+ //Ensure retrieve_from is valid
+ if( in_array( $input['retrieve_from'], $valid_retrieve_options ) ) {
+ $retrieve_from = $input['retrieve_from'];
+ $retrieve_from_value = (int) $input['retrieve_from_value'];
+ }
+
+ $retrieve_until = 'any';
+ $retrieve_until_value = 0;
+
+ //Ensure retrieve_until is valid
+ if ( in_array( $input['retrieve_until'], $valid_retrieve_options ) ) {
+ $retrieve_until = $input['retrieve_until'];
+ $retrieve_until_value = (int) $input['retrieve_until_value'];
+ }
+
+ //Check max events is a positive integer. If absint returns 0, reset to default (25)
+ $max_events = ( 0 == absint($input['max_events'] ) ) ? 25 : absint( $input['max_events'] );
+
+ $date_format = wp_filter_kses( $input['date_format'] );
+ $time_format = wp_filter_kses( $input['time_format'] );
+
+ //Escape timezone
+ $timezone = esc_html( $input['timezone'] );
+
+ //Make sure cache duration is a positive integer or 0. If user has typed 0, leave as 0 but if 0 is returned from absint, set to default (43200)
+ $cache_duration = $input['cache_duration'];
+ if ( '0' != $cache_duration )
+ $cache_duration = ( 0 == absint( $cache_duration ) ) ? 43200 : absint( $cache_duration );
+
+ $multiple_day = ( isset( $input['multiple_day'] ) ) ? 'true' : 'false';
+
+ $display_start = esc_html( $input['display_start'] );
+ $display_end = esc_html( $input['display_end'] );
+
+ //Display options must be 'on' or null
+ $display_location = ( isset( $input['display_location'] ) ) ? 'on' : null;
+ $display_desc = ( isset( $input['display_desc'] ) ) ? 'on' : null;
+ $display_link = ( isset( $input['display_link'] ) ) ? 'on' : null;
+ $display_link_target = ( isset( $input['display_link_target'] ) ) ? 'on' : null;
+
+ //Filter display text
+ $display_start_text = wp_filter_kses( $input['display_start_text'] );
+ $display_end_text = wp_filter_kses( $input['display_end_text'] );
+ $display_location_text = wp_filter_kses( $input['display_location_text'] );
+ $display_desc_text = wp_filter_kses( $input['display_desc_text'] );
+ $display_link_text = wp_filter_kses( $input['display_link_text'] );
+
+ $display_separator = wp_filter_kses( $input['display_separator'] );
+
+ $display_desc_limit = ( 0 == absint( $input['display_desc_limit'] ) ) ? '' : absint( $input['display_desc_limit'] );
+
+ $use_builder = ( 'false' == $input['use_builder'] ) ? 'false' : 'true';
+ $builder = wp_kses_post( $input['builder'] );
+
+ //Fill options array with validated values
+ $options[$id] = array(
+ 'id' => $id,
+ 'title' => $title,
+ 'url' => $url,
+ 'retrieve_from' => $retrieve_from,
+ 'retrieve_until' => $retrieve_until,
+ 'retrieve_from_value' => $retrieve_from_value,
+ 'retrieve_until_value' => $retrieve_until_value,
+ 'max_events' => $max_events,
+ 'date_format' => $date_format,
+ 'time_format' => $time_format,
+ 'timezone' => $timezone,
+ 'cache_duration' => $cache_duration,
+ 'multiple_day' => $multiple_day,
+ 'display_start' => $display_start,
+ 'display_end' => $display_end,
+ 'display_location' => $display_location,
+ 'display_desc' => $display_desc,
+ 'display_link' => $display_link,
+ 'display_start_text' => $display_start_text,
+ 'display_end_text' => $display_end_text,
+ 'display_location_text' => $display_location_text,
+ 'display_desc_text' => $display_desc_text,
+ 'display_desc_limit' => $display_desc_limit,
+ 'display_link_text' => $display_link_text,
+ 'display_link_target' => $display_link_target,
+ 'display_separator' => $display_separator,
+ 'use_builder' => $use_builder,
+ 'builder' => $builder
+ );
+
+ if ( isset( $input['submit_add'] ) )
+ add_settings_error( 'gce_options', 'gce_added', __( sprintf( 'Feed %s added.', absint( $input['id'] ) ), GCE_TEXT_DOMAIN ), 'updated' );
+ else
+ add_settings_error( 'gce_options', 'gce_edited', __( sprintf( 'Settings for feed %s updated.', absint( $input['id'] ) ), GCE_TEXT_DOMAIN ), 'updated' );
+ }
+
+ return $options;
+ }
+
+ //Validate submitted general options
+ function validate_general_options( $input ) {
+ $options = get_option(GCE_GENERAL_OPTIONS_NAME);
+
+ $options['stylesheet'] = esc_url( $input['stylesheet'] );
+ $options['javascript'] = ( isset( $input['javascript'] ) ) ? true : false;
+ $options['loading'] = esc_html( $input['loading'] );
+ $options['error'] = wp_filter_kses( $input['error'] );
+ $options['fields'] = ( isset( $input['fields'] ) ) ? true : false;
+ $options['old_stylesheet'] = ( isset( $input['old_stylesheet'] ) ) ? true : false;
+
+ add_settings_error( 'gce_general', 'gce_general_updated', __( 'General options updated.', GCE_TEXT_DOMAIN ), 'updated' );
+
+ return $options;
+ }
+
+ //Delete all transients (cached feed data) associated with feed specified
+ function delete_feed_transients( $id ) {
+ delete_transient( 'gce_feed_' . $id );
+ delete_transient( 'gce_feed_' . $id . '_url' );
+ }
+
+ //Handles the shortcode stuff
+ function shortcode_handler( $atts ) {
+ $options = get_option( GCE_OPTIONS_NAME );
+
+ //Check that any feeds have been added
+ if ( is_array( $options ) && ! empty( $options ) ) {
+ extract( shortcode_atts( array(
+ 'id' => '',
+ 'type' => 'grid',
+ 'title' => null,
+ 'max' => 0,
+ 'order' => 'asc'
+ ), $atts ) );
+
+ $no_feeds_exist = true;
+ $feed_ids = array();
+
+ if ( '' != $id ) {
+ //Break comma delimited list of feed ids into array
+ $feed_ids = explode( ',', str_replace( ' ', '', $id ) );
+
+ //Check each id is an integer, if not, remove it from the array
+ foreach ( $feed_ids as $key => $feed_id ) {
+ if ( 0 == absint( $feed_id ) )
+ unset( $feed_ids[$key] );
+ }
+
+ //If at least one of the feed ids entered exists, set no_feeds_exist to false
+ foreach ( $feed_ids as $feed_id ) {
+ if ( isset($options[$feed_id] ) )
+ $no_feeds_exist = false;
+ }
+ } else {
+ foreach ( $options as $feed ) {
+ $feed_ids[] = $feed['id'];
+ }
+
+ $no_feeds_exist = false;
+ }
+
+ //Ensure max events is a positive integer
+ $max_events = absint( $max );
+
+ //Ensure sort order is asc or desc
+ $sort_order = ( 'desc' == $order ) ? 'desc' : 'asc';
+
+ //Check that at least one valid feed id has been entered
+ if ( empty( $feed_ids ) || $no_feeds_exist ) {
+ return __( 'No valid Feed IDs have been entered for this shortcode. Please check that you have entered the IDs correctly and that the Feeds have not been deleted.', GCE_TEXT_DOMAIN );
+ } else {
+ //Turns feed_ids back into string of feed ids delimited by '-' ('1-2-3-4' for example)
+ $feed_ids = implode( '-', $feed_ids );
+
+ //If title has been omitted from shortcode, set title_text to null, otherwise set to title (even if empty string)
+ $title_text = ( false === $title ) ? null : $title;
+
+ switch ( $type ) {
+ case 'grid':
+ return gce_print_grid( $feed_ids, $title_text, $max_events );
+ case 'ajax':
+ return gce_print_grid( $feed_ids, $title_text, $max_events, true );
+ case 'list':
+ return gce_print_list( $feed_ids, $title_text, $max_events, $sort_order );
+ case 'list-grouped':
+ return gce_print_list( $feed_ids, $title_text, $max_events, $sort_order, true );
+ }
+ }
+ } else {
+ return __( 'No feeds have been added yet. You can add a feed in the Google Calendar Events settings.', GCE_TEXT_DOMAIN );
+ }
+ }
+
+ //Adds the required CSS
+ function add_styles() {
+ wp_enqueue_style( 'gce_styles', WP_PLUGIN_URL . '/' . GCE_PLUGIN_NAME . '/css/gce-style.css' );
+
+ $options = get_option( GCE_GENERAL_OPTIONS_NAME );
+
+ //If old stylesheet option is enabled, enqueue old styles
+ if ( $options['old_stylesheet'] )
+ wp_enqueue_style( 'gce_old_styles', WP_PLUGIN_URL . '/' . GCE_PLUGIN_NAME . '/css/gce-old-style.css' );
+
+ //If user has entered a URL to a custom stylesheet, enqueue it too
+ if( '' != $options['stylesheet'] )
+ wp_enqueue_style( 'gce_custom_styles', $options['stylesheet'] );
+ }
+
+ //Adds the required scripts
+ function add_scripts() {
+ $options = get_option( GCE_GENERAL_OPTIONS_NAME );
+ $add_to_footer = (bool) $options['javascript'];
+
+ wp_enqueue_script( 'jquery' );
+ wp_enqueue_script( 'gce_jquery_qtip', WP_PLUGIN_URL . '/' . GCE_PLUGIN_NAME . '/js/jquery-qtip.js', array( 'jquery' ), null, $add_to_footer );
+ wp_enqueue_script( 'gce_scripts', WP_PLUGIN_URL . '/' . GCE_PLUGIN_NAME . '/js/gce-script.js', array( 'jquery' ), null, $add_to_footer );
+ wp_localize_script( 'gce_scripts', 'GoogleCalendarEvents', array(
+ 'ajaxurl' => admin_url( 'admin-ajax.php', is_ssl() ? 'https' : 'http' ),
+ 'loading' => $options['loading']
+ ) );
+ }
+
+ //AJAX stuffs
+ function gce_ajax() {
+ if ( isset( $_GET['gce_feed_ids'] ) ) {
+ $ids = $_GET['gce_feed_ids'];
+ $title = $_GET['gce_title_text'];
+ $max = $_GET['gce_max_events'];
+ $month = $_GET['gce_month'];
+ $year = $_GET['gce_year'];
+
+ $title = ( 'null' == $title ) ? null : $title;
+
+ if ( 'page' == $_GET['gce_type'] ) {
+ //The page grid markup to be returned via AJAX
+ echo gce_print_grid( $ids, $title, $max, true, $month, $year );
+ } elseif ( 'widget' == $_GET['gce_type'] ) {
+ $widget = esc_html( $_GET['gce_widget_id'] );
+
+ //The widget grid markup to be returned via AJAX
+ gce_widget_content_grid( $ids, $title, $max, $widget, true, $month, $year );
+ }
+ }
+ die();
+ }
+ }
+}
+
+function gce_print_list( $feed_ids, $title_text, $max_events, $sort_order, $grouped = false ) {
+ require_once 'inc/gce-parser.php';
+
+ $ids = explode( '-', $feed_ids );
+
+ //Create new GCE_Parser object, passing array of feed id(s)
+ $list = new GCE_Parser( $ids, $title_text, $max_events, $sort_order );
+
+ $num_errors = $list->get_num_errors();
+
+ //If there are less errors than feeds parsed, at least one feed must have parsed successfully so continue to display the list
+ if ( $num_errors < count( $ids ) ) {
+ $markup = '
' . $list->get_list( $grouped ) . '
';
+
+ //If there was at least one error, return the list markup with error messages (for admins only)
+ if ( $num_errors > 0 && current_user_can( 'manage_options' ) )
+ return $list->error_messages() . $markup;
+
+ //Otherwise just return the list markup
+ return $markup;
+ } else {
+ //If current user is an admin, display an error message explaining problem(s). Otherwise, display a 'nice' error messsage
+ if ( current_user_can( 'manage_options' ) ) {
+ return $list->error_messages();
+ } else {
+ $options = get_option( GCE_GENERAL_OPTIONS_NAME );
+ return wp_kses_post( $options['error'] );
+ }
+ }
+}
+
+function gce_print_grid( $feed_ids, $title_text, $max_events, $ajaxified = false, $month = null, $year = null ) {
+ require_once 'inc/gce-parser.php';
+
+ $ids = explode( '-', $feed_ids );
+
+ //Create new GCE_Parser object, passing array of feed id(s) returned from gce_get_feed_ids()
+ $grid = new GCE_Parser( $ids, $title_text, $max_events );
+
+ $num_errors = $grid->get_num_errors();
+
+ //If there are less errors than feeds parsed, at least one feed must have parsed successfully so continue to display the grid
+ if ( $num_errors < count( $ids ) ) {
+ $feed_ids = esc_attr( $feed_ids );
+ $title_text = isset( $title_text ) ? esc_html( $title_text) : 'null';
+
+ $markup = '
';
+
+ //If there was at least one error, return the grid markup with an error message (for admins only)
+ if ( $num_errors > 0 && current_user_can( 'manage_options' ) )
+ return $grid->error_messages() . $markup;
+
+ //Otherwise just return the grid markup
+ return $markup;
+ } else {
+ //If current user is an admin, display an error message explaining problem. Otherwise, display a 'nice' error messsage
+ if ( current_user_can( 'manage_options' ) ) {
+ return $grid->error_messages();
+ } else {
+ $options = get_option( GCE_GENERAL_OPTIONS_NAME );
+ return wp_kses_post( $options['error'] );
+ }
+ }
+}
+
+$gce = new Google_Calendar_Events();
+?>
\ No newline at end of file
diff --git a/wp-content/plugins/google-calendar-events/inc/gce-event.php b/wp-content/plugins/google-calendar-events/inc/gce-event.php
new file mode 100644
index 0000000..e0765b5
--- /dev/null
+++ b/wp-content/plugins/google-calendar-events/inc/gce-event.php
@@ -0,0 +1,527 @@
+id = $id;
+ $this->title = $title;
+ $this->description = $description;
+ $this->location = $location;
+ $this->start_time = $start_time;
+ $this->end_time = $end_time;
+ $this->link = $link;
+
+ //Calculate which day type this event is (SWD = single whole day, SPD = single part day, MWD = multiple whole day, MPD = multiple part day)
+ if ( ( $start_time + 86400 ) <= $end_time ) {
+ if ( ( $start_time + 86400 ) == $end_time ) {
+ $this->day_type = 'SWD';
+ } else {
+ if ( ( '12:00 am' == date( 'g:i a', $start_time ) ) && ( '12:00 am' == date( 'g:i a', $end_time ) ) ) {
+ $this->day_type = 'MWD';
+ } else {
+ $this->day_type = 'MPD';
+ }
+ }
+ } else {
+ $this->day_type = 'SPD';
+ }
+ }
+
+ function set_feed( $feed ) {
+ $this->feed = $feed;
+ }
+
+ function get_feed() {
+ return $this->feed;
+ }
+
+ function get_start_time() {
+ return $this->start_time;
+ }
+
+ function get_end_time() {
+ return $this->end_time;
+ }
+
+ function get_day_type() {
+ return $this->day_type;
+ }
+
+ //Returns an array of days (as UNIX timestamps) that this events spans
+ function get_days() {
+ //Round start date to nearest day
+ $start_time = mktime( 0, 0, 0, date( 'm', $this->start_time ), date( 'd', $this->start_time ) , date( 'Y', $this->start_time ) );
+
+ $days = array();
+
+ //If multiple day events should be handled, and this event is a multi-day event, add multiple day event to required days
+ if ( $this->feed->get_multi_day() && ( 'MPD' == $this->day_type || 'MWD' == $this->day_type ) ) {
+ $on_next_day = true;
+ $next_day = $start_time;
+
+ while ( $on_next_day ) {
+ //If the end time of the event is after 00:00 on the next day (therefore, not doesn't end on this day)
+ if ( $this->end_time > $next_day ) {
+ //If $next_day is within the event retrieval date range (specified by retrieve events from / until settings)
+ if ( $next_day >= $this->feed->get_feed_start() && $next_day < $this->feed->get_feed_end() ) {
+ $days[] = $next_day;
+ }
+ } else {
+ $on_next_day = false;
+ }
+ $next_day += 86400;
+ }
+ } else {
+ //Add event into array of events for that day
+ $days[] = $start_time;
+ }
+
+ return $days;
+ }
+
+ //Returns the markup for this event, so that it can be used in the construction of a grid / list
+ function get_event_markup( $display_type, $num_in_day, $num ) {
+ //Set the display type (either tooltip or list)
+ $this->type = $display_type;
+
+ //Set which number event this is in day (first in day etc)
+ $this->num_in_day = $num_in_day;
+
+ //Set the position of this event in array of events currently being processed
+ $this->pos = $num;
+
+ $this->time_now = current_time( 'timestamp' );
+
+ //Use the builder or the old display options to create the markup, depending on user choice
+ if ( $this->feed->get_use_builder() )
+ return $this->use_builder();
+
+ return $this->use_old_display_options();
+ }
+
+ //Return the event markup using the builder
+ function use_builder() {
+ //Array of valid shortcodes
+ $shortcodes = array(
+ //Event / feed information shortcodes
+
+ 'event-title', //The event title
+ 'start-time', //The start time of the event (uses the time format from the feed options, if it is set. Otherwise uses the default WordPress time format)
+ 'start-date', //The start date of the event (uses the date format from the feed options, if it is set. Otherwise uses the default WordPress date format)
+ 'start-custom', //The start time / date of the event (uses a custom PHP date format, specified in the 'format' attribute)
+ 'start-human', //The difference between the start time of the event and the time now, in human-readable format, such as '1 hour', '4 days', '15 mins'
+ 'end-time', //The end time of the event (uses the time format from the feed options, if it is set. Otherwise uses the default WordPress time format)
+ 'end-date', //The end date of the event (uses the date format from the feed options, if it is set. Otherwise uses the default WordPress date format)
+ 'end-custom', //The end time / date of the event (uses a custom PHP date format, specified in the 'format' attribute)
+ 'end-human', //The difference between the end time of the event and the time now, in human-readable format, such as '1 hour', '4 days', '15 mins'
+ 'location', //The event location
+ 'description', //The event deescription (number of words can be limited by the 'limit' attribute)
+ 'link', //Anything within this shortcode (including further shortcodes) will be linked to the Google Calendar page for this event
+ 'url', //The raw link URL to the Google Calendar page for this event (can be used to construct more customized links)
+ 'feed-id', //The ID of this feed (Can be useful for constructing feed specific CSS classes)
+ 'feed-title', //The feed title
+ 'maps-link', //Anything within this shortcode (including further shortcodes) will be linked to a Google Maps page based on whatever is specified for the event location
+ 'length', //How long the events lasts, in human-readable format
+ 'event-num', //The position of the event in the current list, or the position of the event in the current month (for grids)
+ 'event-id', //The event UID (unique identifier assigned by Google)
+ 'cal-id', //The calendar ID
+
+ //Anything between the opening and closing tags of the following logical shortcodes (including further shortcodes) will only be displayed if:
+
+ 'if-all-day', //This is an all-day event
+ 'if-not-all-day', //This is not an all-day event
+ 'if-title', //The event has a title
+ 'if-description', //The event has a description
+ 'if-location', //The event has a location
+ 'if-tooltip', //The current display type is 'tooltip'
+ 'if-list', //The current display type is 'list'
+ 'if-now', //The event is taking place now (after the start time, but before the end time)
+ 'if-not-now', //The event is not taking place now (may have ended or not yet started)
+ 'if-started', //The event has started (and even if it has ended)
+ 'if-not-started', //The event has not yet started
+ 'if-ended', //The event has ended
+ 'if-not-ended', //The event has not ended (and even if it hasn't started)
+ 'if-first', //The event is the first in the day
+ 'if-not-first', //The event is not the first in the day
+ 'if-multi-day', //The event spans multiple days
+ 'if-single-day' //The event does not span multiple days
+ );
+
+ $this->regex = '/(.?)\[(' . implode( '|', $shortcodes ) . ')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)/s';
+
+ return $this->look_for_shortcodes( $this->feed->get_builder() );
+ }
+
+ //Look through the EDB markup for shortcodes
+ function look_for_shortcodes( $markup ) {
+ return preg_replace_callback( $this->regex, array( $this, 'process_shortcode' ), $markup );
+ }
+
+ //Parse a shortcode, returning the appropriate event information
+ //Much of this code is 'borrowed' from WordPress' own shortcode handling stuff!
+ function process_shortcode( $m ) {
+ if ( '[' == $m[1] && ']' == $m[6] )
+ return substr( $m[0], 1, -1 );
+
+ //Extract any attributes contained in the shortcode
+ extract( shortcode_atts( array(
+ 'newwindow' => 'false',
+ 'format' => '',
+ 'limit' => '0',
+ 'html' => 'false',
+ 'markdown' => 'false',
+ 'precision' => '1',
+ 'offset' => '0',
+ 'autolink' => 'true'
+ ), shortcode_parse_atts( $m[3] ) ) );
+
+ //Sanitize the attributes
+ $newwindow = ( 'true' === $newwindow );
+ $format = esc_attr( $format );
+ $limit = absint( $limit );
+ $html = ( 'true' === $html );
+ $markdown = ( 'true' === $markdown );
+ $precision = absint( $precision );
+ $offset = intval( $offset );
+ $autolink = ( 'true' === $autolink );
+
+ //Do the appropriate stuff depending on which shortcode we're looking at. See valid shortcode list (above) for explanation of each shortcode
+ switch ( $m[2] ) {
+ case 'event-title':
+ $title = esc_html( trim( $this->title ) );
+
+ if ( $markdown && function_exists( 'Markdown' ) )
+ $title = Markdown( $title );
+
+ if ( $html )
+ $title = wp_kses_post( html_entity_decode( $title ) );
+
+ return $m[1] . $title . $m[6];
+
+ case 'start-time':
+ return $m[1] . date_i18n( $this->feed->get_time_format(), $this->start_time + $offset ) . $m[6];
+
+ case 'start-date':
+ return $m[1] . date_i18n( $this->feed->get_date_format(), $this->start_time + $offset ) . $m[6];
+
+ case 'start-custom':
+ return $m[1] . date_i18n( $format, $this->start_time + $offset ) . $m[6];
+
+ case 'start-human':
+ return $m[1] . $this->gce_human_time_diff( $this->start_time + $offset, $this->time_now, $precision ) . $m[6];
+
+ case 'end-time':
+ return $m[1] . date_i18n( $this->feed->get_time_format(), $this->end_time + $offset ) . $m[6];
+
+ case 'end-date':
+ return $m[1] . date_i18n( $this->feed->get_date_format(), $this->end_time + $offset ) . $m[6];
+
+ case 'end-custom':
+ return $m[1] . date_i18n( $format, $this->end_time + $offset ) . $m[6];
+
+ case 'end-human':
+ return $m[1] . $this->gce_human_time_diff( $this->end_time + $offset, $this->time_now, $precision ) . $m[6];
+
+ case 'location':
+ $location = esc_html( trim( $this->location ) );
+
+ if ( $markdown && function_exists( 'Markdown' ) )
+ $location = Markdown( $location );
+
+ if ( $html )
+ $location = wp_kses_post( html_entity_decode( $location ) );
+
+ return $m[1] . $location . $m[6];
+
+ case 'description':
+ $description = esc_html( trim( $this->description ) );
+
+ //If a word limit has been set, trim the description to the required length
+ if ( 0 != $limit ) {
+ preg_match( '/([\S]+\s*){0,' . $limit . '}/', esc_html( $this->description ), $description );
+ $description = trim( $description[0] );
+ }
+
+ if ( $markdown || $html ) {
+ if ( $markdown && function_exists( 'Markdown' ) )
+ $description = Markdown( $description );
+
+ if ( $html )
+ $description = wp_kses_post( html_entity_decode( $description ) );
+ }else{
+ //Otherwise, preserve line breaks
+ $description = nl2br( $description );
+
+ //Make URLs clickable if required
+ if ( $autolink )
+ $description = make_clickable( $description );
+ }
+
+ return $m[1] . $description . $m[6];
+
+ case 'link':
+ $new_window = ( $newwindow ) ? ' target="_blank"' : '';
+ return $m[1] . '' . $this->look_for_shortcodes( $m[5] ) . '' . $m[6];
+
+ case 'url':
+ return $m[1] . esc_url( $this->link . '&ctz=' . $this->feed->get_timezone() ) . $m[6];
+
+ case 'feed-id':
+ return $m[1] . intval( $this->feed->get_feed_id() ) . $m[6];
+
+ case 'feed-title':
+ return $m[1] . esc_html( $this->feed->get_feed_title() ) . $m[6];
+
+ case 'maps-link':
+ $new_window = ( $newwindow ) ? ' target="_blank"' : '';
+ return $m[1] . '' . $this->look_for_shortcodes( $m[5] ) . '' . $m[6];
+
+ case 'length':
+ return $m[1] . $this->gce_human_time_diff( $this->start_time, $this->end_time, $precision ) . $m[6];
+
+ case 'event-num':
+ return $m[1] . intval( $this->pos ) . $m[6];
+
+ case 'event-id':
+ return $m[1] . esc_html( $this->id ) . $m[6];
+
+ case 'cal-id':
+ $cal_id = explode( '/', $this->feed->get_feed_url() );
+ return $m[1] . esc_html( $cal_id[5] ) . $m[6];
+
+ case 'if-all-day':
+ if ( 'SWD' == $this->day_type || 'MWD' == $this->day_type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-not-all-day':
+ if ( 'SPD' == $this->day_type || 'MPD' == $this->day_type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-title':
+ if ( '' != $this->title )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-description':
+ if ( '' != $this->description )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-location':
+ if ( '' != $this->location )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-tooltip':
+ if ( 'tooltip' == $this->type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-list':
+ if ( 'list' == $this->type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-now':
+ if ( $this->time_now >= $this->start_time && $this->time_now < $this->end_time )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-not-now':
+ if ( $this->end_time < $this->time_now || $this->start_time > $this->time_now )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-started':
+ if ( $this->start_time < $this->time_now )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-not-started':
+ if ( $this->start_time > $this->time_now )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-ended':
+ if ( $this->end_time < $this->time_now )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-not-ended':
+ if ( $this->end_time > $this->time_now )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-first':
+ if ( 0 == $this->num_in_day )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-not-first':
+ if ( 0 != $this->num_in_day )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-multi-day':
+ if ( 'MPD' == $this->day_type || 'MWD' == $this->day_type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+
+ case 'if-single-day':
+ if ( 'SPD' == $this->day_type || 'SWD' == $this->day_type )
+ return $m[1] . $this->look_for_shortcodes( $m[5] ) . $m[6];
+
+ return '';
+ }
+ }
+
+ //Return the event markup using the old display options
+ function use_old_display_options() {
+ $display_options = $this->feed->get_display_options();
+
+ $markup = '
' . esc_html( $this->title ) . '
';
+
+ $start_end = array();
+
+ //If start date / time should be displayed, set up array of start date and time
+ if ( 'none' != $display_options['display_start'] ) {
+ $sd = $this->start_time;
+ $start_end['start'] = array(
+ 'time' => date_i18n( $this->feed->get_time_format(), $sd ),
+ 'date' => date_i18n( $this->feed->get_date_format(), $sd )
+ );
+ }
+
+ //If end date / time should be displayed, set up array of end date and time
+ if ( 'none' != $display_options['display_end'] ) {
+ $ed = $this->end_time;
+ $start_end['end'] = array(
+ 'time' => date_i18n( $this->feed->get_time_format(), $ed ),
+ 'date' => date_i18n( $this->feed->get_date_format(), $ed )
+ );
+ }
+
+ //Add the correct start / end, date / time information to $markup
+ foreach ( $start_end as $start_or_end => $info ) {
+ $markup .= '
';
+ }
+
+ //Returns array of days with events, with sub-arrays of events for that day
+ function get_event_days() {
+ $event_days = array();
+
+ //Total number of events retrieved
+ $count = count( $this->merged_feed_data );
+
+ //If maximum events to display is 0 (unlimited) set $max to 1, otherwise use maximum of events specified by user
+ $max = ( 0 == $this->max_events_display ) ? 1 : $this->max_events_display;
+
+ //Loop through entire array of events, or until maximum number of events to be displayed has been reached
+ for ( $i = 0; $i < $count && $max > 0; $i++ ) {
+ $event = $this->merged_feed_data[$i];
+
+ //Check that event ends, or starts (or both) within the required date range. This prevents all-day events from before / after date range from showing up.
+ if ( $event->get_end_time() > $event->get_feed()->get_feed_start() && $event->get_start_time() < $event->get_feed()->get_feed_end() ) {
+ foreach ( $event->get_days() as $day ) {
+ $event_days[$day][] = $event;
+ }
+
+ //If maximum events to display isn't 0 (unlimited) decrement $max counter
+ if ( 0 != $this->max_events_display )
+ $max--;
+ }
+ }
+
+ return $event_days;
+ }
+
+ //Returns grid markup
+ function get_grid ( $year = null, $month = null, $ajaxified = false ) {
+ require_once 'php-calendar.php';
+
+ $time_now = current_time( 'timestamp' );
+
+ //If year and month have not been passed as paramaters, use current month and year
+ if( ! isset( $year ) )
+ $year = date( 'Y', $time_now );
+
+ if( ! isset( $month ) )
+ $month = date( 'm', $time_now );
+
+ //Get timestamps for the start and end of current month
+ $current_month_start = mktime( 0, 0, 0, date( 'm', $time_now ), 1, date( 'Y', $time_now ) );
+ $current_month_end = mktime( 0, 0, 0, date( 'm', $time_now ) + 1, 1, date( 'Y', $time_now ) );
+
+ //Get timestamps for the start and end of the month to be displayed in the grid
+ $display_month_start = mktime( 0, 0, 0, $month, 1, $year );
+ $display_month_end = mktime( 0, 0, 0, $month + 1, 1, $year );
+
+ //It should always be possible to navigate to the current month, even if it doesn't have any events
+ //So, if the display month is before the current month, set $nav_next to true, otherwise false
+ //If the display month is after the current month, set $nav_prev to true, otherwise false
+ $nav_next = ( $display_month_start < $current_month_start );
+ $nav_prev = ( $display_month_start >= $current_month_end );
+
+ //Get events data
+ $event_days = $this->get_event_days();
+
+ //If event_days is empty, then there are no events in the feed(s), so set ajaxified to false (Prevents AJAX calendar from allowing to endlessly click through months with no events)
+ if ( empty( $event_days ) )
+ $ajaxified = false;
+
+ $today = mktime( 0, 0, 0, date( 'm', $time_now ), date( 'd', $time_now ), date( 'Y', $time_now ) );
+
+ $i = 1;
+
+ foreach ( $event_days as $key => $event_day ) {
+ //If event day is in the month and year specified (by $month and $year)
+ if ( $key >= $display_month_start && $key < $display_month_end ) {
+ //Create array of CSS classes. Add gce-has-events
+ $css_classes = array( 'gce-has-events' );
+
+ //Create markup for display
+ $markup = '
';
+
+ //If title option has been set for display, add it
+ if ( isset( $this->title ) )
+ $markup .= '
';
+
+ //Add CSS class for the feed from which this event comes. If there are multiple events from the same feed on the same day, the CSS class will only be added once.
+ $css_classes['feed-' . $feed_id] = 'gce-feed-' . $feed_id;
+
+ $i++;
+ }
+
+ $markup .= '
';
+
+ //If number of CSS classes is greater than 2 ('gce-has-events' plus one specific feed class) then there must be events from multiple feeds on this day, so add gce-multiple CSS class
+ if ( count( $css_classes ) > 2 )
+ $css_classes[] = 'gce-multiple';
+
+ //If event day is today, add gce-today CSS class, otherwise add past or future class
+ if ( $key == $today )
+ $css_classes[] = 'gce-today gce-today-has-events';
+ elseif ( $key < $today )
+ $css_classes[] = 'gce-day-past';
+ else
+ $css_classes[] = 'gce-day-future';
+
+ //Change array entry to array of link href, CSS classes, and markup for use in gce_generate_calendar (below)
+ $event_days[$key] = array( null, implode( ' ', $css_classes ), $markup );
+ } elseif ( $key < $display_month_start ) {
+ //This day is before the display month, so set $nav_prev to true. Remove the day from $event_days, as it's no use for displaying this month
+ $nav_prev = true;
+ unset( $event_days[$key] );
+ } else {
+ //This day is after the display month, so set $nav_next to true. Remove the day from $event_days, as it's no use for displaying this month
+ $nav_next = true;
+ unset( $event_days[$key] );
+ }
+ }
+
+ //Ensures that gce-today CSS class is added even if there are no events for 'today'. A bit messy :(
+ if ( ! isset( $event_days[$today] ) )
+ $event_days[$today] = array( null, 'gce-today gce-today-no-events', null );
+
+ $pn = array();
+
+ //Only add previous / next functionality if AJAX grid is enabled
+ if ( $ajaxified ) {
+ //If there are events to display in a previous month, add previous month link
+ $prev_key = ( $nav_prev ) ? '«' : ' ';
+ $prev = ( $nav_prev ) ? date( 'm-Y', mktime( 0, 0, 0, $month - 1, 1, $year ) ) : null;
+
+ //If there are events to display in a future month, add next month link
+ $next_key = ( $nav_next ) ? '»' : ' ';
+ $next = ( $nav_next ) ? date( 'm-Y', mktime( 0, 0, 0, $month + 1, 1, $year ) ) : null;
+
+ //Array of previous and next link stuff for use in gce_generate_calendar (below)
+ $pn = array( $prev_key => $prev, $next_key => $next );
+ }
+
+ //Generate the calendar markup and return it
+ return gce_generate_calendar( $year, $month, $event_days, 1, null, $this->start_of_week, $pn );
+ }
+
+ function get_list( $grouped = false ) {
+ $time_now = current_time( 'timestamp' );
+
+ $event_days = $this->get_event_days();
+
+ //If event_days is empty, there are no events in the feed(s), so return a message indicating this
+ if( empty( $event_days) )
+ return '
' . __( 'There are currently no events to display.', GCE_TEXT_DOMAIN ) . '
';
+
+ foreach ( $event_days as $key => $event_day ) {
+ //If this is a grouped list, add the date title and begin the nested list for this day
+ if ( $grouped ) {
+ $markup .=
+ '' .
+ '
";
+
+ if ( $day_name_length ) { #if the day names should be shown ($day_name_length > 0)
+ #if day_name_length is >3, the full name of the day will be printed
+ foreach ( $day_names as $d ) {
+ $calendar .= '
 ) . ')
';
- }
-
- public static function transition_comment_status( $new_status, $old_status, $comment ) {
- if ( $new_status == $old_status )
- return;
-
- # we don't need to record a history item for deleted comments
- if ( $new_status == 'delete' )
- return;
-
- if ( !is_admin() )
- return;
-
- if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
- return;
-
- if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
- return;
-
- // if this is present, it means the status has been changed by a re-check, not an explicit user action
- if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- return;
-
- global $current_user;
- $reporter = '';
- if ( is_object( $current_user ) )
- $reporter = $current_user->user_login;
-
- // Assumption alert:
- // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
- // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
- // determine why the transition_comment_status action was triggered. And there are several different ways by which
- // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
- // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
- if ( isset($_POST['action']) || isset($_GET['action']) ) {
- if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
- return self::submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return self::submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- Akismet::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ echo '