From fda53325dc4eb7d46f7ba673d606d7be9a24ff8f Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Tue, 14 Jan 2014 13:49:38 -0600 Subject: [PATCH 001/123] Issue 65 Enable stream network - Added check for is_multisite() to db $prefix definition to use base_prefix - Updated install $sql to include blog_id column - Added update function to run install() and alter the column order - Added site_id and blog_id values to query defaults - Run install check method on plugins_loaded. plugin_activation_hook doesn't run when updating --- includes/db-actions.php | 2 +- includes/install.php | 13 +++++++++++-- includes/log.php | 1 + includes/query.php | 18 +++++++++++++++--- stream.php | 5 +++-- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/includes/db-actions.php b/includes/db-actions.php index 3d08e6dbd..8f7021853 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -13,7 +13,7 @@ class WP_Stream_DB { public function __construct() { global $wpdb; // Allow devs to alter the tables prefix, default to base_prefix - $prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); + $prefix = apply_filters( 'wp_stream_db_tables_prefix', is_multisite() ? $wpdb->base_prefix : $wpdb->prefix ); self::$table = $prefix . 'stream'; self::$table_meta = $prefix . 'stream_meta'; self::$table_context = $prefix . 'stream_context'; diff --git a/includes/install.php b/includes/install.php index da794910d..5aa0d86b0 100644 --- a/includes/install.php +++ b/includes/install.php @@ -51,6 +51,7 @@ public static function install() { $sql = "CREATE TABLE {$prefix}stream ( ID bigint(20) unsigned NOT NULL AUTO_INCREMENT, site_id bigint(20) unsigned NOT NULL DEFAULT '1', + blog_id bigint(20) unsigned NOT NULL DEFAULT '1', object_id bigint(20) unsigned NULL, author bigint(20) unsigned NOT NULL DEFAULT '0', summary longtext NOT NULL, @@ -61,6 +62,7 @@ public static function install() { ip varchar(20) NOT NULL, PRIMARY KEY (ID), KEY site_id (site_id), + KEY blog_id (blog_id), KEY parent (parent), KEY author (author), KEY created (created) @@ -96,8 +98,15 @@ public static function install() { dbDelta( $sql ); } - public static function update() { - // Reserved for future + public static function update( $db_version, $current ) { + global $wpdb; + $prefix = self::$table_prefix; + + self::install(); + + // Manually alter the column order. Not possible using dbDelta alone. + $v = $wpdb->query( "ALTER TABLE {$prefix}stream MODIFY blog_id bigint(20) AFTER site_id" ); + } } diff --git a/includes/log.php b/includes/log.php index f4a1182e5..b7f0d5fce 100644 --- a/includes/log.php +++ b/includes/log.php @@ -56,6 +56,7 @@ public function log( $connector, $message, $args, $object_id, $contexts, $user_i $recordarr = array( 'object_id' => $object_id, + 'blog_id' => get_current_blog_id(), 'author' => $user_id, 'created' => current_time( 'mysql', 1 ), 'summary' => vsprintf( $message, $args ), diff --git a/includes/query.php b/includes/query.php index ae5fa4b49..6e2e5755b 100644 --- a/includes/query.php +++ b/includes/query.php @@ -31,6 +31,8 @@ public function query( $args ) { 'type' => 'stream', 'object_id' => null, 'ip' => null, + 'site_id' => get_current_site()->id, + 'blog_id' => get_current_blog_id(), // Author param 'author' => null, // Date-based filters @@ -53,7 +55,6 @@ public function query( $args ) { // Fields selection 'fields' => '', ); - $args = wp_parse_args( $args, $defaults ); $args = apply_filters( 'stream_query_args', $args ); @@ -81,6 +82,17 @@ public function query( $args ) { $where .= $wpdb->prepare( " AND $wpdb->stream.ip = %s", filter_var( $args['ip'], FILTER_VALIDATE_IP ) ); } + if ( is_multisite() ) { + if ( $args['site_id'] ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); + } + + if ( $args['blog_id'] ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); + } + + } + if ( $args['search'] ) { $where .= $wpdb->prepare( " AND $wpdb->stream.summary LIKE %s", "%{$args['search']}%" ); } @@ -178,7 +190,7 @@ public function query( $args ) { if ( in_array( $orderby, - array( 'ID', 'site_id', 'object_id', 'author', 'summary', 'visibility', 'parent', 'type', 'created' ) + array( 'ID', 'blog_id', 'object_id', 'author', 'summary', 'visibility', 'parent', 'type', 'created' ) ) ) { $orderby = $wpdb->stream . '.' . $orderby; } @@ -217,7 +229,7 @@ public function query( $args ) { WHERE 1=1 $where $orderby $limits"; - + var_dump( $sql ); if ( ! empty( $fields ) ) { $results = $wpdb->get_col( $sql ); } else { diff --git a/stream.php b/stream.php index e7ac423e5..ae478115e 100644 --- a/stream.php +++ b/stream.php @@ -3,7 +3,7 @@ * Plugin Name: Stream * Plugin URI: http://wordpress.org/plugins/stream/ * Description: Stream tracks logged-in user activity so you can monitor every change made on your WordPress site in beautifully organized detail. All activity is organized by context, action and IP address for easy filtering. Developers can extend Stream with custom connectors to log any kind of action. - * Version: 1.0 + * Version: 1.1 * Author: X-Team * Author URI: http://x-team.com/wordpress/ * License: GPLv2+ @@ -37,7 +37,7 @@ class WP_Stream { * * @const string */ - const VERSION = '1.0'; + const VERSION = '1.1'; /** * Hold Stream instance @@ -221,3 +221,4 @@ public static function get_instance() { $GLOBALS['wp_stream'] = WP_Stream::get_instance(); register_activation_hook( __FILE__, array( 'WP_Stream', 'install' ) ); +add_action( 'plugins_loaded', array( 'WP_Stream', 'install' ) ); From cefde8e9bb1cdac9d7aad27761158475ee1882ca Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Tue, 14 Jan 2014 14:03:30 -0600 Subject: [PATCH 002/123] Network logging - Added blog_id and site_id to fields array - Added blog_id and site_id values to $recordarr - Removed debugging statement from query --- includes/db-actions.php | 2 +- includes/log.php | 1 + includes/query.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/db-actions.php b/includes/db-actions.php index 8f7021853..bbd7a6c96 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -57,7 +57,7 @@ public function insert( $recordarr ) { return; } - $fields = array( 'object_id', 'author', 'created', 'summary', 'parent', 'visibility', 'ip' ); + $fields = array( 'object_id', 'site_id', 'blog_id', 'author', 'created', 'summary', 'parent', 'visibility', 'ip' ); $data = array_intersect_key( $recordarr, array_flip( $fields ) ); $data = array_filter( $data ); diff --git a/includes/log.php b/includes/log.php index b7f0d5fce..ef77b05c6 100644 --- a/includes/log.php +++ b/includes/log.php @@ -56,6 +56,7 @@ public function log( $connector, $message, $args, $object_id, $contexts, $user_i $recordarr = array( 'object_id' => $object_id, + 'site_id' => get_current_site()->id, 'blog_id' => get_current_blog_id(), 'author' => $user_id, 'created' => current_time( 'mysql', 1 ), diff --git a/includes/query.php b/includes/query.php index 6e2e5755b..8c7f762fa 100644 --- a/includes/query.php +++ b/includes/query.php @@ -229,7 +229,7 @@ public function query( $args ) { WHERE 1=1 $where $orderby $limits"; - var_dump( $sql ); + if ( ! empty( $fields ) ) { $results = $wpdb->get_col( $sql ); } else { From 46526d8ef36edff2e2301b9bdfa671b8b8fac6cb Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Tue, 14 Jan 2014 16:22:47 -0600 Subject: [PATCH 003/123] Network Admin List Table - Add stream page to network admin screen if if plugin is network activated - Add WP_STREAM_PLUGIN const to use for checking if plugin is network activated --- includes/admin.php | 9 ++++++++- stream.php | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index 7e9c12235..1e5d26189 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -29,6 +29,10 @@ public static function load() { // Register settings page add_action( 'admin_menu', array( __CLASS__, 'register_menu' ) ); + // Register settings page for network admin + if ( is_multisite() ) { + add_action( 'network_admin_menu', array( __CLASS__, 'register_menu' ) ); + } // Plugin action links add_filter( 'plugin_action_links', array( __CLASS__, 'plugin_action_links' ), 10, 2 ); @@ -80,9 +84,12 @@ public static function admin_notices() { * Register menu page * * @action admin_menu - * @return void + * @return bool|void */ public static function register_menu() { + if ( is_network_admin() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) + return false; + self::$screen_id['main'] = add_menu_page( __( 'Stream', 'stream' ), __( 'Stream', 'stream' ), diff --git a/stream.php b/stream.php index ae478115e..5df4428ee 100644 --- a/stream.php +++ b/stream.php @@ -62,6 +62,7 @@ class WP_Stream { * Class constructor */ private function __construct() { + define( 'WP_STREAM_PLUGIN', plugin_basename( __FILE__ ) ); define( 'WP_STREAM_DIR', plugin_dir_path( __FILE__ ) ); define( 'WP_STREAM_URL', plugin_dir_url( __FILE__ ) ); define( 'WP_STREAM_INC_DIR', WP_STREAM_DIR . 'includes/' ); From e589ede09ae48562eb7456437a963d2557646ec1 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Tue, 14 Jan 2014 16:46:24 -0600 Subject: [PATCH 004/123] Network Admin Screen - Replaced all occurrences of admin_url() with network_admin_url() if is_network_admin() returns true - Updated query args for blog_id filter --- includes/admin.php | 6 +++--- includes/list-table.php | 40 +++++++++++++++++++++++++++++++++++----- includes/query.php | 19 ++++++++----------- 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 1e5d26189..4ffee92d8 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -217,7 +217,7 @@ public static function admin_menu_css() { */ public static function plugin_action_links( $links, $file ) { if ( plugin_basename( WP_STREAM_DIR . 'stream.php' ) === $file ) { - $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), admin_url( self::ADMIN_PARENT_PAGE ) ); + $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $links[] = sprintf( '%s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'stream' ) ); $url = add_query_arg( @@ -300,7 +300,7 @@ public static function wp_ajax_reset() { check_ajax_referer( 'stream_nonce', 'wp_stream_nonce' ); if ( current_user_can( self::SETTINGS_CAP ) ) { self::erase_stream_records(); - wp_redirect( add_query_arg( array( 'page' => 'wp_stream_settings', 'message' => 'data_erased' ), admin_url( 'admin.php' ) ) ); + wp_redirect( add_query_arg( array( 'page' => 'wp_stream_settings', 'message' => 'data_erased' ), is_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) ); exit; } else { wp_die( "You don't have sufficient priviledges to do this action." ); @@ -485,7 +485,7 @@ public static function dashboard_stream_activity_contents() { $records_link = add_query_arg( array( 'page' => self::RECORDS_PAGE_SLUG ), - admin_url( self::ADMIN_PARENT_PAGE ) + is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $author_link = add_query_arg( diff --git a/includes/list-table.php b/includes/list-table.php index 734b8ade8..cc76ae1b4 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -23,6 +23,10 @@ function __construct( $args = array() ) { add_filter( 'set-screen-option', array( __CLASS__, 'set_screen_option' ), 10, 3 ); add_filter( 'screen_settings', array( __CLASS__, 'live_update_checkbox' ), 10, 2 ); set_screen_options(); + + if ( is_network_admin() ) { + add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); + } } function extra_tablenav( $which ) { @@ -31,6 +35,11 @@ function extra_tablenav( $which ) { } } + function network_admin_columns( $columns ) { + $columns['blog_id'] = __( 'Blog', 'stream' ); + return $columns; + } + function get_columns(){ return apply_filters( 'wp_stream_list_table_columns', @@ -105,7 +114,7 @@ function get_records() { 'connector', 'context', 'action', 'author', 'object_id', 'search', 'date', 'date_from', 'date_to', - 'record__in', + 'record__in', 'blog_id' ); foreach ( $allowed_params as $param ) { @@ -164,7 +173,7 @@ function column_default( $item, $column_name ) { $author_role = isset( $user->roles[0] ) ? $wp_roles->role_names[$user->roles[0]] : null; $out = sprintf( '%s %s
%s', - add_query_arg( array( 'author' => $author_ID ), admin_url( 'admin.php?page=wp_stream' ) ), + add_query_arg( array( 'author' => $author_ID ), is_network_admin() ? network_admin_url( 'admin.php?page=wp_stream' ) : admin_url( 'admin.php?page=wp_stream' ) ), get_avatar( $author_ID, 40 ), $author_name, $author_role @@ -194,6 +203,15 @@ function column_default( $item, $column_name ) { $out = intval( $item->ID ); break; + case 'blog_id': + $blog = get_blog_details( $item->blog_id ); + $out = sprintf( + '%s', + add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), + esc_html( $blog->blogname ) + ); + break; + default: // Register inserted column defaults. Must match a column header from get_columns. $inserted_columns = apply_filters( 'wp_stream_register_column_defaults', $new_columns = array() ); @@ -271,7 +289,7 @@ public static function get_action_links( $record ){ } function column_link( $display, $key, $value = null, $title = null ) { - $url = admin_url( 'admin.php?page=wp_stream' ); + $url = is_network_admin() ? network_admin_url( 'admin.php?page=wp_stream') : admin_url( 'admin.php?page=wp_stream' ); $args = ! is_array( $key ) ? array( $key => $value ) : $key; @@ -326,6 +344,18 @@ function filters_form() { 'items' => $actions, ); + if ( is_network_admin() ) { + $blogs = array(); + foreach( (array) wp_get_sites() as $blog ) { + $blogs[$blog['blog_id']] = $blog['domain']; + } + + $filters['blog_id'] = array( + 'title' => __( 'blogs', 'stream' ), + 'items' => $blogs, + ); + } + $filters = apply_filters( 'wp_stream_list_table_filters', $filters ); $filters_string .= $this->filter_date(); @@ -335,7 +365,7 @@ function filters_form() { } $filters_string .= sprintf( '', __( 'Filter', 'stream' ) ); - $url = admin_url( 'admin.php' ); + $url = is_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ); echo sprintf( '
%s
', $filters_string ); // xss okay } @@ -396,7 +426,7 @@ function filter_date() { } function display() { - echo '
'; + echo ''; echo $this->filter_search(); // xss okay parent::display(); echo '
'; diff --git a/includes/query.php b/includes/query.php index 8c7f762fa..6e4d23c52 100644 --- a/includes/query.php +++ b/includes/query.php @@ -31,8 +31,8 @@ public function query( $args ) { 'type' => 'stream', 'object_id' => null, 'ip' => null, - 'site_id' => get_current_site()->id, - 'blog_id' => get_current_blog_id(), + 'site_id' => is_network_admin() ? null : get_current_site()->id, + 'blog_id' => is_network_admin() ? null : get_current_blog_id(), // Author param 'author' => null, // Date-based filters @@ -82,15 +82,12 @@ public function query( $args ) { $where .= $wpdb->prepare( " AND $wpdb->stream.ip = %s", filter_var( $args['ip'], FILTER_VALIDATE_IP ) ); } - if ( is_multisite() ) { - if ( $args['site_id'] ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); - } - - if ( $args['blog_id'] ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); - } + if ( $args['site_id'] ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); + } + if ( $args['blog_id'] ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); } if ( $args['search'] ) { @@ -190,7 +187,7 @@ public function query( $args ) { if ( in_array( $orderby, - array( 'ID', 'blog_id', 'object_id', 'author', 'summary', 'visibility', 'parent', 'type', 'created' ) + array( 'ID', 'site_id', 'blog_id', 'object_id', 'author', 'summary', 'visibility', 'parent', 'type', 'created' ) ) ) { $orderby = $wpdb->stream . '.' . $orderby; } From 9f65ca9bfa673bfbcbcbfdbffdba1c8773b84e56 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Tue, 14 Jan 2014 17:09:06 -0600 Subject: [PATCH 005/123] Add Stream Activity dashboard widget to network admin screen --- includes/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/admin.php b/includes/admin.php index 4ffee92d8..6f9b1a495 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -55,6 +55,7 @@ public static function load() { // Load Dashboard widget add_action( 'wp_dashboard_setup', array( __CLASS__, 'dashboard_stream_activity' ) ); + add_action( 'wp_network_dashboard_setup', array( __CLASS__, 'dashboard_stream_activity' ) ); // Heartbeat live update add_filter( 'heartbeat_received', array( __CLASS__, 'live_update' ), 10, 2 ); From cf6674c8888586f8a20791101cd14e5b212a12a1 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Wed, 15 Jan 2014 10:30:52 -0600 Subject: [PATCH 006/123] Add initial context for blogs connector - Added all actions to be tracked - Created empty callback function for each action --- connectors/blogs.php | 181 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 connectors/blogs.php diff --git a/connectors/blogs.php b/connectors/blogs.php new file mode 100644 index 000000000..83dff3f0a --- /dev/null +++ b/connectors/blogs.php @@ -0,0 +1,181 @@ + __( 'Updated', 'stream' ), + 'created' => __( 'Created', 'stream' ), + 'archive_blog' => __( 'Archived', 'stream' ), + 'deleted' => __( 'Deleted', 'stream' ), + ); + } + + /** + * Return translated context labels + * + * @return array Context label translations + */ + public static function get_context_labels() { + $blogs = wp_get_sites(); + $blog_labels = array(); + foreach( $blogs as $blog ) { + $blog_labels[$blog['blog_id']] = array( + 'domain' => $blog['domain'], + 'public' => $blog['public'], + 'last_updated' => $blog['last_updated'], + 'registered' => $blog['registered'], + 'archived' => $blog['archived'], + 'mature' => $blog['mature'], + 'spam' => $blog['spam'], + 'deleted' => $blog['deleted'], + ); + } + } + + /** + * Add action links to Stream drop row in admin list screen + * + * @filter wp_stream_action_links_{connector} + * @param array $links Previous links registered + * @param int $record Stream record + * @return array Action links + */ + public static function action_links( $links, $record ) { + + return $links; + } + + /** + * @param $blog_id + * @action activate_blog + */ + public static function callback_activate_blog( $blog_id ) { + + } + + /** + * @param $blog_id + * @action wpmu_new_blog + */ + public static function callback_wpmu_new_blog( $blog_id ) { + + } + + /** + * @param $post_id + * @action make_spam_blog + */ + public static function callback_make_spam_blog( $post_id ) { + + } + + /** + * @param $blog + * @action make_ham_blog + */ + public static function callback_make_ham_blog( $blog ) { + + } + + /** + * @param $blog_id + * @action mature_blog + */ + public static function callback_mature_blog( $blog_id ) { + + } + + /** + * @param $blog + * @action unmature_blog + */ + public static function callback_unmature_blog ( $blog ) { + + } + + /** + * @param $blog + * @action archive_blog + */ + public static function callback_archive_blog( $blog ) { + + } + + /** + * @param $blog_id + * @action unarchive_blog + */ + public static function callback_unarchive_blog( $blog_id ) { + + } + + /** + * @param $blog_id + * @action make_delete_blog + */ + public static function callback_make_delete_blog( $blog_id ) { + + } + + /** + * @param $blog_id + * @action undelete_blog + */ + public static function callback_make_undelete_blog( $blog_id ) { + + } + + /** + * @param $blog_id + * @action update_blog_public + */ + public static function callback_update_blog_public( $blog_id ) { + + } + +} \ No newline at end of file From 8798f35574be69f48c441dbf87b351da4a662ead Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Wed, 15 Jan 2014 11:09:47 -0600 Subject: [PATCH 007/123] Blogs connector //comment out wp_get_sites to prevent fatal errors before adding connector items --- connectors/blogs.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/connectors/blogs.php b/connectors/blogs.php index 83dff3f0a..dec72ed9c 100644 --- a/connectors/blogs.php +++ b/connectors/blogs.php @@ -60,22 +60,22 @@ public static function get_action_labels() { * * @return array Context label translations */ - public static function get_context_labels() { - $blogs = wp_get_sites(); - $blog_labels = array(); - foreach( $blogs as $blog ) { - $blog_labels[$blog['blog_id']] = array( - 'domain' => $blog['domain'], - 'public' => $blog['public'], - 'last_updated' => $blog['last_updated'], - 'registered' => $blog['registered'], - 'archived' => $blog['archived'], - 'mature' => $blog['mature'], - 'spam' => $blog['spam'], - 'deleted' => $blog['deleted'], - ); - } - } +// public static function get_context_labels() { +// $blogs = wp_get_sites(); +// $blog_labels = array(); +// foreach( $blogs as $blog ) { +// $blog_labels[$blog['blog_id']] = array( +// 'domain' => $blog['domain'], +// 'public' => $blog['public'], +// 'last_updated' => $blog['last_updated'], +// 'registered' => $blog['registered'], +// 'archived' => $blog['archived'], +// 'mature' => $blog['mature'], +// 'spam' => $blog['spam'], +// 'deleted' => $blog['deleted'], +// ); +// } +// } /** * Add action links to Stream drop row in admin list screen From 343ad53d6a5ba3f5383906545a534e1e5f6b064b Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Wed, 15 Jan 2014 11:14:44 -0600 Subject: [PATCH 008/123] Move blogs.php to tmp directory during development --- {connectors => tmp}/blogs.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {connectors => tmp}/blogs.php (100%) diff --git a/connectors/blogs.php b/tmp/blogs.php similarity index 100% rename from connectors/blogs.php rename to tmp/blogs.php From 752fdb120aea03541d178d896b9d9e8e94fc9e2f Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Wed, 15 Jan 2014 17:23:24 -0600 Subject: [PATCH 009/123] Log, query and display network wide options as blog_id 0 - Added check for is_network_admin before defaulting the blog_id logged as 1 - Added function to the list table to generate a blog object for actions done in network admin --- includes/list-table.php | 15 ++++++++++++++- includes/log.php | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/includes/list-table.php b/includes/list-table.php index cc76ae1b4..d932250f3 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -204,7 +204,7 @@ function column_default( $item, $column_name ) { break; case 'blog_id': - $blog = get_blog_details( $item->blog_id ); + $blog = $item->blog_id ? get_blog_details( $item->blog_id ) : self::get_network_blog(); $out = sprintf( '%s', add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), @@ -241,6 +241,18 @@ function column_default( $item, $column_name ) { echo $out; // xss okay } + /** + * Builds a stdClass object used when displaying actions done in network administration + * @return stdClass + */ + public static function get_network_blog() { + $blog = new stdClass; + $blog->blog_id = 0; + $blog->blogname = 'Network Admin'; + + return $blog; + } + public static function get_action_links( $record ){ $out = ''; @@ -349,6 +361,7 @@ function filters_form() { foreach( (array) wp_get_sites() as $blog ) { $blogs[$blog['blog_id']] = $blog['domain']; } + $blogs[0] = $filters['blog_id'] = array( 'title' => __( 'blogs', 'stream' ), diff --git a/includes/log.php b/includes/log.php index ef77b05c6..6e144b61b 100644 --- a/includes/log.php +++ b/includes/log.php @@ -57,7 +57,7 @@ public function log( $connector, $message, $args, $object_id, $contexts, $user_i $recordarr = array( 'object_id' => $object_id, 'site_id' => get_current_site()->id, - 'blog_id' => get_current_blog_id(), + 'blog_id' => is_network_admin() ? 0 : get_current_blog_id(), 'author' => $user_id, 'created' => current_time( 'mysql', 1 ), 'summary' => vsprintf( $message, $args ), From dc70230e3386134f0d4b78cf3a6aaa7cbcec6c67 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Wed, 15 Jan 2014 17:27:50 -0600 Subject: [PATCH 010/123] added filter to blog_id used in log - Will allow extensions and future features to set blog_id without relying on get_current_blog_id() or is_network_admin() --- includes/log.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/log.php b/includes/log.php index 6e144b61b..2e2b31839 100644 --- a/includes/log.php +++ b/includes/log.php @@ -57,7 +57,7 @@ public function log( $connector, $message, $args, $object_id, $contexts, $user_i $recordarr = array( 'object_id' => $object_id, 'site_id' => get_current_site()->id, - 'blog_id' => is_network_admin() ? 0 : get_current_blog_id(), + 'blog_id' => apply_filters( 'blog_id_logged', is_network_admin() ? 0 : get_current_blog_id() ), 'author' => $user_id, 'created' => current_time( 'mysql', 1 ), 'summary' => vsprintf( $message, $args ), From babb077bee8afc15a426ec2550cff328df21f050 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Sun, 19 Jan 2014 17:08:52 -0600 Subject: [PATCH 011/123] Fix undefined function when multisite is not enabled --- includes/query.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/query.php b/includes/query.php index 6e4d23c52..284316675 100644 --- a/includes/query.php +++ b/includes/query.php @@ -21,6 +21,8 @@ public static function get_instance() { public function query( $args ) { global $wpdb; + $site_id = is_multisite() ? get_current_site()->id : 1; + $defaults = array( // Pagination params 'records_per_page' => 10, @@ -31,7 +33,7 @@ public function query( $args ) { 'type' => 'stream', 'object_id' => null, 'ip' => null, - 'site_id' => is_network_admin() ? null : get_current_site()->id, + 'site_id' => is_network_admin() ? null : $site_id, 'blog_id' => is_network_admin() ? null : get_current_blog_id(), // Author param 'author' => null, From ce2b64c8de1977fa5760d967b1b647ee01eeb499 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Sun, 19 Jan 2014 17:15:00 -0600 Subject: [PATCH 012/123] Just use null for site_id when not in multisite --- includes/query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/query.php b/includes/query.php index 284316675..34a8453e1 100644 --- a/includes/query.php +++ b/includes/query.php @@ -21,7 +21,7 @@ public static function get_instance() { public function query( $args ) { global $wpdb; - $site_id = is_multisite() ? get_current_site()->id : 1; + $site_id = is_multisite() ? get_current_site()->id : null; $defaults = array( // Pagination params From fe004b53120e2656cdd8470269b931d73d0930fe Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Sun, 19 Jan 2014 20:29:13 -0600 Subject: [PATCH 013/123] Remove ID col from network admin list table view --- includes/list-table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/list-table.php b/includes/list-table.php index d932250f3..7e1f96329 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -36,6 +36,7 @@ function extra_tablenav( $which ) { } function network_admin_columns( $columns ) { + unset( $columns['id'] ); $columns['blog_id'] = __( 'Blog', 'stream' ); return $columns; } From dfc3437c1aa5fdd54dec5182c62a844ed11e05c7 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Sun, 19 Jan 2014 20:49:02 -0600 Subject: [PATCH 014/123] Trivial code formatting --- includes/list-table.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/includes/list-table.php b/includes/list-table.php index 7e1f96329..536b277d0 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -17,8 +17,8 @@ function __construct( $args = array() ) { 'default' => 20, 'label' => __( 'Records per page', 'stream' ), 'option' => 'edit_stream_per_page', - ) - ); + ) + ); add_filter( 'set-screen-option', array( __CLASS__, 'set_screen_option' ), 10, 3 ); add_filter( 'screen_settings', array( __CLASS__, 'live_update_checkbox' ), 10, 2 ); @@ -78,7 +78,7 @@ function prepare_items() { $this->set_pagination_args( array( 'total_items' => $total_items, - 'per_page' => $this->get_items_per_page( 'edit_stream_per_page', 20 ), + 'per_page' => $this->get_items_per_page( 'edit_stream_per_page', 20 ), ) ); } @@ -90,10 +90,10 @@ function prepare_items() { * @return string Displays a checkbox */ function column_cb( $item ) { - return sprintf( + return sprintf( '', - /*$1%s*/ 'wp_stream_checkbox', - /*$2%s*/ $item->ID + 'wp_stream_checkbox', + $item->ID ); } @@ -112,10 +112,17 @@ function get_records() { // Filters $allowed_params = array( - 'connector', 'context', 'action', - 'author', 'object_id', 'search', - 'date', 'date_from', 'date_to', - 'record__in', 'blog_id' + 'connector', + 'context', + 'action', + 'author', + 'object_id', + 'search', + 'date', + 'date_from', + 'date_to', + 'record__in', + 'blog_id', ); foreach ( $allowed_params as $param ) { From b951ff971b732a616487d5f6031aebce2613e845 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Mon, 10 Feb 2014 10:46:42 -0600 Subject: [PATCH 015/123] Network Wide Stream - Added settings API wrapper for saving network wide settings - Added filter to get_fields method to allow settings to be extended - Added function to filter stream get settings to load correct values on network admin settings page --- includes/admin.php | 30 ++++++++---- includes/network.php | 109 ++++++++++++++++++++++++++++++++++++++++++ includes/settings.php | 3 +- stream.php | 7 ++- 4 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 includes/network.php diff --git a/includes/admin.php b/includes/admin.php index 4411e9986..2ee4a2ff7 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -26,12 +26,19 @@ public static function load() { add_filter( 'user_has_cap', array( __CLASS__, '_filter_user_caps' ), 10, 4 ); add_filter( 'role_has_cap', array( __CLASS__, '_filter_role_caps' ), 10, 3 ); - // Register settings page - add_action( 'admin_menu', array( __CLASS__, 'register_menu' ) ); - // Register settings page for network admin - if ( is_multisite() ) { + if ( is_network_admin() ) { add_action( 'network_admin_menu', array( __CLASS__, 'register_menu' ) ); + + // Admin notices + add_action( 'network_admin_notices', array( __CLASS__, 'admin_notices' ) ); + + } else { + // Register settings page + add_action( 'admin_menu', array( __CLASS__, 'register_menu' ) ); + + // Admin notices + add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); } // Plugin action links add_filter( 'plugin_action_links', array( __CLASS__, 'plugin_action_links' ), 10, 2 ); @@ -155,8 +162,9 @@ public static function admin_enqueue_scripts( $hook ) { /** * Add menu styles for various WP Admin skins * + * @uses wp_add_inline_style() * @action admin_enqueue_scripts - * @return wp_add_inline_style + * @return bool true on success false on failure */ public static function admin_menu_css() { wp_register_style( 'wp-stream-icons', WP_STREAM_URL . 'ui/stream-icons/style.css' ); @@ -240,6 +248,10 @@ public static function plugin_action_links( $links, $file ) { * @return void */ public static function render_page() { + if ( is_multisite() ) + include_once ABSPATH . 'wp-admin/options-head.php'; + + $form_action = is_network_admin() ? network_admin_url( 'edit.php?action=stream_settings' ) : admin_url( 'options.php' ); ?>
@@ -263,7 +275,7 @@ public static function render_page() {
-
+ $data ) { @@ -572,8 +584,8 @@ public static function dashboard_stream_activity_options() { * @uses gather_updated_items * @uses generate_row * - * @param array Response to heartbeat - * @param array Response from heartbeat + * @param array $response Response to heartbeat + * @param array $data Response from heartbeat * @return array Data sent to heartbeat */ public static function live_update( $response, $data ) { @@ -613,7 +625,7 @@ public static function live_update( $response, $data ) { /** * Sends Updated Actions to the List Table View * - * @param int Timestamp of last update + * @param int $last_id Timestamp of last update * @param array $query * * @return array Array of recently updated items diff --git a/includes/network.php b/includes/network.php new file mode 100644 index 000000000..aa811cf7e --- /dev/null +++ b/includes/network.php @@ -0,0 +1,109 @@ + + * @author Chris Olbekson + * + */ + +class WP_Stream_Network { + + function __construct() { + $this->actions(); + $this->filters(); + } + + function actions() { + add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); + + } + + function filters() { + add_filter( 'stream_get_fields', array( $this, 'stream_get_fields' ) ); + add_filter( 'wp_stream_options', array( $this, 'stream_filter_options' ) ); + + } + + /** + * Adds a network settings field to stream options in network admin + * + * @param $fields + * + * @return mixed + */ + function stream_get_fields( $fields ) { + if ( !function_exists( 'is_plugin_active_for_network' ) ) + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + + if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $fields['general']['fields'][] = + array( + 'name' => 'disable_sites_admin', + 'title' => __( 'Disable Site Access', 'stream' ), + 'default' => 0, + 'desc' => __( 'When site access is disabled the settings and Stream can only be accessed in network administration', 'stream' ), + 'type' => 'checkbox', + ); + return $fields; + } + return $fields; + } + + /** + * Wrapper for the settings API to work on the network settings page + */ + function network_options_action() { + if ( ! isset( $_GET['action'] ) || 'stream_settings' != $_GET['action'] ) + return; + + $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; + if ( $options ) { + foreach ( $options as $option ) { + $option = trim( $option ); + $value = null; + if ( isset( $_POST[$option] ) ) + $value = $_POST[$option]; + + if ( ! is_array( $value ) ) + $value = trim( $value ); + + update_site_option( $option, $value ); + } + } + + if ( ! count( get_settings_errors() ) ) + add_settings_error( 'general', 'settings_updated', __( 'Settings saved', 'stream' ), 'updated' ); + + set_transient( 'settings_errors', get_settings_errors(), 30 ); + + $go_back = add_query_arg( 'settings-updated', 'true', wp_get_referer() ); + wp_redirect( $go_back ); + exit; + } + + /** + * Filters stream options when on the network settings page + * + * @param $options + * + * @return array + */ + function stream_filter_options( $options ) { + if ( ! is_network_admin() ) + return $options; + + $network_options = wp_parse_args( + (array) get_site_option( WP_Stream_Settings::KEY, array() ), + WP_Stream_Settings::get_defaults() + ); + + if ( $network_options ) + return $network_options; + + return $options; + } + +} + +new WP_Stream_Network(); \ No newline at end of file diff --git a/includes/settings.php b/includes/settings.php index d9c9e8f10..d281887f4 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -51,7 +51,7 @@ public static function load() { * @return array Multidimensional array of fields */ public static function get_fields() { - return array( + return apply_filters( 'stream_get_fields', array( 'general' => array( 'title' => __( 'General', 'stream' ), 'fields' => array( @@ -112,6 +112,7 @@ public static function get_fields() { ), ), ), + ) ); } diff --git a/stream.php b/stream.php index 0235c5e0d..0994dc2f4 100644 --- a/stream.php +++ b/stream.php @@ -68,6 +68,9 @@ private function __construct() { define( 'WP_STREAM_INC_DIR', WP_STREAM_DIR . 'includes/' ); define( 'WP_STREAM_CLASS_DIR', WP_STREAM_DIR . 'classes/' ); + if ( is_multisite() ) + require_once WP_STREAM_INC_DIR . 'network.php'; + // Load DB helper class require_once WP_STREAM_INC_DIR . 'db-actions.php'; $this->db = new WP_Stream_DB; @@ -88,7 +91,7 @@ private function __construct() { $this->verify_database_present(); //Load languages - add_action( 'plugins_loaded', array( __CLASS__, 'i18n' ) ); + add_action( 'plugins_loaded', array( __CLASS__, 'i18n' ) ); // Load settings, enabling extensions to hook in require_once WP_STREAM_INC_DIR . 'settings.php'; @@ -112,7 +115,7 @@ private function __construct() { if ( is_admin() ) { require_once WP_STREAM_INC_DIR . 'admin.php'; - add_action( 'plugins_loaded', array( 'WP_Stream_Admin', 'load' ) ); + add_action( 'plugins_loaded', array( 'WP_Stream_Admin', 'load' ) ); } } From 5431df19ad44b496ded2452ca1509de2cb13efe7 Mon Sep 17 00:00:00 2001 From: Chris Olbekson Date: Mon, 10 Feb 2014 12:42:11 -0600 Subject: [PATCH 016/123] Network Stream - Add select field to network options screen to choose site to change settings for - Removed redundant code that called admin_notices from network admin screen - Added public static variable $disable_site_admin, gets set to true when network option checked to dis allow access to individual site admin screens - Added html output for select in settings render method --- includes/admin.php | 24 ++++++++++++++++++++++-- includes/network.php | 39 ++++++++++++++++++++++++++++++++++++--- includes/settings.php | 27 +++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 2ee4a2ff7..74e4f089c 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -15,6 +15,13 @@ class WP_Stream_Admin { */ public static $list_table = null; + /** + * Network option to disable access on individual sites + * + * @var bool + */ + public static $disable_site_admin = false; + const RECORDS_PAGE_SLUG = 'wp_stream'; const SETTINGS_PAGE_SLUG = 'wp_stream_settings'; const ADMIN_PARENT_PAGE = 'admin.php'; @@ -26,6 +33,12 @@ public static function load() { add_filter( 'user_has_cap', array( __CLASS__, '_filter_user_caps' ), 10, 4 ); add_filter( 'role_has_cap', array( __CLASS__, '_filter_role_caps' ), 10, 3 ); + if ( is_multisite() ) { + $settings = get_site_option( WP_Stream_Settings::KEY, array() ); + if ( true == $settings['general']['disable_sites_admin'] ) + self::$disable_site_admin = true; + } + // Register settings page for network admin if ( is_network_admin() ) { add_action( 'network_admin_menu', array( __CLASS__, 'register_menu' ) ); @@ -98,6 +111,9 @@ public static function register_menu() { if ( is_network_admin() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) return false; + if ( ! is_network_admin() && self::$disable_site_admin ) + return false; + self::$screen_id['main'] = add_menu_page( __( 'Stream', 'stream' ), __( 'Stream', 'stream' ), @@ -248,8 +264,6 @@ public static function plugin_action_links( $links, $file ) { * @return void */ public static function render_page() { - if ( is_multisite() ) - include_once ABSPATH . 'wp-admin/options-head.php'; $form_action = is_network_admin() ? network_admin_url( 'edit.php?action=stream_settings' ) : admin_url( 'options.php' ); ?> @@ -275,6 +289,12 @@ public static function render_page() {
+ + +

+

+ + 'disable_sites_admin', 'title' => __( 'Disable Site Access', 'stream' ), @@ -45,11 +45,31 @@ function stream_get_fields( $fields ) { 'desc' => __( 'When site access is disabled the settings and Stream can only be accessed in network administration', 'stream' ), 'type' => 'checkbox', ); - return $fields; + $new_fields['general']['fields'][] = + array( + 'name' => 'settings_for_blog', + 'title' => __( 'Settings for Blog', 'stream' ), + 'default' => array( 'value' => 0, 'name' => 'Network Default' ), + 'desc' => __( 'Select the site to apply settings changes to', 'stream' ), + 'type' => 'select', + 'choices' => $this->get_network_sites(), + ); + + return array_merge_recursive( $new_fields, $fields ); } return $fields; } + function get_network_sites() { + $return = array(); + $sites = wp_get_sites(); + foreach ( $sites as $site ) { + $blog = get_blog_details( (int) $site['blog_id'] ); + $return[$blog->blog_id] = $blog->blogname; + } + return $return; + } + /** * Wrapper for the settings API to work on the network settings page */ @@ -57,8 +77,15 @@ function network_options_action() { if ( ! isset( $_GET['action'] ) || 'stream_settings' != $_GET['action'] ) return; + $update_network = true; $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; if ( $options ) { + $blog_to_update = isset( $options['settings_for_blog'] ) ? (int) $options['settings_for_blog'] : 0; + if ( 0 !== $blog_to_update ) { + switch_to_blog( $blog_to_update ); + $update_network = false; + } + unset( $options['settings_for_blog'] ); foreach ( $options as $option ) { $option = trim( $option ); $value = null; @@ -68,8 +95,14 @@ function network_options_action() { if ( ! is_array( $value ) ) $value = trim( $value ); - update_site_option( $option, $value ); + if ( $update_network ) { + update_site_option( $option, $value ); + } else { + update_option( $option, $value ); + } } + if ( ! $update_network ) + restore_current_blog(); } if ( ! count( get_settings_errors() ) ) diff --git a/includes/settings.php b/includes/settings.php index d281887f4..69cba20cc 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -211,6 +211,7 @@ public static function render_field( $field ) { $description = isset( $field['desc'] ) ? $field['desc'] : null; $href = isset( $field['href'] ) ? $field['href'] : null; $after_field = isset( $field['after_field'] ) ? $field['after_field'] : null; + $default = isset( $field['default'] ) ? $field['default'] : null; if ( ! $type || ! $section || ! $name ) { return; @@ -272,6 +273,32 @@ public static function render_field( $field ) { } $output .= '
'; break; + case 'select': + $current_value = (array)self::$options[$section . '_' . $name]; + $default_value = isset( $default['value'] ) ? $default['value'] : '-1'; + $default_name = isset( $default['name'] ) ? $default['name'] : 'Choose Setting'; + + $output = sprintf( + ''; + break; case 'link': $output = sprintf( '%6$s', From b3b7919c9ee2f97da64c87638210f90bc5b63ec9 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Tue, 11 Feb 2014 11:46:28 -0600 Subject: [PATCH 017/123] Fixing phpcs syntax errors --- includes/network.php | 96 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/includes/network.php b/includes/network.php index b164b503f..115d8f252 100644 --- a/includes/network.php +++ b/includes/network.php @@ -1,12 +1,12 @@ * @author Chris Olbekson - * + * */ - + class WP_Stream_Network { function __construct() { @@ -33,40 +33,43 @@ function filters() { * @return mixed */ function stream_get_fields( $fields ) { - if ( !function_exists( 'is_plugin_active_for_network' ) ) - require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); - - if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { - $new_fields['general']['fields'][] = - array( - 'name' => 'disable_sites_admin', - 'title' => __( 'Disable Site Access', 'stream' ), - 'default' => 0, - 'desc' => __( 'When site access is disabled the settings and Stream can only be accessed in network administration', 'stream' ), - 'type' => 'checkbox', - ); - $new_fields['general']['fields'][] = - array( - 'name' => 'settings_for_blog', - 'title' => __( 'Settings for Blog', 'stream' ), - 'default' => array( 'value' => 0, 'name' => 'Network Default' ), - 'desc' => __( 'Select the site to apply settings changes to', 'stream' ), - 'type' => 'select', - 'choices' => $this->get_network_sites(), - ); - - return array_merge_recursive( $new_fields, $fields ); - } + if ( ! function_exists( 'is_plugin_active_for_network' ) ) { + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + } + + if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $new_fields['general']['fields'][] = array( + 'name' => 'disable_sites_admin', + 'title' => __( 'Disable Site Access', 'stream' ), + 'default' => 0, + 'desc' => __( 'When site access is disabled the settings and Stream can only be accessed in network administration', 'stream' ), + 'type' => 'checkbox', + ); + + $new_fields['general']['fields'][] = array( + 'name' => 'settings_for_blog', + 'title' => __( 'Settings for Blog', 'stream' ), + 'default' => array( 'value' => 0, 'name' => 'Network Default' ), + 'desc' => __( 'Select the site to apply settings changes to', 'stream' ), + 'type' => 'select', + 'choices' => $this->get_network_sites(), + ); + + return array_merge_recursive( $new_fields, $fields ); + } + return $fields; } function get_network_sites() { $return = array(); - $sites = wp_get_sites(); + $sites = wp_get_sites(); + foreach ( $sites as $site ) { $blog = get_blog_details( (int) $site['blog_id'] ); $return[$blog->blog_id] = $blog->blogname; } + return $return; } @@ -74,26 +77,34 @@ function get_network_sites() { * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || 'stream_settings' != $_GET['action'] ) + if ( ! isset( $_GET['action'] ) || 'stream_settings' != $_GET['action'] ) { return; + } $update_network = true; - $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; + $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; + if ( $options ) { $blog_to_update = isset( $options['settings_for_blog'] ) ? (int) $options['settings_for_blog'] : 0; + if ( 0 !== $blog_to_update ) { switch_to_blog( $blog_to_update ); $update_network = false; } + unset( $options['settings_for_blog'] ); + foreach ( $options as $option ) { $option = trim( $option ); - $value = null; - if ( isset( $_POST[$option] ) ) + $value = null; + + if ( isset( $_POST[$option] ) ) { $value = $_POST[$option]; + } - if ( ! is_array( $value ) ) + if ( ! is_array( $value ) ) { $value = trim( $value ); + } if ( $update_network ) { update_site_option( $option, $value ); @@ -101,12 +112,15 @@ function network_options_action() { update_option( $option, $value ); } } - if ( ! $update_network ) + + if ( ! $update_network ) { restore_current_blog(); + } } - if ( ! count( get_settings_errors() ) ) - add_settings_error( 'general', 'settings_updated', __( 'Settings saved', 'stream' ), 'updated' ); + if ( ! count( get_settings_errors() ) ) { + add_settings_error( 'general', 'settings_updated', __( 'Settings saved.', 'stream' ), 'updated' ); + } set_transient( 'settings_errors', get_settings_errors(), 30 ); @@ -123,20 +137,22 @@ function network_options_action() { * @return array */ function stream_filter_options( $options ) { - if ( ! is_network_admin() ) + if ( ! is_network_admin() ) { return $options; + } $network_options = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::KEY, array() ), + (array) get_site_option( WP_Stream_Settings::KEY, array() ), WP_Stream_Settings::get_defaults() ); - if ( $network_options ) + if ( $network_options ) { return $network_options; + } return $options; } } -new WP_Stream_Network(); \ No newline at end of file +new WP_Stream_Network(); From aa6cd3322349874e4223975ee1adcf57ea421af3 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Tue, 11 Feb 2014 11:47:33 -0600 Subject: [PATCH 018/123] Spacing fixes --- includes/db-actions.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/includes/db-actions.php b/includes/db-actions.php index 3951e1265..ac2d05732 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -70,8 +70,7 @@ public function insert( $recordarr ) { $fields = array( 'object_id', 'site_id', 'blog_id', 'author', 'created', 'summary', 'parent', 'visibility', 'ip' ); $data = array_intersect_key( $recordarr, array_flip( $fields ) ); - - $data = array_filter( $data ); + $data = array_filter( $data ); // TODO Check/Validate *required* fields @@ -128,8 +127,8 @@ public function insert_context( $record_id, $connector, $context, $action ) { 'connector' => $connector, 'context' => $context, 'action' => $action, - ) - ); + ) + ); return $result; } @@ -143,11 +142,10 @@ public function insert_meta( $record_id, $key, $val ) { 'record_id' => $record_id, 'meta_key' => $key, 'meta_value' => $val, - ) - ); + ) + ); return $result; } - } From beb3489c54840cc8ea26eec77eb363388947a616 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Tue, 11 Feb 2014 12:03:02 -0600 Subject: [PATCH 019/123] Fixing phpcs syntax errors in list-table --- includes/list-table.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/includes/list-table.php b/includes/list-table.php index d381aae40..e8100bb4d 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -242,7 +242,7 @@ function column_default( $item, $column_name ) { case 'blog_id': $blog = $item->blog_id ? get_blog_details( $item->blog_id ) : self::get_network_blog(); - $out = sprintf( + $out = sprintf( '%s', add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), esc_html( $blog->blogname ) @@ -294,8 +294,8 @@ function column_default( $item, $column_name ) { * @return stdClass */ public static function get_network_blog() { - $blog = new stdClass; - $blog->blog_id = 0; + $blog = new stdClass; + $blog->blog_id = 0; $blog->blogname = 'Network Admin'; return $blog; @@ -433,7 +433,8 @@ function filters_form() { $filters_string = sprintf( '', 'wp_stream' ); $authors_records = $this->assemble_records( 'author', 'stream' ); - $filters['author'] = array(); + + $filters['author'] = array(); $filters['author']['title'] = __( 'authors', 'stream' ); if ( count( $authors_records ) <= WP_Stream_Admin::PRELOAD_AUTHORS_MAX ) { @@ -459,7 +460,7 @@ function filters_form() { if ( is_network_admin() ) { $blogs = array(); - foreach( (array) wp_get_sites() as $blog ) { + foreach ( (array) wp_get_sites() as $blog ) { $blogs[$blog['blog_id']] = $blog['domain']; } $blogs[0] = From 8e5bdd182ac9bec9c40ecdb3f7c7e3b0727dda6d Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 13 Feb 2014 15:56:52 -0600 Subject: [PATCH 020/123] Fixing phpcs syntax errors in settings --- includes/settings.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/settings.php b/includes/settings.php index cac3c20a5..3fba6456c 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -331,13 +331,14 @@ public static function render_field( $field ) { $default_value = isset( $default['value'] ) ? $default['value'] : '-1'; $default_name = isset( $default['name'] ) ? $default['name'] : 'Choose Setting'; - $output = sprintf( + $output = sprintf( '', + '', esc_attr( json_encode( $data_values ) ), esc_attr( json_encode( $selected_values ) ), esc_attr( implode( ',', $current_value ) ), $class, esc_attr( $section ), - esc_attr( $name ) + esc_attr( $name ), + isset( $nonce ) ? sprintf( ' data-nonce="%s"', esc_attr( wp_create_nonce( $nonce ) ) ) : '' ); // to store data with default value if nothing is selected $output .= sprintf( @@ -756,40 +813,4 @@ public static function updated_option_ttl_remove_records( $old_value, $new_value do_action( 'wp_stream_auto_purge' ); } } - - /** - * Function will add excluded settings args into stream query - * - * @param $args array query args passed to stream_query - * - * @return array - */ - public static function remove_excluded_record_filter( $args ) { - // Remove record of excluded connector - if ( empty( $args['connector'] ) ) { - $args['connector__not_in'] = WP_Stream_Settings::get_excluded_by_key( 'connectors' ); - } - - // Remove record of excluded context - if ( empty( $args['context'] ) ) { - $args['context__not_in'] = WP_Stream_Settings::get_excluded_by_key( 'contexts' ); - } - - // Remove record of excluded actions - if ( empty( $args['action'] ) ) { - $args['action__not_in'] = WP_Stream_Settings::get_excluded_by_key( 'actions' ); - } - - // Remove record of excluded author - if ( empty( $args['author'] ) ) { - $args['author__not_in'] = WP_Stream_Settings::get_excluded_by_key( 'authors_and_roles' ); - } - - // Remove record of excluded ip - if ( empty( $args['ip'] ) ) { - $args['ip__not_in'] = WP_Stream_Settings::get_excluded_by_key( 'ip_addresses' ); - } - - return $args; - } } diff --git a/languages/stream-pl_PL.mo b/languages/stream-pl_PL.mo index 4b381cc3a95aeec6c27209ccbfc9a448a1aa909f..e01d276430f5dfe307b716e69e9d8993f402238d 100644 GIT binary patch delta 8915 zcmbW634B!5y~j@=Awbwf1!M`AC2WC^u*nu6BrE|06c7bmE;E;8n91BYi^D{8l!97R zN_+7kD%wi5uGPL!YZa{vacffiR$kRoeM+rbtgp7;-`orGdA`r5eVz}$`JQv` z+5Z3YKj$Fc;}tx*ry%!6&%)~sse6Gj{o#&|#<=9WoTOS~p6zAK$?!SY2fhwZfuF*j zu%x#!9bhS(3Cmy?=)kTp0f)oOA%D!B{AirVVXZMabCAqJDh5zH14iInHH5R^hfo7o zo@UH^*bEoJpTcFZLtkTN!&OlIcEgSE_fX^7{fs#S-UrqHb65@Quy!W%n@wa?@g%H) zW`JLw4X0DQJm8}N{|e8h{`68~&Vk#YCVCgnf#U}nQx3Cm7Q7wS!FS*kSZ*0p1RdBl zMDHp2#}@9ziv z1ZvzbU``Vk4rc#h3G4>@!BgR=fU{r^%4Y{`fQpF?P+@W{WS7h>P<#9nsJ(v)7Q)w| z+8u(5nUCQZSUd#(FCjB=h`+)uP?m3lo#72o7VZhY-xHMgLM?C~lmV|mO>huu;`g8? z{tTADF9LQR>KoV#s(;x~{IAS3DrC`_P?k7Q6JG`u%~wJ#$b)j_El>;n0hGsn1ZCOd zun@iq<*{Ew^*apJ{$r@|z6idT9+Vl~C=% zPy?@rvhb3CTcBM3Ey%$#H^EByQ1JaQq+ibb+0U55;r@iDLb-G>)Pz+~15XdW&xM+J z8SDVhg|hTQ$em23pc)6Y(0Nc3FN4~GHBbv%3)O!;)Oe|YxuAY4 zlz}^7cX+!#sN;`e7x*aDz|TV+n^yxKftsi*5q1qc8E%8OLe*DP`Ib(A>OTc)yxCA& zvjl45wa|h|xB%vMkm*L|O{j%@0A<0aPEkcLT5>FR`hG zTA&Rz;bpKEUI}}`=L5bDr&2xw%V9ZZR`F+6lF*XmO$MfmqLxV3#$Eta5($~j(`JLg%&;+4rG24CesIQhWs7E?1s9* z_QAgJmr&>R{ebPJ`SpFE1|APti&+iXHM1k&(@-8b3VXv6tUC=3ftsfp=DLzuLq>bI z9x9kN2HXU-S64&rsRwmhZiEW1eUOLDJO|b8gP{I1s37c6&0ptWcX%DlLbWT#EjmR# zXW)PBaVZs=cq~*fPJ}$!rVf_EMyPgIK@D&N)B^Sd^$!Gm0;=CDQ1`>9usa;UKItkS z1LcV-C=b`q#Q%8JoKJ;6a1{@Kv3Too1a1@*e zwPgt?OS4d0y$xz1HwWe1on#bz4?<1!64U|?LV4l{RL9Suj#sDIzGWvt4Kx%gs4Afa z7eK{Q6ly`2LIv?wsQ$M@E$BYTygBovpE19M8t7xF4&6A!vS1`shf3HE&Vlm4e5eJV z2{rI)sI3S=EjR;Zz!s>5Y=|XJCoWe}_81V^64#!=Qp@0@Sgqg9^S?P!>mn z`V3UN>jLhE^5lK63_cBI(ECse>oCXv50k#Ii1JR@o%zjfGFst%P<#9^)IiU{LU;(a zhws9n@V(%BkGcK@G!jmsJ_0ey?18i3yTSJn^ZfrpYJ?W`_do^bFQESZY2GBG35(|A zPFM=%@@6;yZh@t64=jdHLM`lhn2#A)MEM|;r{08WcLZt+j>3+xeZ9Z6U7$QYydM8+ zf{9ef1IwT~UKo@cp}wb~T)b|Fc zgCS8LrS2^ zrBDkP21{Ti)WW7ic_cTFj4VA5YQO}Pi>`p$v+Lntcncf}pMYK9d+;WB6#g6BvDmk; ze2H&R6_g>9pVYxU5loo7Bigbx^n;Diptiy3%ep{4Q!j zI#WMFze4vRrH9akNKyF*^f#pY_h$5a)EA|Z=Fg{T{ClR%cpM_n>uX7V3T>KR2TH&|PRVIvedm zol#G804X(~?I?`?j(&+ALm#1=&>cu=t&jY_Abd}U+`F(xVQw_Fnc&O$0sjlWkKPQ* z$M7zhVl)I5;KzEn4Jn=C!#oAAN4Ey$G4M}8epo=E7ERFKyEf(Tn-vt#QGJkp1HXaF z(9xjoudo}s0o9=2p)TlRbYe~2NWivJA-mBXe;j5khwajd>fWv-zt^8 zPkM%?hhlazX=UtWe0a)=xpvqITWg(=olZJdBxQwNC;!FSkaFVTq?KxPtg@t)?^V&d z{N$k>3kwIARe8Jm9c}N%lis!cs|uG#njG(;{xge0jggBTZ`FXlUbg}7^bJQ`Qulc*@NFvbNTZ(es3g`X;-~r88$z*k*fDeM zNDSXDavLIXGdB`TF^~@{?xw6{y1Cg+q?~Yt_d_e1bFCDAaQ3=LBAK$9W$L`+mF(G9 z>f%`QzuPq@oQorFIvLcbon*@RHdwy*>g!DXQmZB$PB_Wr3E3$QrM!RZ<8~;;Hd-qq z;RYu~bv&7}W0-P0mmr5VemigGpwi0v_{DZC61E7U(N-$k>{v~BmbkLqI9g}bFJ8K0 z`30k_b#_xEmaXvC462weo65pgot;gZMM2>VcBwHa=JWoSa~(Tj7HL)KW;r?8ddHyd z1>VDht8iR?9g$Sl%0yx@%^7nW8u0u&HzAJ_*O+YkCOiD&)#87piv}gW|7q)-KZBi* z^Q2`H1qp@tKkexE3%T(iK>zg)3S-7!f@hoD(u8BNm+4rlqN2j!&L;PGO|qh*b;^*p zxZk|L_3q-@S8(?euz%SlHf4GS=6?Yd*@D5gtSu}o{)f`JF>{#`P zcy)D^HPfoJrdsi`s>&JFdNU=mDa|M`Fgdf97&%l`ivXt^%^^9 z(bTHZ<3iIeh;z8KlPXg35!77}cimDqcmWlfQ{bK-`gnrLXf z<8_-fvCG1U6V686SSI2`z1fpybgW76K4j8Ot+`1(3d)woB2g>c_HZV$e^=DaWc5b) zFNK?E$y$;8G4ghtURS@$4z)PV5l72Qu_&`pFN2?5vNmD2I8nc_)NR}3w(a|};Ziq4 z=(gBFPw&9#=e1wxhP`o<@6NSdv42abB_4@J7?0~L%2jzRlQk<8KrL?E{W529)u;34 z!>nW#$+&Zjn%xZwSu1Wgv~7B-HRD9}WY{MEWaN)e)~w97ZPK)yyXq+qc!g7~VmIo) zA%my>{8Y8KqHf#f5Pqj|G?osvc<)cOPSeAY$UA>Mk#1#@_#Q)i(R5laO zdiPH&pF!{DgiSyEoZ$^%q)>#HCJ0sDnh0x&Iqd!ZtK^7=M7o*z{YS?;IBo1XO9Bt* z#la|ZV!0{eB#FWhOLCGeZJV-|U$Z52ydvR7O-(eF=9O!)iEyT~WRKfAW%}v@@8;^+ zxwc2_Ftv7m-FZ*t_iOF`UEvlTEW0_9lml!l9J6^OLybI2IE+xiQx)dx^yjcef}Xkm z=hQlFnwo?5RBP;OP4CAtM~HFwpG057fM{^?G=N#)gq^sR$ub}@!hSgGgEuW-7x}*` zWr5$eJ&jxE&lprtxDrQujWY)yf9$?F^WLImPLg|R!mOVStw}`F$rdYW$D-+&9m=lf zoa7H)vm0vJza_876e2=yr9BL2sg<+fD!^ETqRruyn%|FlTEV8$=UH-IGiJTkP2D_ z8M~#5c&pYHYb}gvYpIuxm5jHswQ6nER%IS-tF`S+JENAzd7Srm_Kwv*=8suVe&=0l zopt%v_kC+6dE)+(hk}yATO<1KHI$?1OjI$*n1&K#Do;?aF`tYuW+ePOJPi(`aWb3$ z=`u6nK)4(Zg%`kKa08qOyWy$ucBuJ>;5_&oTw+YY3}dy~bX)=#Y9MTeZ^Jpzjxy#v zcm-SvAB3ynM{q7|JtdsC8*ZijDr8}EKD#c1cR|hnBb)`NVujXC!ddKZ9--1g$A1(% zjHy4}m?qlY5g(5D0lbj@iKC6V7+wRl(XZeFIPQ#aBM&yyegw{ke}gmNxwv-#OhS2R z3mnM)W+#=waCbD|Hpm=v7d#sthD61@3rpdL(1rgEuY>E(3j5!Q_&!uf{t6YvzeAj5 zO2>pD7y}iOb6`Q1te|odybLO)KCFV<;R<*NYGX4tG;}bOK_erc0ky$6*dNY-L*Q(v zd9CnxxH{^;9LlgwWAVQx=I9XjK=Q&o0Evb<3}w*EP#eAnm1KW{TJRW@=LXnt!QoKj z$3PiU2Tz34p~f$Q8ovr^ol9*Y9N^I*m*t^6aV^w_0o1_#P~RVb{FsA$42Lg4E&L9Y z;eUjh_Zig2gUZ5~p9YVkJqBug8I&QFg{U$e5>C?`wJ(EOpgrOiC_}y)wZ9IPOy7nw z>|rPaz7M$o=2^%EGH*k<`oG`>uwQvN?-Hnk7S>adMOQ*i+zOR^0n`Qupca^VT%i}_|w zfih$|RI)a~Vp2hkTMgx@bx}JGWnda=+>H?fsHD6TDz^^66WHH86%BYP8t^)t#DMpp zlIesAQOqDerjn0=aCOABP`ThhZEz)&L03b${^scWyI>3LhhbTXF@J%B*x#JQZq&`` zP!=~sooq3b%g%>#?WJ%a+z;=8_dzAm+{t0AmqHofz*5)+wa#WZ7+wRl-VG50SkM=D zQ<237piXiaYT|QHN%sq=1>b^7(%(nye|8v}GI&4z6XDJ91*n`^J0+aI9?Fw(sE4Nj zExc_C{%@u7BRb@&ewE?IBj8}#qoF2LKyBO-BEFH3VG9>>@HPnWy;ZWEOi!p^Wj^mVYEd9^c7(>FFKR{kt zGo&`0HyLW%<9&D%{1^^^ zgQtfv8V(iX(U3>XltG1PUi5tjRESd0gWKS4_(AmjmUF^e@fE0b_duQ;vlouh{XZOa z{2J;SehPI9#&MieVFNrFE`f^O6;QF;50ymEKqc$TP`UJ*sQn%sN&7EQxz&$90*1g+ zr~{u2Ph@{n9(~aO<*GT5Xqa_Tdk;K?_Crvv{%O?y0BYkBtkUfn0%gGHh~uCZ-z49HmHprfRo`NsEyu$a_R4&#vOyBU};n6 zxiL_oYmC?mb&$1?*W9Gw>2M#^Iz3JJe=C(|=umRZpA|093Uz|DP_Au9g)-zVxDNgqTG+~6l;=9347#R3MH9XW&xcPyxoG&D@P1anF|_AG zZRkLS#Dg+81y6)ID39F;<;lHJuD=_~Q-|SM@ENFsy$7{k;jdB0v1q`c=Fsx-Pzz3j zn$Qe+5B1>r*FP#&m*a`ghJ-vP^^lJ!a`gZIN8cmRGKUb-;y z3{=RD!LjUbhH#8BI0a6E%itQg87enkfP>(>P=R~_F1S?=OJQKQ5F5M1woo<0du2^o2 zC@2BXMGjhm`pRA^3IPdOFyE!}RdfJp@lJFY>Ew0jmxxPIESn-~)8mlbIte|C4xu~H zHYD%OMLK0K`Wfmg@nu0>Cv=h1YeB3JemOJx~)BkDK`&a1V?BNd6qE+=Lz}*22uciu#_Y-G@v2Dv(4ruc3F) zSCF#40bPky^ggKkFt~QqsfEYGM)5DjE2v)*wFRZ^xTt*&yanwQk>DB*OI{< z6UGGZPpCT6+w9s*cN>PJ3~SkzSlZj{rE_+ppX^yRad=7pWq#5Pu9#FmD$}*WO=4_kCp_tPN@xEoN_~Od8HkygWIgv z*6yZL!S2e-f|9Deg*0yJvgxD~>rB~jW|fz)nG_p-zGBL^IX`1#PQrHi2`}v@t-IMx z=4`CPNwmAR%V~41pU|MBy$D~e)ah-?OS_iEHn>hE?QP7&<2mam+nt1$$A4{Z+VKkU z>Y|H3-^xpUVaNt{@DmDWWziV6a1w162RosI#~zY@f1 zKAY6!*p8&TaaPftX)hgji`Cghmvtw7EODD^oY_IL_Q~ViY|v77c4@TvsvutX{=kc? z*5LEt^7?~8cf+U|-SG^Gl&VP;4XiO8>2!BvP0g07G^46xepgKvk9NzWH74PvX>}@$ zZcx>*b$VS@eVwhF(KvN#V{OBf+Sl+$t zrv+~|e5a%#*g3W8#QK>Q3zANJR>GFevUR~{Q_Cu6t|zQ%IiA|g^-+C&!uPxB*dj#@ zcS{hTRyJv-n~JUPNO#58um4BY{YRB4F=oYrccPv}A}!FmLw!;N{utg1R{mmM&2Wbf(h5$8*Nka305mch+)ua=NdM?eu%E zi}_h6Y<2sw{E;2$PCA0+&5w=jz0PJ+`CKa9>A5!VbbF~>FrcL(sBd{LIBD+Kpmpw+ zDU1Bx{YS3X^=;ABCCAKKhp=#cStj8}7ub<;cg~v<44hwG*V38JIB_rU#5TD$;n?2C zb6MZ4^5cEGFwwPH+m`p-M8fOL^z53yu4K?f-jRJVcT@1Y1@j6^y;y#O6B_k&Pu8r- z#XEiLbf$CJMA0IfVO1T4`3$hW&E_^FNz+(|?e?>|-pAcdHtEM5+Ib&y6MbiNu;>eW zSDTf7aX{~O-W>*JF{ z8QS~HW>xBpNA`7kHkNn0GQ1MlmCCb!x4OAh9@d3dzqo=;b^EEOdp7jFCv+aU-gY{@ zkGCBu?6CPR&q*BFC#SB-`kOc+w}Y3*t+w-=-tEqp?ApY;YrB)YDaBLyI=9=_yFJrR zUWBQW;r-~0ZSpX~QFt?YL)zkwWo{mmEo-K6$fi`@Z7=x6*CZ)JJ=V&FuCKN$lYV>B z>GFE_$2<&gKeEHN`6MCH@rgm6$;rIVfiq;KLJ{43k6_u1?rz>qcp01J>r~N^z1xrM zh~=Z`7L&6gS9Hb~V#hXFKTa;i^0|caBIX5?m#hiySh6B0UwX7>$g(*lu+#k`C!qCg~Qes??Pl_Pq3n)r0;QhaphxroG$!-Jx*EPTe6E_d2Y-z U+(NfA6JCvc(Y?two!&M73q~K)vH$=8 diff --git a/languages/stream-pl_PL.po b/languages/stream-pl_PL.po index b40768818..416c3c126 100644 --- a/languages/stream-pl_PL.po +++ b/languages/stream-pl_PL.po @@ -2,740 +2,897 @@ msgid "" msgstr "" "Project-Id-Version: Stream\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/stream\n" -"POT-Creation-Date: 2014-01-21 19:44:03+00:00\n" -"PO-Revision-Date: 2014-01-21 23:05+0100\n" +"POT-Creation-Date: 2014-03-15 00:17+0100\n" +"PO-Revision-Date: 2014-03-15 00:19+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl_PL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.3\n" +"X-Generator: Poedit 1.6.4\n" "X-Poedit-Basepath: .\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Poedit-KeywordsList: __;_e;_x;_ngettext;_n;_gettext_noop;_nx;_nx_noop;_ex;" -"esc_attr__;esc_attr_e;esc_attr_x;esc_html__;esc_html_e;esc_html_x;_c;_nc\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ngettext:1,2;_n:1,2;_gettext_noop;" +"_nx:4c,1,2;_nx_noop:4c,1,2;_ex:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;" +"esc_html__;esc_html_e;esc_html_x:1,2c;_c;_nc:4c,1,2\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -#: connectors/comments.php:34 connectors/comments.php:66 +#: ../connectors/comments.php:36 ../connectors/comments.php:68 msgid "Comments" msgstr "Komentarze" -#: connectors/comments.php:44 connectors/menus.php:37 connectors/posts.php:37 -#: connectors/taxonomies.php:64 connectors/users.php:53 +#: ../connectors/comments.php:46 ../connectors/menus.php:39 +#: ../connectors/posts.php:39 ../connectors/taxonomies.php:70 +#: ../connectors/users.php:55 msgid "Created" msgstr "Utworzono" -#: connectors/comments.php:45 connectors/installer.php:47 +#: ../connectors/comments.php:47 ../connectors/installer.php:49 msgid "Edited" msgstr "Edytowano" -#: connectors/comments.php:46 +#: ../connectors/comments.php:48 msgid "Replied" msgstr "Odpowiedziano" -#: connectors/comments.php:47 +#: ../connectors/comments.php:49 msgid "Approved" msgstr "Zatwierdzono" -#: connectors/comments.php:48 +#: ../connectors/comments.php:50 msgid "Unapproved" msgstr "Odrzucono" -#: connectors/comments.php:49 connectors/posts.php:38 +#: ../connectors/comments.php:51 ../connectors/posts.php:40 msgid "Trashed" msgstr "Wyrzucono do kosza" -#: connectors/comments.php:50 +#: ../connectors/comments.php:52 msgid "Restored" msgstr "Przywrócono" -#: connectors/comments.php:51 +#: ../connectors/comments.php:53 msgid "Marked as Spam" msgstr "Oznaczono jako spam" -#: connectors/comments.php:52 +#: ../connectors/comments.php:54 msgid "Unmarked as Spam" msgstr "Przywrócono ze spamu" -#: connectors/comments.php:53 connectors/installer.php:46 -#: connectors/media.php:42 connectors/menus.php:39 connectors/posts.php:39 -#: connectors/taxonomies.php:66 connectors/users.php:54 -#: connectors/widgets.php:39 +#: ../connectors/comments.php:55 ../connectors/installer.php:48 +#: ../connectors/media.php:44 ../connectors/menus.php:41 +#: ../connectors/posts.php:41 ../connectors/taxonomies.php:72 +#: ../connectors/users.php:56 ../connectors/widgets.php:41 msgid "Deleted" msgstr "Usunięto" -#: connectors/comments.php:54 +#: ../connectors/comments.php:56 msgid "Duplicate" msgstr "Duplikat" -#: connectors/comments.php:55 +#: ../connectors/comments.php:57 msgid "Throttled" msgstr "Zahamowany" -#: connectors/comments.php:84 connectors/taxonomies.php:93 +#: ../connectors/comments.php:86 msgid "Edit" msgstr "Edytuj" -#: connectors/comments.php:86 +#: ../connectors/comments.php:89 msgid "Unapprove" msgstr "Odrzuć" -#: connectors/comments.php:94 +#: ../connectors/comments.php:97 msgid "Approve" msgstr "Zatwierdź" -#: connectors/comments.php:125 +#: ../connectors/comments.php:129 msgid "Guest" msgstr "Gość" -#: connectors/comments.php:161 +#: ../connectors/comments.php:165 msgid "a logged out user" msgstr "niezalogowanego" -#: connectors/comments.php:165 +#: ../connectors/comments.php:169 +#, php-format msgid "Comment flooding by %s detected and prevented" msgstr "Wykryto i powstrzymano flooding komentarzy użytkownika %s" -#: connectors/comments.php:181 connectors/comments.php:224 -#: connectors/comments.php:248 connectors/comments.php:272 -#: connectors/comments.php:296 connectors/comments.php:320 -#: connectors/comments.php:344 connectors/comments.php:371 -#: connectors/comments.php:398 +#: ../connectors/comments.php:186 ../connectors/comments.php:230 +#: ../connectors/comments.php:255 ../connectors/comments.php:280 +#: ../connectors/comments.php:305 ../connectors/comments.php:330 +#: ../connectors/comments.php:355 ../connectors/comments.php:383 +#: ../connectors/comments.php:411 msgid "a post" msgstr "wpis" -#: connectors/comments.php:182 +#: ../connectors/comments.php:187 msgid "approved automatically" msgstr "został automatycznie zatwierdzony" -#: connectors/comments.php:182 +#: ../connectors/comments.php:187 msgid "pending approval" msgstr "oczekuje na zatwierdzenie" -#: connectors/comments.php:189 +#: ../connectors/comments.php:195 +#, php-format msgctxt "" "1: Parent comment's author, 2: Comment author, 3: Post title, 4: Comment " "status" msgid "Reply to %1$s's comment by %2$s on %3$s %4$s" msgstr "Odpowiedź na komentarz użytkownika %1$s od %2$s do %3$s %4$s" -#: connectors/comments.php:201 +#: ../connectors/comments.php:207 +#, php-format msgctxt "1: Comment author, 2: Post title 3: Comment status" msgid "New comment by %1$s on %2$s %3$s" msgstr "Nowy komentarz użytkownika %1$s do %2$s %3$s" -#: connectors/comments.php:227 +#: ../connectors/comments.php:234 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s edited" msgstr "Komentarz użytkownika %1$s do %2$s został zmieniony" -#: connectors/comments.php:251 +#: ../connectors/comments.php:259 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s deleted permanently" msgstr "Komentarz użytkownika %1$s do %2$s został trwale usunięty" -#: connectors/comments.php:275 +#: ../connectors/comments.php:284 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s trashed" msgstr "Komentarz użytkownika %1$s do %2$s został wyrzucony do kosza" -#: connectors/comments.php:299 +#: ../connectors/comments.php:309 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s restored" msgstr "Komentarz użytkownika %1$s do %2$s został przywrócony" -#: connectors/comments.php:323 +#: ../connectors/comments.php:334 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s marked as spam" msgstr "Komentarz użytkownika %1$s do %2$s został oznaczony jako spam" -#: connectors/comments.php:347 +#: ../connectors/comments.php:359 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "%1$s's comment on %2$s unmarked as spam" msgstr "Komentarz użytkownika %1$s do %2$s został przywrócony ze spamu" -#: connectors/comments.php:374 +#: ../connectors/comments.php:387 +#, php-format msgctxt "Comment status transition. 1: Comment author, 2: Post title" msgid "%1$s's comment %2$s" msgstr "Komentarz użytkownika %1$s do %2$s został" -#: connectors/comments.php:401 +#: ../connectors/comments.php:415 +#, php-format msgctxt "1: Comment author, 2: Post title" msgid "Duplicate comment by %1$s prevented on %2$s" msgstr "Zapobiegnięto duplikatowi komentarza użytkownika %1$s do %2$s" -#: connectors/installer.php:33 +#: ../connectors/installer.php:35 msgid "Installer" msgstr "Instalator" -#: connectors/installer.php:43 +#: ../connectors/installer.php:45 msgid "Installed" msgstr "Zainstalowano" -#: connectors/installer.php:44 +#: ../connectors/installer.php:46 msgid "Activated" msgstr "Włączono" -#: connectors/installer.php:45 connectors/widgets.php:40 +#: ../connectors/installer.php:47 ../connectors/widgets.php:42 msgid "Deactivated" msgstr "Wyłączono" -#: connectors/installer.php:48 connectors/media.php:41 connectors/menus.php:38 -#: connectors/posts.php:36 connectors/settings.php:48 -#: connectors/taxonomies.php:65 connectors/users.php:52 -#: connectors/widgets.php:41 +#: ../connectors/installer.php:50 ../connectors/media.php:43 +#: ../connectors/menus.php:40 ../connectors/posts.php:38 +#: ../connectors/settings.php:73 ../connectors/taxonomies.php:71 +#: ../connectors/users.php:54 ../connectors/widgets.php:43 msgid "Updated" msgstr "Zaktualizowano" -#: connectors/installer.php:59 +#: ../connectors/installer.php:61 msgid "Plugins" msgstr "Wtyczki" -#: connectors/installer.php:60 +#: ../connectors/installer.php:62 msgid "Themes" msgstr "Motywy" -#: connectors/installer.php:61 +#: ../connectors/installer.php:63 msgid "WordPress" msgstr "WordPress" -#: connectors/installer.php:78 +#: ../connectors/installer.php:80 msgid "About" msgstr "O WordPressie" -#: connectors/installer.php:80 +#: ../connectors/installer.php:82 msgid "View Release Notes" msgstr "Pokaż informacje o tym wydaniu" -#: connectors/installer.php:110 +#: ../connectors/installer.php:145 +#, php-format msgctxt "" "Plugin/theme installation. 1: Type (plugin/theme), 2: Plugin/theme name, 3: " "Plugin/theme version" msgid "Installed %1$s: %2$s %3$s" msgstr "Zainstalowano %1$s: %2$s %3$s" -#: connectors/installer.php:142 +#: ../connectors/installer.php:187 +#, php-format msgctxt "" "Plugin/theme update. 1: Type (plugin/theme), 2: Plugin/theme name, 3: Plugin/" "theme version" msgid "Updated %1$s: %2$s %3$s" msgstr "Zaktualizowano %1$s: %2$s %3$s" -#: connectors/installer.php:172 connectors/installer.php:188 -#: connectors/installer.php:246 +#: ../connectors/installer.php:214 ../connectors/installer.php:231 +#: ../connectors/installer.php:299 msgid "network wide" msgstr "w całej sieci" -#: connectors/installer.php:174 +#: ../connectors/installer.php:218 +#, php-format msgctxt "1: Plugin name, 2: Single site or network wide" msgid "\"%1$s\" plugin activated %2$s" msgstr "Wtyczka \"%1$s\" została włączona %2$s" -#: connectors/installer.php:190 +#: ../connectors/installer.php:235 +#, php-format msgctxt "1: Plugin name, 2: Single site or network wide" msgid "\"%1$s\" plugin deactivated %2$s" msgstr "Wtyczka \"%1$s\" została wyłączona %2$s" -#: connectors/installer.php:204 +#: ../connectors/installer.php:249 +#, php-format msgid "\"%s\" theme activated" msgstr "Motyw \"%s\" został włączony" -#: connectors/installer.php:219 +#: ../connectors/installer.php:267 +#, php-format msgid "\"%s\" theme deleted" msgstr "Motyw \"%s\" został usunięty" -#: connectors/installer.php:248 +#: ../connectors/installer.php:302 +#, php-format msgid "\"%s\" plugin deleted" msgstr "Wtyczka \"%s\" została usunięta" -#: connectors/installer.php:287 +#: ../connectors/installer.php:345 +#, php-format msgctxt "Plugin/theme editing. 1: Type (plugin/theme), 2: Plugin/theme name" msgid "Edited %1$s: %2$s" msgstr "Edytowano %1$s: %2$s" -#: connectors/installer.php:305 +#: ../connectors/installer.php:364 +#, php-format msgid "WordPress auto-updated to %s" msgstr "WordPress został automatycznie zaktualizowany do wersji %s" -#: connectors/installer.php:307 +#: ../connectors/installer.php:366 +#, php-format msgid "WordPress updated to %s" msgstr "WordPress został zaktualizowany do wersji %s" -#: connectors/media.php:29 connectors/media.php:55 connectors/settings.php:64 +#: ../connectors/media.php:31 ../connectors/settings.php:89 msgid "Media" msgstr "Media" -#: connectors/media.php:39 +#: ../connectors/media.php:41 msgid "Attached" msgstr "Załączono" -#: connectors/media.php:40 +#: ../connectors/media.php:42 msgid "Uploaded" msgstr "Wysłano" -#: connectors/media.php:43 connectors/menus.php:40 +#: ../connectors/media.php:45 ../connectors/menus.php:42 msgid "Assigned" msgstr "Przypisano" -#: connectors/media.php:44 connectors/menus.php:41 +#: ../connectors/media.php:46 ../connectors/menus.php:43 msgid "Unassigned" msgstr "Odłączono" -#: connectors/media.php:70 +#: ../connectors/media.php:59 +msgid "Image" +msgstr "Obrazek" + +#: ../connectors/media.php:60 +msgid "Audio" +msgstr "Plik dźwiękowy" + +#: ../connectors/media.php:61 +msgid "Video" +msgstr "Filmy" + +#: ../connectors/media.php:62 +msgid "Document" +msgstr "Dokument" + +#: ../connectors/media.php:63 +msgid "Spreadsheet" +msgstr "Arkusz kalkulacyjny" + +#: ../connectors/media.php:64 +msgid "Interactive" +msgstr "Interaktywny" + +#: ../connectors/media.php:65 +msgid "Text" +msgstr "Tekst" + +#: ../connectors/media.php:66 +msgid "Archive" +msgstr "Archiwum" + +#: ../connectors/media.php:67 +msgid "Code" +msgstr "Kod" + +#: ../connectors/media.php:105 msgid "Edit Media" msgstr "Edytuj medium" -#: connectors/media.php:73 connectors/posts.php:70 -#: connectors/taxonomies.php:94 +#: ../connectors/media.php:108 ../connectors/posts.php:72 +#: ../connectors/taxonomies.php:107 msgid "View" msgstr "Zobacz" -#: connectors/media.php:87 +#: ../connectors/media.php:124 +#, php-format msgctxt "1: Attachment title, 2: Parent post title" msgid "Attached \"%1$s\" to \"%2$s\"" msgstr "Załączono \"%1$s\" do \"%2$s\"" -#: connectors/media.php:93 +#: ../connectors/media.php:129 +#, php-format msgid "Added \"%s\" to Media library" msgstr "Dodano \"%s\" do biblioteki mediów" -#: connectors/media.php:115 +#: ../connectors/media.php:154 +#, php-format msgid "Updated \"%s\"" msgstr "Zaktualizowano \"%s\"" -#: connectors/media.php:135 +#: ../connectors/media.php:175 +#, php-format msgid "Deleted \"%s\"" msgstr "Usunięto \"%s\"" -#: connectors/media.php:150 +#: ../connectors/media.php:198 +#, php-format msgid "Edited image \"%s\"" msgstr "Edytowano obrazek \"%s\"" -#: connectors/menus.php:27 +#: ../connectors/menus.php:29 msgid "Menus" msgstr "Menu" -#: connectors/menus.php:80 +#: ../connectors/menus.php:84 msgid "Edit Menu" msgstr "Edytuj menu" -#: connectors/menus.php:94 +#: ../connectors/menus.php:100 +#, php-format msgid "Created new menu \"%s\"" msgstr "Utworzono menu \"%s\"" -#: connectors/menus.php:112 +#: ../connectors/menus.php:120 +#, php-format msgctxt "Menu name" msgid "Updated menu \"%s\"" msgstr "Zaktualizowano menu \"%s\"" -#: connectors/menus.php:128 +#: ../connectors/menus.php:137 +#, php-format msgctxt "Menu name" msgid "Deleted \"%s\"" msgstr "Usunięto \"%s\"" -#: connectors/menus.php:163 +#: ../connectors/menus.php:174 +#, php-format msgctxt "1: Menu name, 2: Theme location" msgid "\"%1$s\" has been unassigned from \"%2$s\"" msgstr "Odłączono \"%1$s\" od \"%2$s\"" -#: connectors/menus.php:171 +#: ../connectors/menus.php:182 +#, php-format msgctxt "1: Menu name, 2: Theme location" msgid "\"%1$s\" has been assigned to \"%2$s\"" msgstr "Przypisano \"%1$s\" do \"%2$s\"" -#: connectors/posts.php:26 +#: ../connectors/posts.php:28 msgid "Posts" msgstr "Wpisy" -#: connectors/posts.php:67 +#: ../connectors/posts.php:69 +#, php-format msgctxt "Post type singular name" msgid "Edit %s" msgstr "Edytuj %s" -#: connectors/posts.php:74 +#: ../connectors/posts.php:76 msgid "Revision" msgstr "Rewizja" -#: connectors/posts.php:96 +#: ../connectors/posts.php:98 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s drafted" msgstr "Zapisano %2$s \"%1$s\" jako szkic" -#: connectors/posts.php:104 connectors/posts.php:112 +#: ../connectors/posts.php:105 ../connectors/posts.php:112 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s published" msgstr "Opublikowano %2$s \"%1$s\"" -#: connectors/posts.php:119 +#: ../connectors/posts.php:118 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s unpublished" msgstr "Wycofano %2$s \"%1$s\"" -#: connectors/posts.php:126 +#: ../connectors/posts.php:124 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s trashed" msgstr "Wyrzucono %2$s \"%1$s\" do kosza" -#: connectors/posts.php:134 +#: ../connectors/posts.php:131 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s updated" msgstr "Zaktualizowano %2$s \"%1$s\"" -#: connectors/posts.php:196 +#: ../connectors/posts.php:197 +#, php-format msgctxt "1: Post title, 2: Post type singular name" msgid "\"%1$s\" %2$s deleted from trash" msgstr "Usunięto %2$s \"%1$s\" z kosza" -#: connectors/settings.php:38 connectors/settings.php:59 includes/admin.php:99 -#: includes/admin.php:214 +#: ../connectors/posts.php:233 +msgid "Post" +msgstr "Wpis" + +#: ../connectors/settings.php:63 ../connectors/settings.php:84 +#: ../includes/admin.php:114 ../includes/admin.php:270 msgid "Settings" msgstr "Ustawienia" -#: connectors/settings.php:60 includes/settings.php:56 +#: ../connectors/settings.php:85 ../includes/settings.php:156 msgid "General" msgstr "Ogólne" -#: connectors/settings.php:61 +#: ../connectors/settings.php:86 msgid "Writing" msgstr "Pisanie" -#: connectors/settings.php:62 +#: ../connectors/settings.php:87 msgid "Reading" msgstr "Czytanie" -#: connectors/settings.php:63 +#: ../connectors/settings.php:88 msgid "Discussion" msgstr "Dyskusja" -#: connectors/settings.php:65 +#: ../connectors/settings.php:90 msgid "Permalinks" msgstr "Bezpośrednie odnośniki" -#: connectors/settings.php:77 +#: ../connectors/settings.php:91 ../includes/admin.php:102 +#: ../includes/admin.php:103 +msgid "Stream" +msgstr "Stream" + +#: ../connectors/settings.php:92 +msgid "Custom Background" +msgstr "Własne tło" + +#: ../connectors/settings.php:93 +msgid "Custom Header" +msgstr "Własny nagłówek" + +#: ../connectors/settings.php:158 msgid "Site Title" msgstr "Tytuł witryny" -#: connectors/settings.php:78 +#: ../connectors/settings.php:159 msgid "Tagline" msgstr "Opis" -#: connectors/settings.php:79 +#: ../connectors/settings.php:160 msgid "WordPress Address (URL)" msgstr "Adres WordPressa (URL)" -#: connectors/settings.php:80 +#: ../connectors/settings.php:161 msgid "Site Address (URL)" msgstr "Adres witryny (URL)" -#: connectors/settings.php:81 +#: ../connectors/settings.php:162 msgid "E-mail Address" msgstr "Adres e-mail" -#: connectors/settings.php:82 +#: ../connectors/settings.php:163 msgid "Membership" msgstr "Członkostwo" -#: connectors/settings.php:83 +#: ../connectors/settings.php:164 msgid "New User Default Role" msgstr "Domyślna rola nowych użytkowników" -#: connectors/settings.php:84 +#: ../connectors/settings.php:165 msgid "Timezone" msgstr "Strefa czasowa" -#: connectors/settings.php:85 +#: ../connectors/settings.php:166 msgid "Date Format" msgstr "Format daty" -#: connectors/settings.php:86 +#: ../connectors/settings.php:167 msgid "Time Format" msgstr "Format godziny" -#: connectors/settings.php:87 +#: ../connectors/settings.php:168 msgid "Week Starts On" msgstr "Pierwszy dzień tygodnia" -#: connectors/settings.php:89 connectors/settings.php:90 +#: ../connectors/settings.php:170 ../connectors/settings.php:171 msgid "Formatting" msgstr "Formatowanie" -#: connectors/settings.php:91 +#: ../connectors/settings.php:172 msgid "Default Post Category" msgstr "Domyślna kategoria wpisów" -#: connectors/settings.php:92 +#: ../connectors/settings.php:173 msgid "Default Post Format" msgstr "Domyślny format wpisu" -#: connectors/settings.php:93 +#: ../connectors/settings.php:174 msgid "Mail Server Address" msgstr "Adres serwera pocztowego" -#: connectors/settings.php:94 +#: ../connectors/settings.php:175 msgid "Mail Server Login Name" msgstr "Nazwa użytkownika serwera pocztowego" -#: connectors/settings.php:95 +#: ../connectors/settings.php:176 msgid "Mail Server Password" msgstr "Hasło serwera pocztowego" -#: connectors/settings.php:96 +#: ../connectors/settings.php:177 msgid "Default Mail Category" msgstr "Domyślna kategoria wpisów dodawanych przez e-mail" -#: connectors/settings.php:97 +#: ../connectors/settings.php:178 msgid "Update Services" msgstr "Usługi aktualizacji" -#: connectors/settings.php:99 connectors/settings.php:100 -#: connectors/settings.php:101 +#: ../connectors/settings.php:180 ../connectors/settings.php:181 +#: ../connectors/settings.php:182 msgid "Front page displays" msgstr "Strona główna wyświetla" -#: connectors/settings.php:102 +#: ../connectors/settings.php:183 msgid "Blog pages show at most" msgstr "Strony blogu wyświetlają maksymalnie" -#: connectors/settings.php:103 +#: ../connectors/settings.php:184 msgid "Syndication feeds show the most recent" msgstr "Kanały nowości wyświetlają ostatnie" -#: connectors/settings.php:104 +#: ../connectors/settings.php:185 msgid "For each article in a feed, show" msgstr "W kanałach nowości wyświetlaj" -#: connectors/settings.php:105 +#: ../connectors/settings.php:186 msgid "Search Engine Visibility" msgstr "Widoczność dla wyszukiwarek" -#: connectors/settings.php:107 connectors/settings.php:108 -#: connectors/settings.php:109 +#: ../connectors/settings.php:188 ../connectors/settings.php:189 +#: ../connectors/settings.php:190 msgid "Default article settings" msgstr "Domyślne ustawienia nowych artykułów" -#: connectors/settings.php:110 connectors/settings.php:111 -#: connectors/settings.php:112 connectors/settings.php:113 -#: connectors/settings.php:114 connectors/settings.php:115 -#: connectors/settings.php:116 connectors/settings.php:117 -#: connectors/settings.php:118 connectors/settings.php:119 +#: ../connectors/settings.php:191 ../connectors/settings.php:192 +#: ../connectors/settings.php:193 ../connectors/settings.php:194 +#: ../connectors/settings.php:195 ../connectors/settings.php:196 +#: ../connectors/settings.php:197 ../connectors/settings.php:198 +#: ../connectors/settings.php:199 ../connectors/settings.php:200 msgid "Other comment settings" msgstr "Pozostałe ustawienia komentarzy" -#: connectors/settings.php:120 connectors/settings.php:121 +#: ../connectors/settings.php:201 ../connectors/settings.php:202 msgid "E-mail me whenever" msgstr "Wyślij mi e-maila za każdym razem, kiedy" -#: connectors/settings.php:122 connectors/settings.php:123 +#: ../connectors/settings.php:203 ../connectors/settings.php:204 msgid "Before a comment appears" msgstr "Nim komentarz pojawi się na blogu," -#: connectors/settings.php:124 connectors/settings.php:125 +#: ../connectors/settings.php:205 ../connectors/settings.php:206 msgid "Comment Moderation" msgstr "Moderacja komentarzy" -#: connectors/settings.php:126 +#: ../connectors/settings.php:207 msgid "Comment Blacklist" msgstr "Czarna lista komentarzy" -#: connectors/settings.php:127 +#: ../connectors/settings.php:208 msgid "Avatar Display" msgstr "Wyświetlanie obrazków profilowych" -#: connectors/settings.php:128 +#: ../connectors/settings.php:209 msgid "Avatar Maximum Rating" msgstr "Najwyższa dozwolona kategoria" -#: connectors/settings.php:129 +#: ../connectors/settings.php:210 msgid "Default Avatar" msgstr "Domyślny obrazek profilowy" -#: connectors/settings.php:131 connectors/settings.php:132 -#: connectors/settings.php:133 +#: ../connectors/settings.php:212 ../connectors/settings.php:213 +#: ../connectors/settings.php:214 msgid "Thumbnail Image Size" msgstr "Rozmiar miniatury" -#: connectors/settings.php:134 connectors/settings.php:135 +#: ../connectors/settings.php:215 ../connectors/settings.php:216 msgid "Medium Image Size" msgstr "Średni rozmiar" -#: connectors/settings.php:136 connectors/settings.php:137 +#: ../connectors/settings.php:217 ../connectors/settings.php:218 msgid "Large Image Size" msgstr "Duży rozmiar" -#: connectors/settings.php:138 +#: ../connectors/settings.php:219 msgid "Uploading Files Organization" msgstr "Porządkowanie wysyłanych plików" -#: connectors/settings.php:140 +#: ../connectors/settings.php:221 msgid "Permalink structure" msgstr "Struktura bezpośrednich odnośników" -#: connectors/settings.php:141 +#: ../connectors/settings.php:222 msgid "Category base" msgstr "Alias kategorii" -#: connectors/settings.php:142 +#: ../connectors/settings.php:223 msgid "Tag base" msgstr "Alias tagów" -#: connectors/settings.php:174 +#: ../connectors/settings.php:252 +msgid "Background Image" +msgstr "Obrazek tła" + +#: ../connectors/settings.php:253 +msgid "Background Position" +msgstr "Położenie tła" + +#: ../connectors/settings.php:254 +msgid "Background Repeat" +msgstr "Powtarzanie tła" + +#: ../connectors/settings.php:255 +msgid "Background Attachment" +msgstr "Zaczepienie tła" + +#: ../connectors/settings.php:256 +msgid "Background Color" +msgstr "Kolor tła" + +#: ../connectors/settings.php:258 +msgid "Header Image" +msgstr "Obrazek w nagłówku" + +#: ../connectors/settings.php:259 +msgid "Text Color" +msgstr "Kolor tekstu" + +#: ../connectors/settings.php:375 +#, php-format msgid "Edit %s Settings" msgstr "Edytuj ustawienia %s" -#: connectors/settings.php:255 +#: ../connectors/settings.php:493 +#, php-format msgid "\"%s\" setting was updated" msgstr "Opcja \"%s\" została zaktualizowana" -#: connectors/taxonomies.php:54 +#: ../connectors/taxonomies.php:60 msgid "Taxonomies" msgstr "Taksonomie" -#: connectors/taxonomies.php:113 +#: ../connectors/taxonomies.php:106 +#, php-format +msgctxt "Term singular name" +msgid "Edit %s" +msgstr "Edytuj %s" + +#: ../connectors/taxonomies.php:131 +#, php-format msgctxt "1: Term name, 2: Taxonomy singular label" msgid "\"%1$s\" %2$s created" msgstr "Utworzono %2$s \"%1$s\"" -#: connectors/taxonomies.php:137 +#: ../connectors/taxonomies.php:157 +#, php-format msgctxt "1: Term name, 2: Taxonomy singular label" msgid "\"%1$s\" %2$s deleted" msgstr "Usunięto %2$s \"%1$s\"" -#: connectors/taxonomies.php:169 +#: ../connectors/taxonomies.php:193 +#, php-format msgctxt "1: Term name, 2: Taxonomy singular label" msgid "\"%1$s\" %2$s updated" msgstr "Zaktualizowano %2$s \"%1$s\"" -#: connectors/users.php:42 connectors/users.php:70 +#: ../connectors/users.php:44 ../connectors/users.php:72 msgid "Users" msgstr "Użytkownicy" -#: connectors/users.php:55 +#: ../connectors/users.php:57 msgid "Password Reset" msgstr "Zresetowano hasło" -#: connectors/users.php:56 +#: ../connectors/users.php:58 msgid "Forgot Password" msgstr "Zapomniane hasło" -#: connectors/users.php:57 +#: ../connectors/users.php:59 msgid "Login" msgstr "Zalogowano się" -#: connectors/users.php:58 +#: ../connectors/users.php:60 msgid "Logout" msgstr "Wylogowano się" -#: connectors/users.php:59 +#: ../connectors/users.php:61 msgid "Failed Login" msgstr "Nieudane logowanie" -#: connectors/users.php:85 +#: ../connectors/users.php:73 +msgid "Sessions" +msgstr "Sesje" + +#: ../connectors/users.php:74 +msgid "Profiles" +msgstr "Profile" + +#: ../connectors/users.php:89 msgid "Edit Profile" msgstr "Edytuj profil" -#: connectors/users.php:131 +#: ../connectors/users.php:136 msgid "New user registration" msgstr "Rejestracja użytkownika" -#: connectors/users.php:134 +#: ../connectors/users.php:140 +#, php-format msgctxt "1: User display name, 2: User role" msgid "New user account created for %1$s (%2$s)" msgstr "Konto użytkownika %1$s zostało utworzone (%2$s)" -#: connectors/users.php:163 +#: ../connectors/users.php:166 +#, php-format msgid "%s's profile was updated" msgstr "Profil użytkownika %s został zaktualizowany" -#: connectors/users.php:186 +#: ../connectors/users.php:189 +#, php-format msgctxt "1: User display name, 2: Old role, 3: New role" msgid "%1$s's role was changed from %2$s to %3$s" msgstr "Rola użytkownika %1$s została zmieniona z %2$s na %3$s" -#: connectors/users.php:210 +#: ../connectors/users.php:210 +#, php-format msgid "%s's password was reset" msgstr "Hasło użytkownika %s zostało zresetowane" -#: connectors/users.php:234 +#: ../connectors/users.php:233 +#, php-format msgid "%s's password was requested to be reset" msgstr "Hasło użytkownika %s zostało zgłoszone do zresetowania" -#: connectors/users.php:254 +#: ../connectors/users.php:251 +#, php-format msgid "%s logged in" msgstr "%s się zalogował" -#: connectors/users.php:279 +#: ../connectors/users.php:274 +#, php-format msgid "%s logged out" msgstr "%s się wylogował" -#: connectors/users.php:317 +#: ../connectors/users.php:309 +#, php-format msgctxt "1: User display name, 2: User roles" msgid "%1$s's account was deleted (%2$s)" msgstr "Konto użytkownika %1$s zostało usunięte (%2$s)" -#: connectors/users.php:326 +#: ../connectors/users.php:317 +#, php-format msgid "User account #%d was deleted" msgstr "Konto użytkownika #%d zostało usunięte" -#: connectors/users.php:354 +#: ../connectors/users.php:344 +#, php-format msgid "Invalid login attempt for %s" msgstr "Nieudana próba logowania użytkownika %s" -#: connectors/widgets.php:28 connectors/widgets.php:53 +#: ../connectors/widgets.php:30 ../connectors/widgets.php:269 +#: ../connectors/widgets.php:316 msgid "Widgets" msgstr "Widgety" -#: connectors/widgets.php:38 +#: ../connectors/widgets.php:40 msgid "Added" msgstr "Dodano" -#: connectors/widgets.php:42 +#: ../connectors/widgets.php:44 msgid "Sorted" msgstr "Zmieniono kolejność" -#: connectors/widgets.php:69 +#: ../connectors/widgets.php:62 +msgid "Inactive Widgets" +msgstr "Nieużywane widgety" + +#: ../connectors/widgets.php:80 msgid "Edit Widget Area" msgstr "Edytuj strefę widgetów" -#: connectors/widgets.php:95 -msgctxt "1: Widget title, 2: Sidebar name" -msgid "\"%1$s\" from \"%2$s\" has been deactivated" -msgstr "Wyłączono \"%1$s\" z \"%2$s\"" +#: ../connectors/widgets.php:110 +#, php-format +msgctxt "1: Widget title" +msgid "\"%1$s\" has been deactivated" +msgstr "Wyłączono \"%1$s\"" -#: connectors/widgets.php:135 +#: ../connectors/widgets.php:154 +#, php-format msgctxt "1: Widget title, 2: Sidebar name" msgid "\"%1$s\" has been added to \"%2$s\"" msgstr "Dodano \"%1$s\" do \"%2$s\"" -#: connectors/widgets.php:146 +#: ../connectors/widgets.php:165 +#, php-format msgctxt "1: Widget title, 2: Sidebar name" msgid "\"%1$s\" has been deleted from \"%2$s\"" msgstr "Usunięto \"%1$s\" z \"%2$s\"" -#: connectors/widgets.php:199 +#: ../connectors/widgets.php:222 +#, php-format msgctxt "1: Widget title, 2: Sidebar name" msgid "Updated \"%1$s\" in \"%2$s\"" msgstr "Zaktualizowano \"%1$s\" w \"%2$s\"" -#: connectors/widgets.php:250 +#: ../connectors/widgets.php:275 +#, php-format msgctxt "Sidebar name" -msgid "\"%s\" widgets were reordered" +msgid "Widgets in \"%s\" were reordered" msgstr "Kolejność widgetów w \"%s\" została zmieniona" -#: includes/admin.php:74 +#: ../includes/admin.php:89 msgid "All records have been successfully erased." msgstr "Wszystkie zapisy zostały usunięte." -#. Plugin Name of the plugin/theme -#: includes/admin.php:87 includes/admin.php:88 -msgid "Stream" -msgstr "Stream" - -#: includes/admin.php:98 includes/admin.php:238 +#: ../includes/admin.php:113 ../includes/admin.php:294 msgid "Stream Settings" msgstr "Ustawienia Stream" -#: includes/admin.php:136 +#: ../includes/admin.php:171 msgid "" "Are you sure you want to delete all Stream activity records from the " "database? This cannot be undone." @@ -743,7 +900,7 @@ msgstr "" "Czy na pewno chcesz usunąć całą aktywność Stream z bazy danych? Tej " "czynności nie można cofnąć." -#: includes/admin.php:137 +#: ../includes/admin.php:172 msgid "" "Are you sure you want to uninstall and deactivate Stream? This will delete " "all Stream tables from the database and cannot be undone." @@ -751,52 +908,125 @@ msgstr "" "Czy na pewno chcesz odinstalować i wyłączyć Stream? Ta czynność usunie " "wszystkie tabele Stream z bazy danych i nie można jej cofnąć." -#: includes/admin.php:223 +#: ../includes/admin.php:279 msgid "Uninstall" msgstr "Odinstaluj" -#: includes/admin.php:287 +#: ../includes/admin.php:343 msgid "Stream Records" msgstr "Zapisy Stream" -#: includes/admin.php:450 +#: ../includes/admin.php:515 msgid "Stream Activity" msgstr "Aktywność Stream" -#: includes/admin.php:469 +#: ../includes/admin.php:559 msgid "Sorry, no activity records were found." msgstr "Niestety żadne zapisy aktywności nie zostały odnalezione." -#: includes/admin.php:495 +#: ../includes/admin.php:586 +#, php-format msgctxt "1: Time, 2: User profile URL, 3: User display name" msgid "%1$s ago by %3$s" msgstr "%1$s temu przez %3$s" -#: includes/admin.php:506 includes/list-table.php:134 +#: ../includes/admin.php:596 +#, php-format msgid "%s ago" msgstr "%s temu" -#: includes/admin.php:531 -msgid "View all Stream Records" -msgstr "Wyświetl wszystkie Zapisy Stream" +#: ../includes/admin.php:650 +msgid "View all records" +msgstr "Wyświetl wszystkie zapisy" + +#: ../includes/admin.php:652 +msgid "View All" +msgstr "Zobacz wszystko" + +#: ../includes/admin.php:667 +msgid "Go to the first page" +msgstr "Idź do pierwszej strony" + +#: ../includes/admin.php:675 +msgid "Go to the previous page" +msgstr "Idź do poprzedniej strony" + +#: ../includes/admin.php:682 +#, php-format +msgctxt "paging" +msgid "%1$s of %2$s" +msgstr "%1$s z %2$s" -#: includes/admin.php:532 -msgid "More" -msgstr "Więcej" +#: ../includes/admin.php:687 +msgid "Go to the next page" +msgstr "Idź do następnej strony" -#: includes/admin.php:554 -msgid "Number of Records" -msgstr "Liczba zapisów" +#: ../includes/admin.php:696 +msgid "Go to the last page" +msgstr "Idź do ostatniej strony" -#: includes/feeds.php:73 +#: ../includes/admin.php:732 ../includes/list-table.php:18 +msgid "Records per page" +msgstr "Liczba zapisów na stronę" + +#: ../includes/admin.php:879 +#, php-format +msgid "One more result..." +msgid_plural "%d more results..." +msgstr[0] "Jeden wynik więcej..." +msgstr[1] "%d wyniki więcej..." +msgstr[2] "%d wyników więcej..." + +#: ../includes/connectors.php:80 +#, php-format +msgid "%s class wasn't loaded because it doesn't extends the %s class." +msgstr "Klasa %s nie została załadowana, ponieważ nie rozszerza klasy %s" + +#: ../includes/date-interval.php:38 +msgid "Today" +msgstr "Dzisiaj" + +#: ../includes/date-interval.php:42 +msgid "Yesterday" +msgstr "Wczoraj" + +#: ../includes/date-interval.php:47 ../includes/date-interval.php:52 +#: ../includes/date-interval.php:57 +#, php-format +msgid "Last %d Days" +msgstr "Ostatnie %d dni" + +#: ../includes/date-interval.php:62 +msgid "This Month" +msgstr "Obecny miesiąc" + +#: ../includes/date-interval.php:66 +msgid "Last Month" +msgstr "Zeszły miesiąc" + +#: ../includes/date-interval.php:71 ../includes/date-interval.php:76 +#: ../includes/date-interval.php:81 +#, php-format +msgid "Last %d Months" +msgstr "Ostatnie %d miesięcy" + +#: ../includes/date-interval.php:86 +msgid "This Year" +msgstr "Obecny rok" + +#: ../includes/date-interval.php:90 +msgid "Last Year" +msgstr "Zeszły rok" + +#: ../includes/feeds.php:89 msgid "Stream Feeds Key" msgstr "Klucz kanału Stream" -#: includes/feeds.php:77 +#: ../includes/feeds.php:93 msgid "Generate new key" msgstr "Wygeneruj nowy klucz" -#: includes/feeds.php:79 +#: ../includes/feeds.php:95 msgid "" "This is your private key used for accessing feeds of Stream Records " "securely. You can change your key at any time by generating a new one using " @@ -806,19 +1036,19 @@ msgstr "" "Zapisów Stream. Możesz w każdej wygenerować nowy klucz klikając na powyższy " "link." -#: includes/feeds.php:81 +#: ../includes/feeds.php:97 msgid "RSS Feed" msgstr "Kanał RSS" -#: includes/feeds.php:83 +#: ../includes/feeds.php:99 msgid "JSON Feed" msgstr "Kanał JSON" -#: includes/feeds.php:97 +#: ../includes/feeds.php:113 msgid "Access Denied" msgstr "Wstęp wzbroniony" -#: includes/feeds.php:98 +#: ../includes/feeds.php:114 msgid "" "You don't have permission to view this feed, please contact your site " "Administrator." @@ -826,113 +1056,120 @@ msgstr "" "Nie masz uprawnień, by wyświetlić ten kanał. Skontaktuj się z " "Administratorem strony." -#: includes/feeds.php:160 +#: ../includes/feeds.php:193 msgid "Stream Feed" msgstr "Kanał Stream" -#: includes/list-table.php:18 -msgid "Records per page" -msgstr "Liczba zapisów na stronę" +#: ../includes/filters.php:50 +msgid "Invalid use, type must be one of INPUT_* family." +msgstr "Nieprawidłowe użycie, stała musi należeć do grupy INPUT_*" -#: includes/list-table.php:38 +#: ../includes/filters.php:62 +msgid "Filter not supported." +msgstr "Filtr nie jest wspierany." + +#: ../includes/list-table.php:61 msgid "Date" msgstr "Data" -#: includes/list-table.php:39 +#: ../includes/list-table.php:62 msgid "Summary" msgstr "Streszczenie" -#: includes/list-table.php:40 +#: ../includes/list-table.php:63 msgid "Author" msgstr "Autor" -#: includes/list-table.php:41 +#: ../includes/list-table.php:64 msgid "Connector" msgstr "Łącznik" -#: includes/list-table.php:42 +#: ../includes/list-table.php:65 msgid "Context" msgstr "Kontekst" -#: includes/list-table.php:43 +#: ../includes/list-table.php:66 msgid "Action" msgstr "Akcja" -#: includes/list-table.php:44 +#: ../includes/list-table.php:67 msgid "IP Address" msgstr "Adres IP" -#: includes/list-table.php:45 +#: ../includes/list-table.php:68 msgid "ID" msgstr "ID" -#: includes/list-table.php:150 +#: ../includes/list-table.php:183 msgid "View all records for this object" msgstr "Pokaż wszystkie zapisy dla tego obiektu" -#: includes/list-table.php:173 +#: ../includes/list-table.php:214 msgid "N/A" msgstr "n/d" -#: includes/list-table.php:301 +#: ../includes/list-table.php:448 msgid "authors" msgstr "autorzy" -#: includes/list-table.php:309 +#: ../includes/list-table.php:457 msgid "connectors" msgstr "łączniki" -#: includes/list-table.php:317 +#: ../includes/list-table.php:462 msgid "contexts" msgstr "konteksty" -#: includes/list-table.php:325 +#: ../includes/list-table.php:467 msgid "actions" msgstr "akcje" -#: includes/list-table.php:337 +#: ../includes/list-table.php:487 msgid "Filter" msgstr "Przefiltruj" -#: includes/list-table.php:356 +#: ../includes/list-table.php:517 +#, php-format msgid "Show all %s" msgstr "Wszystko: %s" -#: includes/list-table.php:369 +#: ../includes/list-table.php:532 msgid "Search Records" msgstr "Szukaj zapisów" -#: includes/list-table.php:389 -msgid "Date start" +#: ../includes/list-table.php:558 +msgid "All Time" +msgstr "Kiedykolwiek" + +#: ../includes/list-table.php:560 +msgid "Custom" +msgstr "Własne" + +#: ../includes/list-table.php:579 +msgid "Start date" msgstr "Data początkowa" -#: includes/list-table.php:391 -msgid "Date end" +#: ../includes/list-table.php:588 +msgid "End date" msgstr "Data końcowa" -#: includes/list-table.php:455 +#: ../includes/list-table.php:658 msgid "Live updates" msgstr "Aktualizacje na żywo" -#: includes/list-table.php:461 includes/settings.php:83 +#: ../includes/list-table.php:664 ../includes/settings.php:179 msgid "Enabled" msgstr "Włączone" -#: includes/settings.php:60 -msgid "Log Activity for" -msgstr "Role zapisywane w dzienniku" - -#: includes/settings.php:62 -msgid "Only the selected roles above will have their activity logged." -msgstr "" -"Tylko aktywność użytkowników o wybranych powyżej rolach zostanie zapisana w " -"dzienniku." +#: ../includes/settings.php:87 +msgid "There was an error in the request" +msgstr "Wystąpił błąd w żądaniu" -#: includes/settings.php:68 +#: ../includes/settings.php:160 msgid "Role Access" msgstr "Dostęp ról" -#: includes/settings.php:70 +#: ../includes/settings.php:162 msgid "" "Users from the selected roles above will have permission to view Stream " "Records. However, only site Administrators can access Stream Settings." @@ -940,29 +1177,28 @@ msgstr "" "Użytkownicy z wybranymi powyżej rolami będą mogli wyświetlać Zapisy Stream. " "Tylko Administratorzy jednak otrzymają dostęp do Ustawień Stream." -#: includes/settings.php:76 +#: ../includes/settings.php:168 msgid "Private Feeds" msgstr "Prywatne kanały" -#: includes/settings.php:79 +#: ../includes/settings.php:171 +#, php-format msgid "" "Users from the selected roles above will be given a private key found in " -"their user profile to access feeds of Stream " -"Records securely." +"their %suser profile%s to access feeds of Stream Records securely." msgstr "" "Użytkowicy z wybranymi powyżej rolami otrzymają prywatny klucz dostępny w " -"ich profilu, by uzyskać bezpieczny dostęp do " -"kanałów Zapisów Stream." +"ich %sprofilu%s, by uzyskać bezpieczny dostęp do kanałów Zapisów Stream." -#: includes/settings.php:81 +#: ../includes/settings.php:175 msgid "View Profile" msgstr "Wyświetl profil" -#: includes/settings.php:88 +#: ../includes/settings.php:184 msgid "Keep Records for" msgstr "Przechowuj zapisy z" -#: includes/settings.php:91 +#: ../includes/settings.php:187 msgid "" "Maximum number of days to keep activity records. Leave blank to keep records " "forever." @@ -970,64 +1206,125 @@ msgstr "" "Maksymalna liczba dni, dla których zachowana zostanie aktywność. By " "przechowywać zapisy bez limitu, pozostaw puste pole." -#: includes/settings.php:93 +#: ../includes/settings.php:189 msgid "days" msgstr "dni" -#: includes/settings.php:97 -msgid "Delete All Records" -msgstr "Usuń wszystkie zapisy" +#: ../includes/settings.php:193 +msgid "Reset Stream Database" +msgstr "Wyczyść bazę danych Stream" -#: includes/settings.php:106 +#: ../includes/settings.php:202 msgid "" "Warning: Clicking this will delete all activity records from the database." msgstr "" "Ostrzeżenie: Kliknięcie w link wymaże wszystkie zapisy aktywności z bazy " "danych." -#: includes/settings.php:278 -msgid "Reset Stream Database" -msgstr "Wyczyść bazę danych Stream" +#: ../includes/settings.php:208 +msgid "Exclude" +msgstr "Wyklucz" + +#: ../includes/settings.php:212 +msgid "Authors & Roles" +msgstr "Autorzy i role" + +#: ../includes/settings.php:214 +msgid "No activity will be logged for these authors and roles." +msgstr "Żadna aktywność nie będzie zapisywana dla tych autorów i ról." + +#: ../includes/settings.php:220 +msgid "Connectors" +msgstr "Łączniki" + +#: ../includes/settings.php:222 +msgid "No activity will be logged for these connectors." +msgstr "Żadna aktywność nie będzie zapisywana dla tych łączników." -#: stream.php:166 +#: ../includes/settings.php:229 +msgid "Contexts" +msgstr "Konteksty" + +#: ../includes/settings.php:231 +msgid "No activity will be logged for these contexts." +msgstr "Żadna aktywność nie będzie zapisywana dla tych kontekstów." + +#: ../includes/settings.php:238 +msgid "Actions" +msgstr "Akcje" + +#: ../includes/settings.php:240 +msgid "No activity will be logged for these actions." +msgstr "Żadna aktywność nie będzie zapisywana dla tych akcji." + +#: ../includes/settings.php:247 +msgid "IP Addresses" +msgstr "Adresy IP" + +#: ../includes/settings.php:249 +msgid "No activity will be logged for these IP addresses." +msgstr "Żadna aktywność nie będzie zapisywana dla tych adresów IP." + +#: ../stream.php:181 msgid "The following table is not present in the WordPress database :" msgstr "Następująca tabela nie została znaleziona w bazie danych WordPressa:" -#: stream.php:174 +#: ../stream.php:192 +#, php-format msgid "" "Please uninstall the Stream plugin and activate it again." msgstr "" "Proszę odinstalować wtyczkę Stream i włączyć ją ponownie." -#: stream.php:188 +#: ../stream.php:206 msgid "Stream requires PHP version 5.3+, plugin is currently NOT ACTIVE." msgstr "Stream wymaga PHP w wersji 5.3+, wtyczka jest obecnie NIEAKTYWNA." -#. Plugin URI of the plugin/theme -msgid "http://wordpress.org/plugins/stream/" -msgstr "http://wordpress.org/plugins/stream/" +#~ msgid "More" +#~ msgstr "Więcej" -#. Description of the plugin/theme -msgid "" -"Stream tracks logged-in user activity so you can monitor every change made " -"on your WordPress site in beautifully organized detail. All activity is " -"organized by context, action and IP address for easy filtering. Developers " -"can extend Stream with custom connectors to log any kind of action." -msgstr "" -"Stream śledzi aktywność zalogowanych użytkowników, dzięki czemu możesz w " -"piękny i zorganizowany sposób monitorować każdą zmianę na Twojej stronie. " -"Cała aktywność jest przedstawiona według kontekstu, akcji i adresu IP dla " -"jeszcze łatwiejszego filtrowania wyników. Programiści mogą dodatkowo " -"rozszerzać działanie Stream i po utworzeniu własnych łączników zapisywać w " -"dzienniku dowolne czynności." - -#. Author of the plugin/theme -msgid "X-Team" -msgstr "X-Team" - -#. Author URI of the plugin/theme -msgid "http://x-team.com/wordpress/" -msgstr "http://x-team.com/wordpress/" +#~ msgid "Number of Records" +#~ msgstr "Liczba zapisów" + +#~ msgid "Date start" +#~ msgstr "Data początkowa" + +#~ msgid "Date end" +#~ msgstr "Data końcowa" + +#~ msgid "Log Activity for" +#~ msgstr "Role zapisywane w dzienniku" + +#~ msgid "Only the selected roles above will have their activity logged." +#~ msgstr "" +#~ "Tylko aktywność użytkowników o wybranych powyżej rolach zostanie zapisana " +#~ "w dzienniku." + +#~ msgid "Delete All Records" +#~ msgstr "Usuń wszystkie zapisy" + +#~ msgid "http://wordpress.org/plugins/stream/" +#~ msgstr "http://wordpress.org/plugins/stream/" + +#~ msgid "" +#~ "Stream tracks logged-in user activity so you can monitor every change " +#~ "made on your WordPress site in beautifully organized detail. All activity " +#~ "is organized by context, action and IP address for easy filtering. " +#~ "Developers can extend Stream with custom connectors to log any kind of " +#~ "action." +#~ msgstr "" +#~ "Stream śledzi aktywność zalogowanych użytkowników, dzięki czemu możesz w " +#~ "piękny i zorganizowany sposób monitorować każdą zmianę na Twojej stronie. " +#~ "Cała aktywność jest przedstawiona według kontekstu, akcji i adresu IP dla " +#~ "jeszcze łatwiejszego filtrowania wyników. Programiści mogą dodatkowo " +#~ "rozszerzać działanie Stream i po utworzeniu własnych łączników zapisywać " +#~ "w dzienniku dowolne czynności." + +#~ msgid "X-Team" +#~ msgstr "X-Team" + +#~ msgid "http://x-team.com/wordpress/" +#~ msgstr "http://x-team.com/wordpress/" #~ msgid "Please" #~ msgstr "Proszę" diff --git a/readme.md b/readme.md index 467cfd1d6..2cae43fbc 100755 --- a/readme.md +++ b/readme.md @@ -105,158 +105,168 @@ Thank you for wanting to make Stream better for everyone! We salute you. ## Changelog ## -### 1.3.0 ### -**2014/03/12** - New "Exclude" tab to prevent specific activity from being tracked. Now logging Custom Background and Custom Header changes. Predefined date intervals now available when filtering records. User avatars now displayed in Authors dropdown filter. Bug fixes and UI improvements. Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.3.0 - March 12, 2014 ### +* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([issue-251](https://github.com/x-team/wp-stream/issues/251)) +* New: Now logging Custom Background and Custom Header changes ([issue-309](https://github.com/x-team/wp-stream/issues/309)) +* New: Predefined date intervals now available when filtering records ([issue-320](https://github.com/x-team/wp-stream/issues/320)) +* Tweak: User avatars now displayed in Authors dropdown filter ([issue-311](https://github.com/x-team/wp-stream/issues/311)) +* Tweak: Live updates are enabled by default for new installs ([issue-312](https://github.com/x-team/wp-stream/issues/312)) +* Tweak: Action links are now available for Stream Settings records ([issue-305](https://github.com/x-team/wp-stream/issues/305)) +* Fix: Superfluous auto-draft posts are now prevented from being logged ([issue-293](https://github.com/x-team/wp-stream/issues/293)) +* Fix: Fallback to the term slug if a label does not exist in list-table ([issue-214](https://github.com/x-team/wp-stream/issues/214)) +* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([issue-283](https://github.com/x-team/wp-stream/issues/283)) -### 1.2.9 ### -**2014/03/08** - Fixes bug that caused media uploads to fail on new posts. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.2.8 ### -**2014/03/07** - Use attachment type as context in Media connector. Bug fixes. Props [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.2.9 - March 8, 2014 ### +Fixes bug that caused media uploads to fail on new posts. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.2.7 ### -**2014/03/04** - Pagination added to Stream Activity dashboard widget. Bug fixes. Props [chacha](https://github.com/chacha/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.2.8 - March 7, 2014 ### +Use attachment type as context in Media connector. Bug fixes. Props [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.2.6 ### -**2014/02/28** - Improved context names in Users connector. Props [powelski](http://profiles.wordpress.org/powelski/) +### 1.2.7 - March 4, 2014 ### +Pagination added to Stream Activity dashboard widget. Bug fixes. Props [chacha](https://github.com/chacha/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.2.5 ### -**2014/02/27** - Use sidebar area names as context in Widgets connector. Bug fixes. Props [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [bordoni](http://profiles.wordpress.org/bordoni/) +### 1.2.6 - February 28, 2014 ### +Improved context names in Users connector. Props [powelski](http://profiles.wordpress.org/powelski/) -### 1.2.4 ### -**2014/02/25** - Use post type names as context in Comments connector. German translation update. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [kucrut](http://profiles.wordpress.org/kucrut/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.2.5 - February 27, 2014 ### +Use sidebar area names as context in Widgets connector. Bug fixes. Props [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [bordoni](http://profiles.wordpress.org/bordoni/) -### 1.2.3 ### -**2014/02/21** - Replacement function for filter_input family to avoid PHP bug. Filter added to main Stream query. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.2.4 - February 25, 2014 ### +Use post type names as context in Comments connector. German translation update. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [kucrut](http://profiles.wordpress.org/kucrut/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.2.2 ### -**2014/02/19** - Prevent records of disabled connectors from appearing in the Stream. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [johnregan3](http://profiles.wordpress.org/johnregan3/) +### 1.2.3 - February 21, 2014 ### +Replacement function for filter_input family to avoid PHP bug. Filter added to main Stream query. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.2.1 ### -**2014/02/17** - Translation updates. Langage packs for pt_BR and id_ID. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [bordoni](http://profiles.wordpress.org/webord/), [powelski](http://profiles.wordpress.org/powelski/), [omniwired](https://github.com/omniwired), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.2.2 - February 19, 2014 ### +Prevent records of disabled connectors from appearing in the Stream. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [johnregan3](http://profiles.wordpress.org/johnregan3/) -### 1.2.0 ### -**2014/02/12** - Awesome datepicker styles. Performance optimizations. Bug fixes. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) +### 1.2.1 - February 17, 2014 ### +Translation updates. Langage packs for pt_BR and id_ID. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [bordoni](http://profiles.wordpress.org/webord/), [powelski](http://profiles.wordpress.org/powelski/), [omniwired](https://github.com/omniwired), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.1.9 ### -**2014/02/10** - Load authors filter using AJAX if there are more than 50. Props [powelski](http://profiles.wordpress.org/powelski/) +### 1.2.0 - February 12, 2014 ### +Awesome datepicker styles. Performance optimizations. Bug fixes. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) -### 1.1.8 ### -**2014/02/09** - Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.1.9 - February 10, 2014 ### +Load authors filter using AJAX if there are more than 50. Props [powelski](http://profiles.wordpress.org/powelski/) -### 1.1.7 ### -**2014/02/06** - Upgrade routine for IPv6 support. Persist tab selection after saving Stream Settings. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [dero](https://github.com/dero) +### 1.1.8 - February 9, 2014 ### +Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.1.6 ### -**2014/02/06** - Sortable columns bug fix on the records screen. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.1.7 - February 6, 2014 ### +Upgrade routine for IPv6 support. Persist tab selection after saving Stream Settings. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [dero](https://github.com/dero) -### 1.1.5 ### -**2014/02/05** - Fixed a class scope bug [reported in the support forum](http://wordpress.org/support/topic/temporary-fatal-error-after-upgrade-113) that was causing a fatal error on some installs. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.1.6 - February 6, 2014 ### +Sortable columns bug fix on the records screen. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.1.4 ### -**2014/02/05** - Highlight changed settings field feature. DB upgrade routine for proper utf-8 charset. Various bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.1.5 - February 5, 2014 ### +Fixed a class scope bug [reported in the support forum](http://wordpress.org/support/topic/temporary-fatal-error-after-upgrade-113) that was causing a fatal error on some installs. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.1.3 ### -**2014/02/04** - Upgrade routine for IP column in DB. Serialized option parsing for Stream Settings records. Purge records immediately when TTL is set backwards in Stream Settings. Various bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.1.4 - February 5, 2014 ### +Highlight changed settings field feature. DB upgrade routine for proper utf-8 charset. Various bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.1.2 ### -**2014/02/02** - Bug fix for list table notice on new installations. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.1.3 - February 4, 2014 ### +Upgrade routine for IP column in DB. Serialized option parsing for Stream Settings records. Purge records immediately when TTL is set backwards in Stream Settings. Various bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.1.0 ### -**2014/01/31** - Disable terms in dropdown filters for which records do not exist. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) +### 1.1.2 - February 2, 2014 ### +Bug fix for list table notice on new installations. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.0.9 ### -**2014/01/31** - Several important bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.1.0 - January 31, 2014 ### +Disable terms in dropdown filters for which records do not exist. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -### 1.0.8 ### -**2014/01/30** - Bug fix for sites using BuddyPress. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) +### 1.0.9 - January 31, 2014 ### +Several important bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.0.7 ### -**2014/01/29** - Code efficiency improvements when fetching admin area URLs. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.0.8 - January 30, 2014 ### +Bug fix for sites using BuddyPress. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -### 1.0.6 ### -**2014/01/28** - Query improvements, default connector interface, hook added for general settings fields. Bug fixes. Props [dero](https://github.com/dero), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.0.7 - January 29, 2014 ### +Code efficiency improvements when fetching admin area URLs. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.0.5 ### -**2014/01/27** - Bug fix for live updates breaking columns when some are hidden via Screen Options. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) +### 1.0.6 - January 28, 2014 ### +Query improvements, default connector interface, hook added for general settings fields. Bug fixes. Props [dero](https://github.com/dero), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.0.4 ### -**2014/01/23** - Language pack for Polish. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [kucrut](http://profiles.wordpress.org/kucrut/) +### 1.0.5 - January 27, 2014 ### +Bug fix for live updates breaking columns when some are hidden via Screen Options. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -### 1.0.3 ### -**2014/01/19** - Language pack for Spanish. Bug fixes. Props [omniwired](https://github.com/omniwired), [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 1.0.4 - January 23, 2014 ### +Language pack for Polish. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [kucrut](http://profiles.wordpress.org/kucrut/) -### 1.0.2 ### -**2014/01/15** - Ensure the dashboard widget repects the Role Access setting. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.0.3 - January 19, 2014 ### +Language pack for Spanish. Bug fixes. Props [omniwired](https://github.com/omniwired), [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 1.0.1 ### -**2014/01/15** - Require nonce for generating a new user feed key. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) +### 1.0.2 - January 15, 2014 ### +Ensure the dashboard widget repects the Role Access setting. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 1.0.0 ### -**2014/01/13** - Allow list table to be exensible. Hook added to prevent tables from being created, if desired. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) +### 1.0.1 - January 15, 2014 ### +Require nonce for generating a new user feed key. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -### 0.9.9 ### -**2014/01/08** - Updated screenshot assets and descriptions. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 1.0.0 - January 13, 2014 ### +Allow list table to be exensible. Hook added to prevent tables from being created, if desired. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) -### 0.9.8 ### -**2014/01/01** - Support for live updates in the Stream. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.9.9 - January 8, 2014 ### +Updated screenshot assets and descriptions. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.9.7 ### -**2013/12/29** - Plugin version available as a constant. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.9.8 - January 1, 2014 ### +Support for live updates in the Stream. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.9.6 ### -**2013/12/29** - Use menu name as context in Menus connector. Warning if required DB tables are missing. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) +### 0.9.7 - December 29, 2013 ### +Plugin version available as a constant. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.9.5 ### -**2013/12/22** - WordPress context added to Installer connector for core updates. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 0.9.6 - December 29, 2013 ### +Use menu name as context in Menus connector. Warning if required DB tables are missing. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) -### 0.9.3 ### -**2013/12/22** - Replacing Chosen library with Select2. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.9.5 - December 22, 2013 ### +WordPress context added to Installer connector for core updates. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 0.9.2 ### -**2013/12/22** - Added support for private feeds in JSON format. Flush rewrite rules automatically for feeds when enabled/disabled. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.9.3 - December 22, 2013 ### +Replacing Chosen library with Select2. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.9.1 ### -**2013/12/21** - Specify which roles should have their activity logged. Delete all options on uninstall. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.9.2 - December 22, 2013 ### +Added support for private feeds in JSON format. Flush rewrite rules automatically for feeds when enabled/disabled. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.9.0 ### -**2013/12/20** - Added connector for Comments. Stream activity dashboard widget. UI enhancements. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) +### 0.9.1 - December 21, 2013 ### +Specify which roles should have their activity logged. Delete all options on uninstall. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.8.2 ### -**2013/12/19** - Language packs for French and German. Option to uninstall database tables. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/) +### 0.9.0 - December 20, 2013 ### +Added connector for Comments. Stream activity dashboard widget. UI enhancements. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) -### 0.8.1 ### -**2013/12/18** - Setting to enable/disable private feeds functionality. Additional record logged when a user's role is changed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [kucrut](http://profiles.wordpress.org/kucrut/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [justinsainton](http://profiles.wordpress.org/justinsainton/) +### 0.8.2 - December 19, 2013 ### +Language packs for French and German. Option to uninstall database tables. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/) -### 0.8.0 ### -**2013/12/16** - Ability to query Stream records in a private RSS feed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 0.8.1 - December 18, 2013 ### +Setting to enable/disable private feeds functionality. Additional record logged when a user's role is changed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [kucrut](http://profiles.wordpress.org/kucrut/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [justinsainton](http://profiles.wordpress.org/justinsainton/) -### 0.7.3 ### -**2013/12/13** - Bug fix for Role Access option. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.8.0 - December 16, 2013 ### +Ability to query Stream records in a private RSS feed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 0.7.2 ### -**2013/12/12** - Bug fixes for the Installer connector. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) +### 0.7.3 - December 13, 2013 ### +Bug fix for Role Access option. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.7.1 ### -**2013/12/12** - Hotfix to remove PHP 5.4-only syntax. Role Access option added to Settings. Props [kucrut](http://profiles.wordpress.org/kucrut/) +### 0.7.2 - December 12, 2013 ### +Bug fixes for the Installer connector. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -### 0.7.0 ### -**2013/12/11** - Added connectors for Taxonomies and Settings. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.7.1 - December 12, 2013 ### +Hotfix to remove PHP 5.4-only syntax. Role Access option added to Settings. Props [kucrut](http://profiles.wordpress.org/kucrut/) -### 0.6.0 ### -**2013/12/09** - UX improvements to manual DB purge. Cron event for user-defined TTL of records. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.7.0 - December 11, 2013 ### +Added connectors for Taxonomies and Settings. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.5.0 ### -**2013/12/08** - Require PHP 5.3 to activate plugin. Provide action links for records when applicable. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.6.0 - December 9, 2013 ### +UX improvements to manual DB purge. Cron event for user-defined TTL of records. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.4.0 ### -**2013/12/08** - Improved support for pages and custom post types. Chosen for filter dropdowns. Pagination support in screen options. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.5.0 - December 8, 2013 ### +Require PHP 5.3 to activate plugin. Provide action links for records when applicable. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.3.0 ### -**2013/12/07** - Improved actions for Users context. Action for edited images in Media context. Bug fixes in Menus context. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [akeda](http://profiles.wordpress.org/akeda/) +### 0.4.0 - December 8, 2013 ### +Improved support for pages and custom post types. Chosen for filter dropdowns. Pagination support in screen options. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -### 0.2.0 ### -**2013/12/06** - Second iteration build using custom tables data model. First public release. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +### 0.3.0 - December 7, 2013 ### +Improved actions for Users context. Action for edited images in Media context. Bug fixes in Menus context. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [akeda](http://profiles.wordpress.org/akeda/) + +### 0.2.0 - December 6, 2013 ### +Second iteration build using custom tables data model. First public release. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) ### 0.1.0 ### Initial concept built using custom post type/taxonomies as the data model. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) diff --git a/readme.txt b/readme.txt index 2233913c8..613143beb 100644 --- a/readme.txt +++ b/readme.txt @@ -90,158 +90,169 @@ Thank you for wanting to make Stream better for everyone! We salute you. == Changelog == -= 1.3.0 = -**2014/03/12** - New "Exclude" tab to prevent specific activity from being tracked. Now logging Custom Background and Custom Header changes. Predefined date intervals now available when filtering records. User avatars now displayed in Authors dropdown filter. Bug fixes and UI improvements. Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.3.0 - March 12, 2014 = -= 1.2.9 = -**2014/03/08** - Fixes bug that caused media uploads to fail on new posts. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) +* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([issue-251](https://github.com/x-team/wp-stream/issues/251)) +* New: Now logging Custom Background and Custom Header changes ([issue-309](https://github.com/x-team/wp-stream/issues/309)) +* New: Predefined date intervals now available when filtering records ([issue-320](https://github.com/x-team/wp-stream/issues/320)) +* Tweak: User avatars now displayed in Authors dropdown filter ([issue-311](https://github.com/x-team/wp-stream/issues/311)) +* Tweak: Live updates are enabled by default for new installs ([issue-312](https://github.com/x-team/wp-stream/issues/312)) +* Tweak: Action links are now available for Stream Settings records ([issue-305](https://github.com/x-team/wp-stream/issues/305)) +* Fix: Superfluous auto-draft posts are now prevented from being logged ([issue-293](https://github.com/x-team/wp-stream/issues/293)) +* Fix: Fallback to the term slug if a label does not exist in list-table ([issue-214](https://github.com/x-team/wp-stream/issues/214)) +* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([issue-283](https://github.com/x-team/wp-stream/issues/283)) -= 1.2.8 = -**2014/03/07** - Use attachment type as context in Media connector. Bug fixes. Props [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) +Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.2.7 = -**2014/03/04** - Pagination added to Stream Activity dashboard widget. Bug fixes. Props [chacha](https://github.com/chacha/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.2.9 - March 8, 2014 = +Fixes bug that caused media uploads to fail on new posts. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.2.6 = -**2014/02/28** - Improved context names in Users connector. Props [powelski](http://profiles.wordpress.org/powelski/) += 1.2.8 - March 7, 2014 = +Use attachment type as context in Media connector. Bug fixes. Props [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.2.5 = -**2014/02/27** - Use sidebar area names as context in Widgets connector. Bug fixes. Props [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [bordoni](http://profiles.wordpress.org/bordoni/) += 1.2.7 - March 4, 2014 = +Pagination added to Stream Activity dashboard widget. Bug fixes. Props [chacha](https://github.com/chacha/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.2.4 = -**2014/02/25** - Use post type names as context in Comments connector. German translation update. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [kucrut](http://profiles.wordpress.org/kucrut/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.2.6 - February 28, 2014 = +Improved context names in Users connector. Props [powelski](http://profiles.wordpress.org/powelski/) -= 1.2.3 = -**2014/02/21** - Replacement function for filter_input family to avoid PHP bug. Filter added to main Stream query. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.2.5 - February 27, 2014 = +Use sidebar area names as context in Widgets connector. Bug fixes. Props [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [bordoni](http://profiles.wordpress.org/bordoni/) -= 1.2.2 = -**2014/02/19** - Prevent records of disabled connectors from appearing in the Stream. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [johnregan3](http://profiles.wordpress.org/johnregan3/) += 1.2.4 - February 25, 2014 = +Use post type names as context in Comments connector. German translation update. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [kucrut](http://profiles.wordpress.org/kucrut/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.2.1 = -**2014/02/17** - Translation updates. Langage packs for pt_BR and id_ID. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [bordoni](http://profiles.wordpress.org/webord/), [powelski](http://profiles.wordpress.org/powelski/), [omniwired](https://github.com/omniwired), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.2.3 - February 21, 2014 = +Replacement function for filter_input family to avoid PHP bug. Filter added to main Stream query. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.2.0 = -**2014/02/12** - Awesome datepicker styles. Performance optimizations. Bug fixes. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) += 1.2.2 - February 19, 2014 = +Prevent records of disabled connectors from appearing in the Stream. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [johnregan3](http://profiles.wordpress.org/johnregan3/) -= 1.1.9 = -**2014/02/10** - Load authors filter using AJAX if there are more than 50. Props [powelski](http://profiles.wordpress.org/powelski/) += 1.2.1 - February 17, 2014 = +Translation updates. Langage packs for pt_BR and id_ID. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [bordoni](http://profiles.wordpress.org/webord/), [powelski](http://profiles.wordpress.org/powelski/), [omniwired](https://github.com/omniwired), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.1.8 = -**2014/02/09** - Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.2.0 - February 12, 2014 = +Awesome datepicker styles. Performance optimizations. Bug fixes. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) -= 1.1.7 = -**2014/02/06** - Upgrade routine for IPv6 support. Persist tab selection after saving Stream Settings. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [dero](https://github.com/dero) += 1.1.9 - February 10, 2014 = +Load authors filter using AJAX if there are more than 50. Props [powelski](http://profiles.wordpress.org/powelski/) -= 1.1.6 = -**2014/02/06** - Sortable columns bug fix on the records screen. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.1.8 - February 9, 2014 = +Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.1.5 = -**2014/02/05** - Fixed a class scope bug [reported in the support forum](http://wordpress.org/support/topic/temporary-fatal-error-after-upgrade-113) that was causing a fatal error on some installs. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.1.7 - February 6, 2014 = +Upgrade routine for IPv6 support. Persist tab selection after saving Stream Settings. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [dero](https://github.com/dero) -= 1.1.4 = -**2014/02/05** - Highlight changed settings field feature. DB upgrade routine for proper utf-8 charset. Various bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.1.6 - February 6, 2014 = +Sortable columns bug fix on the records screen. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.1.3 = -**2014/02/04** - Upgrade routine for IP column in DB. Serialized option parsing for Stream Settings records. Purge records immediately when TTL is set backwards in Stream Settings. Various bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.1.5 - February 5, 2014 = +Fixed a class scope bug [reported in the support forum](http://wordpress.org/support/topic/temporary-fatal-error-after-upgrade-113) that was causing a fatal error on some installs. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.1.2 = -**2014/02/02** - Bug fix for list table notice on new installations. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.1.4 - February 5, 2014 = +Highlight changed settings field feature. DB upgrade routine for proper utf-8 charset. Various bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.1.0 = -**2014/01/31** - Disable terms in dropdown filters for which records do not exist. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) += 1.1.3 - February 4, 2014 = +Upgrade routine for IP column in DB. Serialized option parsing for Stream Settings records. Purge records immediately when TTL is set backwards in Stream Settings. Various bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.0.9 = -**2014/01/31** - Several important bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.1.2 - February 2, 2014 = +Bug fix for list table notice on new installations. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.0.8 = -**2014/01/30** - Bug fix for sites using BuddyPress. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) += 1.1.0 - January 31, 2014 = +Disable terms in dropdown filters for which records do not exist. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -= 1.0.7 = -**2014/01/29** - Code efficiency improvements when fetching admin area URLs. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.0.9 - January 31, 2014 = +Several important bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.0.6 = -**2014/01/28** - Query improvements, default connector interface, hook added for general settings fields. Bug fixes. Props [dero](https://github.com/dero), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.0.8 - January 30, 2014 = +Bug fix for sites using BuddyPress. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -= 1.0.5 = -**2014/01/27** - Bug fix for live updates breaking columns when some are hidden via Screen Options. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) += 1.0.7 - January 29, 2014 = +Code efficiency improvements when fetching admin area URLs. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.0.4 = -**2014/01/23** - Language pack for Polish. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [kucrut](http://profiles.wordpress.org/kucrut/) += 1.0.6 - January 28, 2014 = +Query improvements, default connector interface, hook added for general settings fields. Bug fixes. Props [dero](https://github.com/dero), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 1.0.3 = -**2014/01/19** - Language pack for Spanish. Bug fixes. Props [omniwired](https://github.com/omniwired), [shadyvb](http://profiles.wordpress.org/shadyvb/) += 1.0.5 - January 27, 2014 = +Bug fix for live updates breaking columns when some are hidden via Screen Options. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -= 1.0.2 = -**2014/01/15** - Ensure the dashboard widget repects the Role Access setting. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.0.4 - January 23, 2014 = +Language pack for Polish. Bug fixes. Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [kucrut](http://profiles.wordpress.org/kucrut/) -= 1.0.1 = -**2014/01/15** - Require nonce for generating a new user feed key. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) += 1.0.3 - January 19, 2014 = +Language pack for Spanish. Bug fixes. Props [omniwired](https://github.com/omniwired), [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 1.0.0 = -**2014/01/13** - Allow list table to be exensible. Hook added to prevent tables from being created, if desired. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) += 1.0.2 - January 15, 2014 = +Ensure the dashboard widget repects the Role Access setting. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.9.9 = -**2014/01/08** - Updated screenshot assets and descriptions. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.0.1 - January 15, 2014 = +Require nonce for generating a new user feed key. Props [johnregan3](http://profiles.wordpress.org/johnregan3/) -= 0.9.8 = -**2014/01/01** - Support for live updates in the Stream. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 1.0.0 - January 13, 2014 = +Allow list table to be exensible. Hook added to prevent tables from being created, if desired. Props [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/) -= 0.9.7 = -**2013/12/29** - Plugin version available as a constant. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.9.9 - January 8, 2014 = +Updated screenshot assets and descriptions. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.9.6 = -**2013/12/29** - Use menu name as context in Menus connector. Warning if required DB tables are missing. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) += 0.9.8 - January 1, 2014 = +Support for live updates in the Stream. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.9.5 = -**2013/12/22** - WordPress context added to Installer connector for core updates. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 0.9.7 - December 29, 2013 = +Plugin version available as a constant. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.9.3 = -**2013/12/22** - Replacing Chosen library with Select2. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.9.6 - December 29, 2013 = +Use menu name as context in Menus connector. Warning if required DB tables are missing. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) -= 0.9.2 = -**2013/12/22** - Added support for private feeds in JSON format. Flush rewrite rules automatically for feeds when enabled/disabled. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.9.5 - December 22, 2013 = +WordPress context added to Installer connector for core updates. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 0.9.1 = -**2013/12/21** - Specify which roles should have their activity logged. Delete all options on uninstall. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.9.3 - December 22, 2013 = +Replacing Chosen library with Select2. Bug fixes. Props [kucrut](http://profiles.wordpress.org/kucrut/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.9.0 = -**2013/12/20** - Added connector for Comments. Stream activity dashboard widget. UI enhancements. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) += 0.9.2 - December 22, 2013 = +Added support for private feeds in JSON format. Flush rewrite rules automatically for feeds when enabled/disabled. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.8.2 = -**2013/12/19** - Language packs for French and German. Option to uninstall database tables. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/) += 0.9.1 - December 21, 2013 = +Specify which roles should have their activity logged. Delete all options on uninstall. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.8.1 = -**2013/12/18** - Setting to enable/disable private feeds functionality. Additional record logged when a user's role is changed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [kucrut](http://profiles.wordpress.org/kucrut/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [justinsainton](http://profiles.wordpress.org/justinsainton/) += 0.9.0 - December 20, 2013 = +Added connector for Comments. Stream activity dashboard widget. UI enhancements. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/) -= 0.8.0 = -**2013/12/16** - Ability to query Stream records in a private RSS feed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/) += 0.8.2 - December 19, 2013 = +Language packs for French and German. Option to uninstall database tables. Bug fixes. Props [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [pascalklaeres](http://profiles.wordpress.org/pascalklaeres/) -= 0.7.3 = -**2013/12/13** - Bug fix for Role Access option. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.8.1 - December 18, 2013 = +Setting to enable/disable private feeds functionality. Additional record logged when a user's role is changed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [kucrut](http://profiles.wordpress.org/kucrut/), [topher1kenobe](http://profiles.wordpress.org/topher1kenobe/), [justinsainton](http://profiles.wordpress.org/justinsainton/) -= 0.7.2 = -**2013/12/12** - Bug fixes for the Installer connector. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) += 0.8.0 - December 16, 2013 = +Ability to query Stream records in a private RSS feed. Bug fixes. Props [fjarrett](http://profiles.wordpress.org/fjarrett/), [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 0.7.1 = -**2013/12/12** - Hotfix to remove PHP 5.4-only syntax. Role Access option added to Settings. Props [kucrut](http://profiles.wordpress.org/kucrut/) += 0.7.3 - December 13, 2013 = +Bug fix for Role Access option. Props [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.7.0 = -**2013/12/11** - Added connectors for Taxonomies and Settings. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.7.2 - December 12, 2013 = +Bug fixes for the Installer connector. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) -= 0.6.0 = -**2013/12/09** - UX improvements to manual DB purge. Cron event for user-defined TTL of records. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.7.1 - December 12, 2013 = +Hotfix to remove PHP 5.4-only syntax. Role Access option added to Settings. Props [kucrut](http://profiles.wordpress.org/kucrut/) -= 0.5.0 = -**2013/12/08** - Require PHP 5.3 to activate plugin. Provide action links for records when applicable. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.7.0 - December 11, 2013 = +Added connectors for Taxonomies and Settings. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.4.0 = -**2013/12/08** - Improved support for pages and custom post types. Chosen for filter dropdowns. Pagination support in screen options. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.6.0 - December 9, 2013 = +UX improvements to manual DB purge. Cron event for user-defined TTL of records. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.3.0 = -**2013/12/07** - Improved actions for Users context. Action for edited images in Media context. Bug fixes in Menus context. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [akeda](http://profiles.wordpress.org/akeda/) += 0.5.0 - December 8, 2013 = +Require PHP 5.3 to activate plugin. Provide action links for records when applicable. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) -= 0.2.0 = -**2013/12/06** - Second iteration build using custom tables data model. First public release. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) += 0.4.0 - December 8, 2013 = +Improved support for pages and custom post types. Chosen for filter dropdowns. Pagination support in screen options. Bug fixes. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) + += 0.3.0 - December 7, 2013 = +Improved actions for Users context. Action for edited images in Media context. Bug fixes in Menus context. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [akeda](http://profiles.wordpress.org/akeda/) + += 0.2.0 - December 6, 2013 = +Second iteration build using custom tables data model. First public release. Props [shadyvb](http://profiles.wordpress.org/shadyvb/), [fjarrett](http://profiles.wordpress.org/fjarrett/) = 0.1.0 = Initial concept built using custom post type/taxonomies as the data model. Props [shadyvb](http://profiles.wordpress.org/shadyvb/) diff --git a/stream.php b/stream.php index fb949a9e9..683bd3b48 100644 --- a/stream.php +++ b/stream.php @@ -21,13 +21,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Founda - * tion, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ class WP_Stream { diff --git a/tests/tests/test-admin.php b/tests/tests/test-admin.php index ff7d04c2d..8ae8a417a 100644 --- a/tests/tests/test-admin.php +++ b/tests/tests/test-admin.php @@ -48,7 +48,7 @@ public function test_constructor() { array( 'admin_enqueue_scripts', self::CLASSNAME, 'admin_enqueue_scripts' ), array( 'admin_enqueue_scripts', self::CLASSNAME, 'admin_menu_css' ), array( 'wp_ajax_wp_stream_reset', self::CLASSNAME, 'wp_ajax_reset' ), - array( 'init', self::CLASSNAME, 'purge_schedule_setup' ), + array( 'wp', self::CLASSNAME, 'purge_schedule_setup' ), array( 'wp_stream_auto_purge', self::CLASSNAME, 'purge_scheduled_action' ), ); diff --git a/ui/admin.css b/ui/admin.css index 3d795b720..cb489f682 100644 --- a/ui/admin.css +++ b/ui/admin.css @@ -88,6 +88,10 @@ padding-top: 6px; } +.toplevel_page_wp_stream .tablenav.bottom .button { + margin-right: 6px; +} + .toplevel_page_wp_stream .tablenav .actions { padding: 0; overflow: visible; @@ -190,11 +194,6 @@ margin-bottom: 6px; } -.toplevel_page_wp_stream .select2-results .select2-disabled { - background: transparent; - color: #aaa; -} - .toplevel_page_wp_stream .select2-container.select2-allowclear .select2-choice abbr { margin-top: -2px; } @@ -305,6 +304,11 @@ margin-bottom: 1px; } +.wp_stream_screen .select2-results .select2-disabled { + background: transparent; + color: #aaa; +} + .wp_stream_screen .select2-container.authors_and_roles .select2-search-choice .icon16 { margin: -6px 1px 0 -3px; padding: 0; diff --git a/ui/admin.js b/ui/admin.js index fcfdeb0b8..e78a3cd73 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -3,15 +3,18 @@ jQuery(function($){ $( '.toplevel_page_wp_stream select.chosen-select' ).select2({ minimumResultsForSearch: 10, - formatResult: function (record) { - var result = ''; + formatResult: function (record, container) { + var result = '', $elem = $(record.element); - if ( undefined !== $(record.element).attr('data-icon') ) { - result += ''; + if ( undefined !== $elem.attr('data-icon') ) { + result += ''; } result += record.text; + // Add more info to the container + container.attr('title', $elem.attr('title')); + return result; }, allowClear: true, @@ -98,22 +101,75 @@ jQuery(function($){ }); $( '.stream_page_wp_stream_settings input[type=hidden].select2-select.ip-addresses').each(function( k, el ){ var $input = $(el); - var $ip_regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/; + $input.select2({ tags:$input.data('selected'), width:350, - query: function (query){ - var data = {results: []}; - if(typeof (query.term) !== 'undefined' && query.term.match($ip_regex) != null ){ - data.results.push({id: query.term, text: query.term }); + ajax: { + type: 'POST', + url: ajaxurl, + dataType: 'json', + quietMillis: 500, + data: function (term) { + return { + find: term, + limit: 10, + action: 'stream_get_ips', + nonce: $input.data('nonce') + }; + }, + results: function (response) { + var answer = { + results: [] + }; + + if (response.success !== true || response.data === undefined ) { + return answer; + } + + $.each(response.data, function (key, ip ) { + answer.results.push({ + id: ip, + text: ip + }); + }); + + return answer; } - query.callback(data); }, initSelection: function (item, callback) { callback( item.data( 'selected' ) ); }, formatNoMatches : function(){ return ''; + }, + createSearchChoice: function(term) { + var ip_chunks = []; + + ip_chunks = term.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/); + + if (ip_chunks === null) { + return; + } + + // remove whole match + ip_chunks.shift(); + + ip_chunks = $.grep( + ip_chunks, + function(chunk) { + return (chunk.charAt(0) !== '0' && parseInt(chunk, 10) <= 255); + } + ); + + if (ip_chunks.length < 4) { + return; + } + + return { + id: term, + text: term + }; } }).on('change',function(e){ stream_select2_change_handler( e , $input ); @@ -122,7 +178,7 @@ jQuery(function($){ var $input_user; $('.stream_page_wp_stream_settings input[type=hidden].select2-select.authors_and_roles').each(function (k, el) { $input_user = $(el); - var $roles = $input_user.data('values'); + $input_user.select2({ multiple: true, width: 350, @@ -133,19 +189,29 @@ jQuery(function($){ quietMillis: 500, data: function (term, page) { return { - 'find': term, - 'limit': 10, - 'pager': page, - 'action': 'stream_get_users', - 'nonce' : $input_user.data('nonce') + find: term, + limit: 10, + pager: page, + action: 'stream_get_users', + nonce: $input_user.data('nonce') }; }, results: function (response) { - var answer = { + var roles = [], + answer = []; + + roles = $.grep( + $input_user.data('values'), + function(role) { + return role.text.toLowerCase().indexOf($input_user.data('select2').search.val().toLowerCase()) >= 0; + } + ); + + answer = { results: [ { text: 'Roles', - children: $roles + children: roles }, { text: 'Users', @@ -153,11 +219,12 @@ jQuery(function($){ } ] }; + if (response.success !== true || response.data === undefined || response.data.status !== true ) { return answer; } $.each(response.data.users, function (k, user) { - if ($.contains($roles, user.id)){ + if ($.contains(roles, user.id)){ user.disabled = true; } }); @@ -166,11 +233,13 @@ jQuery(function($){ return answer; } }, - formatResult: function (object) { + formatResult: function (object, container) { var result = object.text; if ('undefined' !== typeof object.icon) { result = '' + result; + // Add more info to the container + container.attr('title', object.tooltip); } return result; }, @@ -178,6 +247,7 @@ jQuery(function($){ if ( $.isNumeric( object.id ) && object.text.indexOf('icon-users') < 0 ){ object.text += ''; } + return object.text; }, initSelection: function (item, callback) { @@ -370,9 +440,28 @@ jQuery(function($){ if ( jQuery.datepicker ) { + // Apply a GMT offset due to Date() using the visitor's local time + var siteGMTOffsetHours = parseFloat( wp_stream.gmt_offset ); + var localGMTOffsetHours = new Date().getTimezoneOffset() / 60 * -1; + var totalGMTOffsetHours = siteGMTOffsetHours - localGMTOffsetHours; + + var localTime = new Date(); + var siteTime = new Date( localTime.getTime() + ( totalGMTOffsetHours * 60 * 60 * 1000 ) ); + var dayOffset = '0'; + + // check if the site date is different from the local date, and set a day offset + if ( localTime.getDate() !== siteTime.getDate() || localTime.getMonth() !== siteTime.getMonth() ) { + if ( localTime.getTime() < siteTime.getTime() ) { + dayOffset = '+1d'; + } else { + dayOffset = '-1d'; + } + } + datepickers.datepicker({ dateFormat: 'yy/mm/dd', - maxDate: 0, + maxDate: dayOffset, + defaultDate: siteTime, beforeShow: function() { $(this).prop( 'disabled', true ); }, diff --git a/ui/datepicker.css b/ui/datepicker.css index 1ed51812d..626e3fe28 100644 --- a/ui/datepicker.css +++ b/ui/datepicker.css @@ -61,6 +61,7 @@ .stream-datepicker.ui-datepicker .ui-datepicker-next-hover, .stream-datepicker.ui-datepicker .ui-datepicker-next, .stream-datepicker.ui-datepicker .ui-datepicker-prev { + height: 1em; top: .9em; border:none; } From b7604026d5ef055161283be31106d758449d539f Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Mon, 31 Mar 2014 16:24:59 +1000 Subject: [PATCH 035/123] Fixed undefined notice $item->blog_id. --- includes/list-table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/list-table.php b/includes/list-table.php index 431f29b7b..4e546e56f 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -263,7 +263,7 @@ function column_default( $item, $column_name ) { break; case 'blog_id': - $blog = $item->blog_id ? get_blog_details( $item->blog_id ) : self::get_network_blog(); + $blog = isset( $item->blog_id ) ? get_blog_details( $item->blog_id ) : self::get_network_blog(); $out = sprintf( '%s', add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), From cec5ac0a39302220168bf3c059c5ce953685a942 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Mon, 31 Mar 2014 17:23:33 +1000 Subject: [PATCH 036/123] Database updates. Fixes storing / retrieving steam entries for blogs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed individual blog tables, as they weren’t being used. Now we only use the one wp_stream table for the whole install. We’re also storing the database version as a site option, not a blog option. --- includes/db-actions.php | 8 +++++++- includes/install.php | 16 +++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/includes/db-actions.php b/includes/db-actions.php index 38cc1c16b..8d97318db 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -19,7 +19,13 @@ public function __construct() { * @param string database prefix * @return string udpated database prefix */ - $prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); + if ( is_multisite() ) { + $prefix = $wpdb->base_prefix; + } else { + $prefix = $wpdb->prefix; + } + + $prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); self::$table = $prefix . 'stream'; self::$table_meta = $prefix . 'stream_meta'; diff --git a/includes/install.php b/includes/install.php index 14c7e3118..bf63c165d 100644 --- a/includes/install.php +++ b/includes/install.php @@ -14,15 +14,21 @@ public static function check() { $current = WP_Stream::VERSION; - $db_version = get_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + $db_version = get_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); /** * Allows devs to alter the tables prefix, default to base_prefix * * @param string database prefix * @return string udpated database prefix - */ - self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); + */ + if ( is_multisite() ) { + $prefix = $wpdb->base_prefix; + } else { + $prefix = $wpdb->prefix; + } + + self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); if ( empty( $db_version ) ) { self::install(); @@ -32,7 +38,7 @@ public static function check() { return; } - update_option( plugin_basename( WP_STREAM_DIR ) . '_db', $current ); + update_site_option( plugin_basename( WP_STREAM_DIR ) . '_db', $current ); } public static function install() { @@ -208,7 +214,7 @@ public static function update( $db_version, $current ) { // If version is lower than 1.4.0, manually alter the column order. Not possible using dbDelta alone. if ( version_compare( $db_version, '1.4.0', '<' ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream MODIFY blog_id bigint(20) AFTER site_id" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '1' AFTER site_id" ); } } From 94a22e3b5df313839df928c94089abcf748394f0 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 1 Apr 2014 08:53:33 +1000 Subject: [PATCH 037/123] Trimmed Whitespace --- includes/db-actions.php | 4 ++-- includes/install.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/db-actions.php b/includes/db-actions.php index 8d97318db..3177302c4 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -20,9 +20,9 @@ public function __construct() { * @return string udpated database prefix */ if ( is_multisite() ) { - $prefix = $wpdb->base_prefix; + $prefix = $wpdb->base_prefix; } else { - $prefix = $wpdb->prefix; + $prefix = $wpdb->prefix; } $prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); diff --git a/includes/install.php b/includes/install.php index bf63c165d..62f944ebe 100644 --- a/includes/install.php +++ b/includes/install.php @@ -23,9 +23,9 @@ public static function check() { * @return string udpated database prefix */ if ( is_multisite() ) { - $prefix = $wpdb->base_prefix; + $prefix = $wpdb->base_prefix; } else { - $prefix = $wpdb->prefix; + $prefix = $wpdb->prefix; } self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); From c66ce9695b537ecd432b002a4c3512d23bf8e2f6 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 15:35:26 +1000 Subject: [PATCH 038/123] Remove the ability to change individual blog settings KISS --- includes/admin.php | 9 ++++----- includes/network.php | 41 ++++++++--------------------------------- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 8a2f548d8..5922c25be 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -21,7 +21,7 @@ class WP_Stream_Admin { * * @var bool */ - public static $disable_sites_admin = false; + public static $disable_access = false; const ADMIN_BODY_CLASS = 'wp_stream_screen'; const RECORDS_PAGE_SLUG = 'wp_stream'; @@ -41,8 +41,8 @@ public static function load() { (array) get_site_option( WP_Stream_Settings::KEY, array() ), WP_Stream_Settings::get_defaults() ); - if ( isset( $settings['general_disable_sites_admin'] ) && true == $settings['general_disable_sites_admin'] ) { - self::$disable_sites_admin = true; + if ( isset( $settings['general_disable_site_access'] ) && true == $settings['general_disable_site_access'] ) { + self::$disable_access = true; } } @@ -132,7 +132,7 @@ public static function register_menu() { if ( is_network_admin() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) return false; - if ( ! is_network_admin() && self::$disable_sites_admin ) + if ( ! is_network_admin() && self::$disable_access ) return false; self::$screen_id['main'] = add_menu_page( @@ -355,7 +355,6 @@ public static function render_page() {

-

diff --git a/includes/network.php b/includes/network.php index 33f44ca14..63f5280a8 100644 --- a/includes/network.php +++ b/includes/network.php @@ -37,20 +37,12 @@ function get_fields( $fields ) { if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $new_fields['general']['fields'][] = array( - 'name' => 'disable_sites_admin', - 'title' => __( 'Disable Site Access', 'stream' ), - 'default' => 0, - 'desc' => __( 'When site access is disabled the settings and Stream can only be accessed in network administration.', 'stream' ), - 'type' => 'checkbox', - ); - - $new_fields['general']['fields'][] = array( - 'name' => 'settings_for_blog', - 'title' => __( 'Settings for Blog', 'stream' ), - 'default' => array( 'value' => 0, 'name' => 'Network Default' ), - 'desc' => __( 'Select the site to apply settings changes to.', 'stream' ), - 'type' => 'select', - 'choices' => $this->get_network_sites(), + 'name' => 'disable_site_access', + 'title' => __( 'Disable Site Access', 'stream' ), + 'after_field' => __( 'Enabled' ), + 'default' => 0, + 'desc' => __( 'When site access is disabled Stream can only be accessed from the network administration.', 'stream' ), + 'type' => 'checkbox', ); return array_merge_recursive( $new_fields, $fields ); @@ -79,18 +71,9 @@ function network_options_action() { return; } - $update_network = true; - $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; + $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; if ( $options ) { - $blog_to_update = isset( $options['settings_for_blog'] ) ? (int) $options['settings_for_blog'] : 0; - - if ( 0 !== $blog_to_update ) { - switch_to_blog( $blog_to_update ); - $update_network = false; - } - - unset( $options['settings_for_blog'] ); foreach ( $options as $option ) { $option = trim( $option ); @@ -104,15 +87,7 @@ function network_options_action() { $value = trim( $value ); } - if ( $update_network ) { - update_site_option( $option, $value ); - } else { - update_option( $option, $value ); - } - } - - if ( ! $update_network ) { - restore_current_blog(); + update_site_option( $option, $value ); } } From e1b18dd842e06651f8268d8ad52888bebc817d28 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 16:26:51 +1000 Subject: [PATCH 039/123] Separated Network and Site Settings --- includes/admin.php | 35 +++++++++++++++++++++-------------- includes/network.php | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 5922c25be..fe4c4e124 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -41,7 +41,7 @@ public static function load() { (array) get_site_option( WP_Stream_Settings::KEY, array() ), WP_Stream_Settings::get_defaults() ); - if ( isset( $settings['general_disable_site_access'] ) && true == $settings['general_disable_site_access'] ) { + if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { self::$disable_access = true; } } @@ -145,14 +145,25 @@ public static function register_menu() { '2.999999' // Using longtail decimal string to reduce the chance of position conflicts, see Codex ); - self::$screen_id['settings'] = add_submenu_page( - self::RECORDS_PAGE_SLUG, - __( 'Stream Settings', 'stream' ), - __( 'Settings', 'stream' ), - self::SETTINGS_CAP, - 'wp_stream_settings', - array( __CLASS__, 'render_page' ) - ); + if ( is_network_admin() ) { + self::$screen_id['settings'] = add_submenu_page( + self::RECORDS_PAGE_SLUG, + __( 'Stream Network Settings', 'stream' ), + __( 'Network Settings', 'stream' ), + self::SETTINGS_CAP, + 'wp_stream_settings', + array( __CLASS__, 'render_page' ) + ); + } else { + self::$screen_id['settings'] = add_submenu_page( + self::RECORDS_PAGE_SLUG, + __( 'Stream Settings', 'stream' ), + __( 'Settings', 'stream' ), + self::SETTINGS_CAP, + 'wp_stream_settings', + array( __CLASS__, 'render_page' ) + ); + } // Register the list table early, so it associates the column headers with 'Screen settings' add_action( 'load-' . self::$screen_id['main'], array( __CLASS__, 'register_list_table' ) ); @@ -332,7 +343,7 @@ public static function render_page() { ?>
-

+

- -

- - array( + 'delete_all_records', + 'records_ttl', + ), + ) ); + + $site_only_options = apply_filters( 'wp_stream_site_only_option_fields', array( + 'general' => array( + 'role_access', + 'private_feeds', + ), + ) ); + + $hidden_options = is_network_admin() ? $site_only_options : $network_only_options; + + foreach ( $fields as $section_key => $section ) { + foreach ( $section['fields'] as $key => $field ) { + if ( ! isset( $hidden_options[ $section_key ] ) ) { + continue; + } + if ( in_array( $field['name'], $hidden_options[ $section_key ] ) ) { + unset( $fields[ $section_key ]['fields'][ $key ] ); + } + } + } + if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $new_fields['general']['fields'][] = array( - 'name' => 'disable_site_access', - 'title' => __( 'Disable Site Access', 'stream' ), + 'name' => 'enable_site_access', + 'title' => __( 'Enable Site Access', 'stream' ), 'after_field' => __( 'Enabled' ), - 'default' => 0, + 'default' => 1, 'desc' => __( 'When site access is disabled Stream can only be accessed from the network administration.', 'stream' ), 'type' => 'checkbox', ); + $new_fields['exclude']['desc'] = __( 'These settings will apply to the Network Stream.', 'stream' ); - return array_merge_recursive( $new_fields, $fields ); + $fields = array_merge_recursive( $new_fields, $fields ); } return $fields; From fc26be4645cd6d592bb6585b65e8346590897f65 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 16:33:10 +1000 Subject: [PATCH 040/123] Fix blog_id column in Stream Activity, and rename to Site This is to match Wordpress terminology. --- includes/install.php | 4 ++-- includes/list-table.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/install.php b/includes/install.php index 62f944ebe..6fc30f8a2 100644 --- a/includes/install.php +++ b/includes/install.php @@ -51,7 +51,7 @@ public static function install() { $sql = "CREATE TABLE {$prefix}stream ( ID bigint(20) unsigned NOT NULL AUTO_INCREMENT, site_id bigint(20) unsigned NOT NULL DEFAULT '1', - blog_id bigint(20) unsigned NOT NULL DEFAULT '1', + blog_id bigint(20) unsigned NOT NULL DEFAULT NULL, object_id bigint(20) unsigned NULL, author bigint(20) unsigned NOT NULL DEFAULT '0', summary longtext NOT NULL, @@ -214,7 +214,7 @@ public static function update( $db_version, $current ) { // If version is lower than 1.4.0, manually alter the column order. Not possible using dbDelta alone. if ( version_compare( $db_version, '1.4.0', '<' ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '1' AFTER site_id" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT NULL AFTER site_id" ); } } diff --git a/includes/list-table.php b/includes/list-table.php index 4e546e56f..dc9afb0c6 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -58,7 +58,7 @@ function extra_tablenav( $which ) { function network_admin_columns( $columns ) { unset( $columns['id'] ); - $columns['blog_id'] = __( 'Blog', 'stream' ); + $columns['blog_id'] = __( 'Site', 'stream' ); return $columns; } From 1f7f39b79115b27b7c723c1799ab9c4bb4d64e18 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 17:25:59 +1000 Subject: [PATCH 041/123] Various fixes Fix bug where checkboxes enabled by default wouldn't save Add Default Settings pag Fix select2 on default settings page --- includes/admin.php | 8 ++++++++ includes/network.php | 12 ++++++++++-- ui/admin.js | 6 +++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index fe4c4e124..c133c5d21 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -154,6 +154,14 @@ public static function register_menu() { 'wp_stream_settings', array( __CLASS__, 'render_page' ) ); + self::$screen_id['default_settings'] = add_submenu_page( + self::RECORDS_PAGE_SLUG, + __( 'Stream Default Settings', 'stream' ), + __( 'Default Settings', 'stream' ), + self::SETTINGS_CAP, + 'wp_stream_default_settings', + array( __CLASS__, 'render_page' ) + ); } else { self::$screen_id['settings'] = add_submenu_page( self::RECORDS_PAGE_SLUG, diff --git a/includes/network.php b/includes/network.php index 90c968d50..ded24d331 100644 --- a/includes/network.php +++ b/includes/network.php @@ -111,8 +111,16 @@ function network_options_action() { $option = trim( $option ); $value = null; - if ( isset( $_POST[ $option ] ) ) { - $value = $_POST[ $option ]; + $sections = WP_Stream_Settings::get_fields(); + foreach ( $sections as $section_name => $section ) { + foreach ( $section['fields'] as $field_idx => $field ) { + $option_key = $section_name . '_' . $field['name']; + if ( isset( $_POST[ $option ][ $option_key ] ) ) { + $value[ $option_key ] = $_POST[ $option ][ $option_key ]; + } else { + $value[ $option_key ] = false; + } + } } if ( ! is_array( $value ) ) { diff --git a/ui/admin.js b/ui/admin.js index e78a3cd73..84ca5a687 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -75,7 +75,7 @@ jQuery(function($){ $placeholder.after($placeholder.clone(true).attr('class', $placeholder_child_class).val(key)); }); }; - $('.stream_page_wp_stream_settings input[type=hidden].select2-select.with-source').each(function (k, el) { + $('#tab-content-settings input[type=hidden].select2-select.with-source').each(function (k, el) { var $input = $(el); $input.select2({ multiple: true, @@ -99,7 +99,7 @@ jQuery(function($){ stream_select2_change_handler( e , $input ); }).trigger('change'); }); - $( '.stream_page_wp_stream_settings input[type=hidden].select2-select.ip-addresses').each(function( k, el ){ + $( '#tab-content-settings input[type=hidden].select2-select.ip-addresses').each(function( k, el ){ var $input = $(el); $input.select2({ @@ -176,7 +176,7 @@ jQuery(function($){ }).trigger('change'); }); var $input_user; - $('.stream_page_wp_stream_settings input[type=hidden].select2-select.authors_and_roles').each(function (k, el) { + $('#tab-content-settings input[type=hidden].select2-select.authors_and_roles').each(function (k, el) { $input_user = $(el); $input_user.select2({ From af81256aa839ca9b2339ae40ed003dfe86f1f915 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 20:33:37 +1000 Subject: [PATCH 042/123] Options working with defaults, but implementation could do with some refining. --- includes/admin.php | 41 ++++++++++++-------- includes/network.php | 66 ++++++++++++++++++++++++++++--- includes/settings.php | 90 +++++++++++++++++++++++++++++++------------ 3 files changed, 151 insertions(+), 46 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index c133c5d21..547b43668 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -38,7 +38,7 @@ public static function load() { if ( is_multisite() ) { $settings = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::KEY, array() ), + (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), WP_Stream_Settings::get_defaults() ); if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { @@ -146,22 +146,24 @@ public static function register_menu() { ); if ( is_network_admin() ) { - self::$screen_id['settings'] = add_submenu_page( + self::$screen_id['network_settings'] = add_submenu_page( self::RECORDS_PAGE_SLUG, __( 'Stream Network Settings', 'stream' ), __( 'Network Settings', 'stream' ), self::SETTINGS_CAP, - 'wp_stream_settings', - array( __CLASS__, 'render_page' ) - ); - self::$screen_id['default_settings'] = add_submenu_page( - self::RECORDS_PAGE_SLUG, - __( 'Stream Default Settings', 'stream' ), - __( 'Default Settings', 'stream' ), - self::SETTINGS_CAP, - 'wp_stream_default_settings', + 'wp_stream_network_settings', array( __CLASS__, 'render_page' ) ); + if ( ! self::$disable_access ) { + self::$screen_id['default_settings'] = add_submenu_page( + self::RECORDS_PAGE_SLUG, + __( 'Stream Default Settings', 'stream' ), + __( 'Default Settings', 'stream' ), + self::SETTINGS_CAP, + 'wp_stream_default_settings', + array( __CLASS__, 'render_page' ) + ); + } } else { self::$screen_id['settings'] = add_submenu_page( self::RECORDS_PAGE_SLUG, @@ -347,11 +349,18 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $form_action = is_network_admin() ? network_admin_url( 'edit.php?action=stream_settings' ) : admin_url( 'options.php' ); + $option_key = WP_Stream_Settings::SETTINGS_KEY; + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( 'wp_stream_default_settings' === $current_page ) { + $option_key = WP_Stream_Settings::DEFAULTS_KEY; + } + + $form_action = is_network_admin() ? add_query_arg( array( 'action' => $current_page ), 'edit.php' ) : admin_url( 'options.php' ); ?>
-

+

+ array( 'delete_all_records', @@ -53,7 +59,11 @@ function get_fields( $fields ) { ), ) ); - $hidden_options = is_network_admin() ? $site_only_options : $network_only_options; + if ( 'wp_stream_network_settings' == $current_page && is_network_admin() ) { + $hidden_options = $site_only_options; + } else { + $hidden_options = $network_only_options; + } foreach ( $fields as $section_key => $section ) { foreach ( $section['fields'] as $key => $field ) { @@ -66,7 +76,7 @@ function get_fields( $fields ) { } } - if ( is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + if ( 'wp_stream_network_settings' == $current_page && is_network_admin() ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', 'title' => __( 'Enable Site Access', 'stream' ), @@ -75,7 +85,6 @@ function get_fields( $fields ) { 'desc' => __( 'When site access is disabled Stream can only be accessed from the network administration.', 'stream' ), 'type' => 'checkbox', ); - $new_fields['exclude']['desc'] = __( 'These settings will apply to the Network Stream.', 'stream' ); $fields = array_merge_recursive( $new_fields, $fields ); } @@ -99,7 +108,7 @@ function get_network_sites() { * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || 'stream_settings' !== $_GET['action'] ) { + if ( ! isset( $_GET['action'] ) || 'wp_stream_network_settings' !== $_GET['action'] ) { return; } @@ -142,6 +151,53 @@ function network_options_action() { exit; } + /** + * Wrapper for the settings API to work on the default settings page + */ + function default_options_action() { + if ( ! isset( $_GET['action'] ) || 'wp_stream_default_settings' !== $_GET['action'] ) { + return; + } + + $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; + + if ( $options ) { + + foreach ( $options as $option ) { + $option = trim( $option ); + $value = null; + + $sections = WP_Stream_Settings::get_fields(); + foreach ( $sections as $section_name => $section ) { + foreach ( $section['fields'] as $field_idx => $field ) { + $option_key = $section_name . '_' . $field['name']; + if ( isset( $_POST[ $option ][ $option_key ] ) ) { + $value[ $option_key ] = $_POST[ $option ][ $option_key ]; + } else { + $value[ $option_key ] = false; + } + } + } + + if ( ! is_array( $value ) ) { + $value = trim( $value ); + } + + update_site_option( $option, $value ); + } + } + + if ( ! count( get_settings_errors() ) ) { + add_settings_error( 'general', 'settings_updated', __( 'Default Settings saved.', 'stream' ), 'updated' ); + } + + set_transient( 'settings_errors', get_settings_errors(), 30 ); + + $go_back = add_query_arg( 'settings-updated', 'true', wp_get_referer() ); + wp_redirect( $go_back ); + exit; + } + /** * Filters stream options when on the network settings page * @@ -155,7 +211,7 @@ function filter_options( $options ) { } $network_options = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::KEY, array() ), + (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), WP_Stream_Settings::get_defaults() ); diff --git a/includes/settings.php b/includes/settings.php index 44945fa0b..9298f2d16 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -10,7 +10,12 @@ class WP_Stream_Settings { /** * Settings key/identifier */ - const KEY = 'wp_stream'; + const SETTINGS_KEY = 'wp_stream'; + + /** + * Default Settings key/identifier + */ + const DEFAULTS_KEY = 'wp_stream_defaults'; /** * Plugin settings @@ -27,16 +32,23 @@ class WP_Stream_Settings { public static $fields = array(); public static function get_options() { + + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + + if ( 'wp_stream_default_settings' === $current_page ) { + return self::get_defaults(); + } + /** * Filter allows for modification of options * * @param array array of options * @return array updated array of options - */ + */ return apply_filters( 'wp_stream_options', wp_parse_args( - (array) get_option( self::KEY, array() ), + (array) get_option( self::SETTINGS_KEY, array() ), self::get_defaults() ) ); @@ -55,10 +67,10 @@ public static function load() { add_action( 'admin_init', array( __CLASS__, 'register_settings' ) ); // Check if we need to flush rewrites rules - add_action( 'update_option_' . self::KEY, array( __CLASS__, 'updated_option_trigger_flush_rules' ), 10, 2 ); + add_action( 'update_option_' . self::SETTINGS_KEY, array( __CLASS__, 'updated_option_trigger_flush_rules' ), 10, 2 ); // Remove records when records TTL is shortened - add_action( 'update_option_' . self::KEY, array( __CLASS__, 'updated_option_ttl_remove_records' ), 10, 2 ); + add_action( 'update_option_' . self::SETTINGS_KEY, array( __CLASS__, 'updated_option_ttl_remove_records' ), 10, 2 ); add_filter( 'wp_stream_serialized_labels', array( __CLASS__, 'get_settings_translations' ) ); @@ -338,6 +350,7 @@ public static function get_fields() { public static function get_defaults() { $fields = self::get_fields(); $defaults = array(); + foreach ( $fields as $section_name => $section ) { foreach ( $section['fields'] as $field ) { $defaults[ $section_name.'_'.$field['name'] ] = isset( $field['default'] ) @@ -345,7 +358,21 @@ public static function get_defaults() { : null; } } - return $defaults; + + /** + * Filter allows for modification of options defaults + * + * @param array array of options + * @return array updated array of option defaults + */ + return apply_filters( + 'wp_stream_option_defaults', + wp_parse_args( + (array) get_site_option( self::DEFAULTS_KEY, array() ), + $defaults + ) + ); + } /** @@ -357,14 +384,20 @@ public static function register_settings() { $sections = self::get_fields(); - register_setting( self::KEY, self::KEY ); + $option_key = WP_Stream_Settings::SETTINGS_KEY; + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( 'wp_stream_default_settings' === $current_page ) { + $option_key = WP_Stream_Settings::DEFAULTS_KEY; + } + + register_setting( $option_key, $option_key ); foreach ( $sections as $section_name => $section ) { add_settings_section( $section_name, null, '__return_false', - self::KEY + $option_key ); foreach ( $section['fields'] as $field_idx => $field ) { @@ -375,11 +408,11 @@ public static function register_settings() { $field['name'], $field['title'], ( isset( $field['callback'] ) ? $field['callback'] : array( __CLASS__, 'output_field' ) ), - self::KEY, + $option_key, $section_name, $field + array( 'section' => $section_name, - 'label_for' => sprintf( '%s_%s_%s', self::KEY, $section_name, $field['name'] ), // xss ok + 'label_for' => sprintf( '%s_%s_%s', $option_key, $section_name, $field['name'] ), // xss ok ) ); } @@ -429,6 +462,12 @@ public static function render_field( $field ) { $nonce = isset( $field['nonce'] ) ? $field['nonce'] : null; $current_value = self::$options[ $section . '_' . $name ]; + $option_key = self::SETTINGS_KEY; + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( 'wp_stream_default_settings' === $current_page ) { + $option_key = self::DEFAULTS_KEY; + } + if ( is_callable( $current_value ) ) { $current_value = call_user_func( $current_value ); } @@ -449,7 +488,7 @@ public static function render_field( $field ) { $output = sprintf( ' %8$s', esc_attr( $type ), - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ), esc_attr( $class ), @@ -461,7 +500,7 @@ public static function render_field( $field ) { case 'checkbox': $output = sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ), checked( $current_value, 1, false ), @@ -471,14 +510,14 @@ public static function render_field( $field ) { case 'multi_checkbox': $output = sprintf( '
', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); // Fallback if nothing is selected $output .= sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); @@ -492,7 +531,7 @@ public static function render_field( $field ) { '
', sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ), esc_attr( $value ), @@ -510,7 +549,7 @@ public static function render_field( $field ) { $output = sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ), esc_attr( $class ) @@ -542,7 +581,7 @@ public static function render_field( $field ) { case 'link': $output = sprintf( '%6$s', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ), esc_attr( $class ), @@ -554,6 +593,7 @@ public static function render_field( $field ) { if ( ! isset ( $current_value ) ) { $current_value = array(); } + if ( false !== ( $key = array_search( '__placeholder__', $current_value ) ) ) { unset( $current_value[ $key ] ); } @@ -584,7 +624,7 @@ public static function render_field( $field ) { $output = sprintf( '
', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); @@ -601,7 +641,7 @@ public static function render_field( $field ) { // to store data with default value if nothing is selected $output .= sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); @@ -650,7 +690,7 @@ public static function render_field( $field ) { $output = sprintf( '
', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); @@ -666,7 +706,7 @@ public static function render_field( $field ) { // to store data with default value if nothing is selected $output .= sprintf( '', - esc_attr( self::KEY ), + esc_attr( $option_key ), esc_attr( $section ), esc_attr( $name ) ); @@ -780,13 +820,13 @@ public static function get_excluded_by_key( $column ) { * @return array Multidimensional array of fields */ public static function get_settings_translations( $labels ) { - if ( ! isset( $labels[ self::KEY ] ) ) { - $labels[ self::KEY ] = array(); + if ( ! isset( $labels[ self::SETTINGS_KEY ] ) ) { + $labels[ self::SETTINGS_KEY ] = array(); } foreach ( self::get_fields() as $section_slug => $section ) { foreach ( $section['fields'] as $field ) { - $labels[ self::KEY ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; + $labels[ self::SETTINGS_KEY ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; } } From b4cf0c123c8682568794fd8f4d1c36505150badc Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 21:08:29 +1000 Subject: [PATCH 043/123] Add get_option_key to settings. --- includes/admin.php | 11 +++------- includes/network.php | 49 +++++++++++++++++++++++-------------------- includes/settings.php | 36 ++++++++++++++++++------------- 3 files changed, 50 insertions(+), 46 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 547b43668..bc4fb0d4b 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -349,17 +349,12 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $option_key = WP_Stream_Settings::SETTINGS_KEY; - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - if ( 'wp_stream_default_settings' === $current_page ) { - $option_key = WP_Stream_Settings::DEFAULTS_KEY; - } - - $form_action = is_network_admin() ? add_query_arg( array( 'action' => $current_page ), 'edit.php' ) : admin_url( 'options.php' ); + $option_key = WP_Stream_Settings::get_option_key(); + $form_action = is_network_admin() ? add_query_arg( array( 'action' => $option_key ), 'edit.php' ) : admin_url( 'options.php' ); ?>
-

+

diff --git a/includes/network.php b/includes/network.php index e0a8b63d3..1619f0c54 100644 --- a/includes/network.php +++ b/includes/network.php @@ -40,26 +40,29 @@ function get_fields( $fields ) { return $fields; } - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - if ( ! $current_page ) { - $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); - } + $option_key = WP_Stream_Settings::get_option_key(); + + $network_only_options = apply_filters( + 'wp_stream_network_only_option_fields', + array( + 'general' => array( + 'delete_all_records', + 'records_ttl', + ), + ) + ); + + $site_only_options = apply_filters( + 'wp_stream_site_only_option_fields', + array( + 'general' => array( + 'role_access', + 'private_feeds', + ), + ) + ); - $network_only_options = apply_filters( 'wp_stream_network_only_option_fields', array( - 'general' => array( - 'delete_all_records', - 'records_ttl', - ), - ) ); - - $site_only_options = apply_filters( 'wp_stream_site_only_option_fields', array( - 'general' => array( - 'role_access', - 'private_feeds', - ), - ) ); - - if ( 'wp_stream_network_settings' == $current_page && is_network_admin() ) { + if ( WP_Stream_Settings::SETTINGS_KEY === $option_key && is_network_admin() ) { $hidden_options = $site_only_options; } else { $hidden_options = $network_only_options; @@ -76,7 +79,7 @@ function get_fields( $fields ) { } } - if ( 'wp_stream_network_settings' == $current_page && is_network_admin() ) { + if ( WP_Stream_Settings::SETTINGS_KEY === $option_key && is_network_admin() ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', 'title' => __( 'Enable Site Access', 'stream' ), @@ -108,7 +111,7 @@ function get_network_sites() { * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || 'wp_stream_network_settings' !== $_GET['action'] ) { + if ( ! isset( $_GET['action'] ) || 'wp_stream' !== $_GET['action'] ) { return; } @@ -141,7 +144,7 @@ function network_options_action() { } if ( ! count( get_settings_errors() ) ) { - add_settings_error( 'general', 'settings_updated', __( 'Settings saved.', 'stream' ), 'updated' ); + add_settings_error( 'general', 'settings_updated', __( 'Network Settings saved.', 'stream' ), 'updated' ); } set_transient( 'settings_errors', get_settings_errors(), 30 ); @@ -155,7 +158,7 @@ function network_options_action() { * Wrapper for the settings API to work on the default settings page */ function default_options_action() { - if ( ! isset( $_GET['action'] ) || 'wp_stream_default_settings' !== $_GET['action'] ) { + if ( ! isset( $_GET['action'] ) || 'wp_stream_defaults' !== $_GET['action'] ) { return; } diff --git a/includes/settings.php b/includes/settings.php index 9298f2d16..3b919b4fc 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -33,9 +33,9 @@ class WP_Stream_Settings { public static function get_options() { - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + $option_key = self::get_option_key(); - if ( 'wp_stream_default_settings' === $current_page ) { + if ( self::DEFAULTS_KEY === $option_key ) { return self::get_defaults(); } @@ -376,20 +376,31 @@ public static function get_defaults() { } /** - * Registers settings fields and sections + * Returns the correct option key based on the current screen. * - * @return void + * @return array Default option values */ - public static function register_settings() { - - $sections = self::get_fields(); - - $option_key = WP_Stream_Settings::SETTINGS_KEY; + public static function get_option_key() { $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); if ( 'wp_stream_default_settings' === $current_page ) { $option_key = WP_Stream_Settings::DEFAULTS_KEY; + } else { + $option_key = WP_Stream_Settings::SETTINGS_KEY; } + return $option_key; + } + + /** + * Registers settings fields and sections + * + * @return void + */ + public static function register_settings() { + + $sections = self::get_fields(); + $option_key = self::get_option_key(); + register_setting( $option_key, $option_key ); foreach ( $sections as $section_name => $section ) { @@ -461,12 +472,7 @@ public static function render_field( $field ) { $title = isset( $field['title'] ) ? $field['title'] : null; $nonce = isset( $field['nonce'] ) ? $field['nonce'] : null; $current_value = self::$options[ $section . '_' . $name ]; - - $option_key = self::SETTINGS_KEY; - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - if ( 'wp_stream_default_settings' === $current_page ) { - $option_key = self::DEFAULTS_KEY; - } + $option_key = self::get_option_key(); if ( is_callable( $current_value ) ) { $current_value = call_user_func( $current_value ); From ee44bf3e59d41a9bb0a3b140a06334ec436f3963 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 21:24:47 +1000 Subject: [PATCH 044/123] Streamlined saving network and default settings. --- includes/admin.php | 5 +++-- includes/network.php | 52 ++----------------------------------------- includes/settings.php | 3 +++ 3 files changed, 8 insertions(+), 52 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index bc4fb0d4b..be71e7b3c 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -349,8 +349,9 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $option_key = WP_Stream_Settings::get_option_key(); - $form_action = is_network_admin() ? add_query_arg( array( 'action' => $option_key ), 'edit.php' ) : admin_url( 'options.php' ); + $option_key = WP_Stream_Settings::get_option_key(); + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + $form_action = is_network_admin() ? add_query_arg( array( 'action' => $current_page ), 'edit.php' ) : admin_url( 'options.php' ); ?>
diff --git a/includes/network.php b/includes/network.php index 1619f0c54..7dcb5174c 100644 --- a/includes/network.php +++ b/includes/network.php @@ -16,7 +16,6 @@ function __construct() { function actions() { add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); - add_action( 'wpmuadminedit', array( $this, 'default_options_action' ) ); } function filters() { @@ -111,7 +110,7 @@ function get_network_sites() { * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || 'wp_stream' !== $_GET['action'] ) { + if ( ! isset( $_GET['action'] ) || ( 'wp_stream_network_settings' !== $_GET['action'] && 'wp_stream_default_settings' !== $_GET['action'] ) ) { return; } @@ -144,54 +143,7 @@ function network_options_action() { } if ( ! count( get_settings_errors() ) ) { - add_settings_error( 'general', 'settings_updated', __( 'Network Settings saved.', 'stream' ), 'updated' ); - } - - set_transient( 'settings_errors', get_settings_errors(), 30 ); - - $go_back = add_query_arg( 'settings-updated', 'true', wp_get_referer() ); - wp_redirect( $go_back ); - exit; - } - - /** - * Wrapper for the settings API to work on the default settings page - */ - function default_options_action() { - if ( ! isset( $_GET['action'] ) || 'wp_stream_defaults' !== $_GET['action'] ) { - return; - } - - $options = isset( $_POST['option_page'] ) ? explode( ',', stripslashes( $_POST['option_page'] ) ) : null; - - if ( $options ) { - - foreach ( $options as $option ) { - $option = trim( $option ); - $value = null; - - $sections = WP_Stream_Settings::get_fields(); - foreach ( $sections as $section_name => $section ) { - foreach ( $section['fields'] as $field_idx => $field ) { - $option_key = $section_name . '_' . $field['name']; - if ( isset( $_POST[ $option ][ $option_key ] ) ) { - $value[ $option_key ] = $_POST[ $option ][ $option_key ]; - } else { - $value[ $option_key ] = false; - } - } - } - - if ( ! is_array( $value ) ) { - $value = trim( $value ); - } - - update_site_option( $option, $value ); - } - } - - if ( ! count( get_settings_errors() ) ) { - add_settings_error( 'general', 'settings_updated', __( 'Default Settings saved.', 'stream' ), 'updated' ); + add_settings_error( 'general', 'settings_updated', __( 'Settings saved.', 'stream' ), 'updated' ); } set_transient( 'settings_errors', get_settings_errors(), 30 ); diff --git a/includes/settings.php b/includes/settings.php index 3b919b4fc..68ab5adb6 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -382,6 +382,9 @@ public static function get_defaults() { */ public static function get_option_key() { $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( ! $current_page ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); + } if ( 'wp_stream_default_settings' === $current_page ) { $option_key = WP_Stream_Settings::DEFAULTS_KEY; } else { From d5c6e88fe211f62fdf93834182166c79e4f12c37 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 21:25:48 +1000 Subject: [PATCH 045/123] Remove get_network_sites() since it's not used --- includes/network.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/includes/network.php b/includes/network.php index 7dcb5174c..ea6051454 100644 --- a/includes/network.php +++ b/includes/network.php @@ -94,18 +94,6 @@ function get_fields( $fields ) { return $fields; } - function get_network_sites() { - $return = array(); - $sites = wp_get_sites(); - - foreach ( $sites as $site ) { - $blog = get_blog_details( (int) $site['blog_id'] ); - $return[ $blog->blog_id ] = $blog->blogname; - } - - return $return; - } - /** * Wrapper for the settings API to work on the network settings page */ From 9d443b4d1e802247be452219fa80a2d777416df6 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 21:35:08 +1000 Subject: [PATCH 046/123] Fix reset database when network enabled --- includes/admin.php | 6 +++--- includes/network.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index be71e7b3c..02fb33b3b 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -146,12 +146,12 @@ public static function register_menu() { ); if ( is_network_admin() ) { - self::$screen_id['network_settings'] = add_submenu_page( + self::$screen_id['settings'] = add_submenu_page( self::RECORDS_PAGE_SLUG, __( 'Stream Network Settings', 'stream' ), __( 'Network Settings', 'stream' ), self::SETTINGS_CAP, - 'wp_stream_network_settings', + 'wp_stream_settings', array( __CLASS__, 'render_page' ) ); if ( ! self::$disable_access ) { @@ -422,7 +422,7 @@ public static function wp_ajax_reset() { 'page' => 'wp_stream_settings', 'message' => 'data_erased', ), - is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) + is_plugin_active_for_network( WP_STREAM_PLUGIN ) ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ) ); exit; diff --git a/includes/network.php b/includes/network.php index ea6051454..469b99a17 100644 --- a/includes/network.php +++ b/includes/network.php @@ -98,7 +98,7 @@ function get_fields( $fields ) { * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || ( 'wp_stream_network_settings' !== $_GET['action'] && 'wp_stream_default_settings' !== $_GET['action'] ) ) { + if ( ! isset( $_GET['action'] ) || ( 'wp_stream_settings' !== $_GET['action'] && 'wp_stream_default_settings' !== $_GET['action'] ) ) { return; } From d2067b5d58c46a16de22d460672b2eb7b66ddbb9 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 2 Apr 2014 21:38:42 +1000 Subject: [PATCH 047/123] Fix tabs on default settings page --- ui/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin.js b/ui/admin.js index 84ca5a687..94f40e552 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -283,7 +283,7 @@ jQuery(function($){ hashIndex = window.location.hash.match(/^#(\d+)$/), currentHash = ( hashIndex !== null ? hashIndex[1] : defaultIndex ), syncFormAction = function( index ) { - var $optionsForm = $('input[name="option_page"][value="wp_stream"]').parent('form'); + var $optionsForm = $('input[name="option_page"][value^="wp_stream"]').parent('form'); var currentAction = $optionsForm.attr('action'); $optionsForm.prop('action', currentAction.replace( /(^[^#]*).*$/, '$1#' + index )); From 6790657cbd141b67c86d8702a60852f44d8dc098 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 08:59:09 +1000 Subject: [PATCH 048/123] Fix for NULL default for blog_id column --- includes/install.php | 4 ++-- includes/list-table.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/install.php b/includes/install.php index 6fc30f8a2..17acc6c12 100644 --- a/includes/install.php +++ b/includes/install.php @@ -51,7 +51,7 @@ public static function install() { $sql = "CREATE TABLE {$prefix}stream ( ID bigint(20) unsigned NOT NULL AUTO_INCREMENT, site_id bigint(20) unsigned NOT NULL DEFAULT '1', - blog_id bigint(20) unsigned NOT NULL DEFAULT NULL, + blog_id bigint(20) unsigned NOT NULL DEFAULT '0', object_id bigint(20) unsigned NULL, author bigint(20) unsigned NOT NULL DEFAULT '0', summary longtext NOT NULL, @@ -214,7 +214,7 @@ public static function update( $db_version, $current ) { // If version is lower than 1.4.0, manually alter the column order. Not possible using dbDelta alone. if ( version_compare( $db_version, '1.4.0', '<' ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT NULL AFTER site_id" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); } } diff --git a/includes/list-table.php b/includes/list-table.php index dc9afb0c6..bdc3eb5c4 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -263,7 +263,7 @@ function column_default( $item, $column_name ) { break; case 'blog_id': - $blog = isset( $item->blog_id ) ? get_blog_details( $item->blog_id ) : self::get_network_blog(); + $blog = $item->blog_id ? get_blog_details( $item->blog_id ) : self::get_network_blog(); $out = sprintf( '%s', add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), From 8f493ad8a7d87ed162ddabdb3bf38b8d4db2cfbd Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 08:59:25 +1000 Subject: [PATCH 049/123] Capability check if tables do not exist --- stream.php | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/stream.php b/stream.php index 683bd3b48..0aea4479a 100644 --- a/stream.php +++ b/stream.php @@ -48,7 +48,7 @@ class WP_Stream { /** * @var WP_Stream_DB */ - public $db = null; + public static $db = null; /** * @var WP_Stream_Network @@ -83,7 +83,7 @@ private function __construct() { // Load DB helper class require_once WP_STREAM_INC_DIR . 'db-actions.php'; - $this->db = new WP_Stream_DB; + self::$db = new WP_Stream_DB; if ( defined( 'WP_CLI' ) && WP_CLI ) { return; @@ -98,7 +98,7 @@ private function __construct() { } // Check DB and add message if not present - $this->verify_database_present(); + add_action( 'plugins_loaded', array( __CLASS__, 'verify_database_present' ) ); // Load languages add_action( 'plugins_loaded', array( __CLASS__, 'i18n' ) ); @@ -172,7 +172,11 @@ public static function install() { * * @return void */ - private function verify_database_present() { + public static function verify_database_present() { + if ( ! function_exists( 'is_plugin_active_for_network' ) ) { + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + } + /** * Filter will halt verify_database_present() if set to true * @@ -184,23 +188,30 @@ private function verify_database_present() { } global $wpdb; - $message = ''; + $database_message = ''; + $uninstall_message = ''; // Check if all needed DB is present - foreach ( $this->db->get_table_names() as $table_name ) { + foreach ( self::$db->get_table_names() as $table_name ) { if ( $wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) !== $table_name ) { - $message .= sprintf( '

%s %s

', __( 'The following table is not present in the WordPress database :', 'stream' ), $table_name ); + $database_message .= sprintf( '

%s %s

', __( 'The following table is not present in the WordPress database :', 'stream' ), $table_name ); } } + if ( is_plugin_active_for_network( WP_STREAM_PLUGIN ) && current_user_can( 'manage_network_plugins' ) ) { + $uninstall_message = sprintf( __( 'Please uninstall the Stream plugin and activate it again.', 'stream' ), network_admin_url( 'plugins.php#stream' ) ); + } elseif ( current_user_can( 'activate_plugins' ) ) { + $uninstall_message = sprintf( __( 'Please uninstall the Stream plugin and activate it again.', 'stream' ), admin_url( 'plugins.php#stream' ) ); + } + // Check upgrade routine self::install(); - if ( ! empty( $message ) ) { + if ( ! empty( $database_message ) ) { self::$messages['wp_stream_db_error'] = sprintf( '
%s

%s

', - $message, - sprintf( __( 'Please uninstall the Stream plugin and activate it again.', 'stream' ), admin_url( 'plugins.php#stream' ) ) + $database_message, + $uninstall_message ); // xss ok } } From abf00dd05fc5f1d6c6dae1e4b281a5134a08f798 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 09:12:47 +1000 Subject: [PATCH 050/123] Fix for unnecessary static db in last commit --- stream.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stream.php b/stream.php index 0aea4479a..194d8ed3e 100644 --- a/stream.php +++ b/stream.php @@ -48,7 +48,7 @@ class WP_Stream { /** * @var WP_Stream_DB */ - public static $db = null; + public $db = null; /** * @var WP_Stream_Network @@ -83,7 +83,7 @@ private function __construct() { // Load DB helper class require_once WP_STREAM_INC_DIR . 'db-actions.php'; - self::$db = new WP_Stream_DB; + $this->db = new WP_Stream_DB; if ( defined( 'WP_CLI' ) && WP_CLI ) { return; @@ -98,7 +98,7 @@ private function __construct() { } // Check DB and add message if not present - add_action( 'plugins_loaded', array( __CLASS__, 'verify_database_present' ) ); + add_action( 'plugins_loaded', array( $this, 'verify_database_present' ) ); // Load languages add_action( 'plugins_loaded', array( __CLASS__, 'i18n' ) ); @@ -172,7 +172,7 @@ public static function install() { * * @return void */ - public static function verify_database_present() { + public function verify_database_present() { if ( ! function_exists( 'is_plugin_active_for_network' ) ) { require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); } @@ -192,7 +192,7 @@ public static function verify_database_present() { $uninstall_message = ''; // Check if all needed DB is present - foreach ( self::$db->get_table_names() as $table_name ) { + foreach ( $this->db->get_table_names() as $table_name ) { if ( $wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) !== $table_name ) { $database_message .= sprintf( '

%s %s

', __( 'The following table is not present in the WordPress database :', 'stream' ), $table_name ); } From 6295045c78d54928efd840d04c88e5dea74dd432 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 16:21:02 +1000 Subject: [PATCH 051/123] Merge remote-tracking branch 'origin/master' into issue-65 Conflicts: includes/admin.php includes/list-table.php includes/query.php includes/settings.php languages/stream-pl_PL.mo languages/stream-pl_PL.po readme.md readme.txt --- connectors/editor.php | 189 +++++++++++++++++++++ connectors/installer.php | 2 +- connectors/widgets.php | 2 +- includes/admin.php | 329 ++++++++++++++++++++++++------------- includes/context-query.php | 10 +- includes/install.php | 68 +++++++- includes/list-table.php | 246 +++++++++++++++++++-------- includes/network.php | 22 ++- includes/query.php | 20 +-- includes/settings.php | 11 +- languages/stream-pl_PL.mo | Bin 20925 -> 21338 bytes languages/stream-pl_PL.po | 201 ++++++++++++---------- readme.md | 40 ++++- readme.txt | 41 ++++- stream.php | 5 +- ui/admin.css | 20 +-- ui/admin.js | 92 ++++++++++- ui/dashboard.js | 68 +++++++- 18 files changed, 1039 insertions(+), 327 deletions(-) create mode 100644 connectors/editor.php diff --git a/connectors/editor.php b/connectors/editor.php new file mode 100644 index 000000000..7f49c8edc --- /dev/null +++ b/connectors/editor.php @@ -0,0 +1,189 @@ + __( 'Updated', 'stream' ), + ); + } + + /** + * Return translated context labels + * + * @return array Context label translations + */ + public static function get_context_labels() { + $themes = wp_get_themes(); + + $themes_slugs = array_map( + function( $theme ) { + return $theme->get_template(); + }, + $themes + ); + + $themes_names = array_map( + function( $theme ) { + return (string) $theme; + }, + $themes + ); + + return array_combine( $themes_slugs, $themes_names ); + } + + public static function get_message() { + return __( '"%1$s" in "%2$s" updated', 'stream' ); + } + + /** + * Add action links to Stream drop row in admin list screen + * + * @filter wp_stream_action_links_{connector} + * @param array $links Previous links registered + * @param int $record Stream record + * @return array Action links + */ + public static function action_links( $links, $record ) { + if ( current_user_can( 'edit_theme_options' ) ) { + $file_name = get_stream_meta( $record->ID, 'file', true ); + $theme_slug = get_stream_meta( $record->ID, 'theme_slug', true ); + + if ( '' !== $file_name && '' !== $theme_slug ) { + $links[ __( 'Edit File', 'stream' ) ] = admin_url( + sprintf( + 'theme-editor.php?theme=%s&file=%s', + $theme_slug, + $file_name + ) + ); + + $links[ __( 'Edit Theme', 'stream' ) ] = admin_url( + sprintf( + 'themes.php?theme=%s', + $theme_slug + ) + ); + } + } + + return $links; + } + + /** + * @action load-theme-editor.php + */ + public static function get_edition_data() { + if ( 'POST' !== $_SERVER['REQUEST_METHOD'] ) { + return; + } + + if ( 'update' !== wp_stream_filter_input( INPUT_POST, 'action' ) ) { + return; + } + + $theme_slug = wp_stream_filter_input( INPUT_POST, 'theme' ) ? wp_stream_filter_input( INPUT_POST, 'theme' ) : get_stylesheet(); + $theme = wp_get_theme( $theme_slug ); + + if ( ! $theme->exists() || ( $theme->errors() && 'theme_no_stylesheet' === $theme->errors()->get_error_code() ) ) { + return; + } + + $allowed_files = $theme->get_files( 'php', 1 ); + $style_files = $theme->get_files( 'css' ); + $allowed_files['style.css'] = $style_files['style.css']; + $file = wp_stream_filter_input( INPUT_POST, 'file' ); + + if ( empty( $file ) ) { + $file_name = 'style.css'; + $file_path = $allowed_files['style.css']; + } else { + $file_name = $file; + $file_path = sprintf( '%s/%s', $theme->get_stylesheet_directory(), $file_name ); + } + + $file_contents_before = file_get_contents( $file_path ); + + self::$edited_file = compact( + 'file_name', + 'file_path', + 'file_contents_before', + 'theme' + ); + } + + /** + * @filter wp_redirect + */ + public static function log_changes( $location ) { + if ( ! empty( self::$edited_file ) ) { + $file_contents_after = file_get_contents( self::$edited_file['file_path'] ); + + if ( $file_contents_after !== self::$edited_file['file_contents_before'] ) { + $theme_slug = self::$edited_file['theme']->get_template(); + $properties = array( + 'file' => self::$edited_file['file_name'], + 'theme_name' => (string) self::$edited_file['theme'], + 'theme_slug' => $theme_slug, + ); + + self::log( + self::get_message(), + $properties, + null, + array( $theme_slug => 'updated' ) + ); + } + } + + return $location; + } + +} diff --git a/connectors/installer.php b/connectors/installer.php index b89a7f513..fcc2f6db1 100644 --- a/connectors/installer.php +++ b/connectors/installer.php @@ -312,7 +312,7 @@ public static function callback_pre_set_site_transient_update_plugins( $value ) } public static function callback_wp_redirect( $location ) { - if ( ! preg_match( '#(plugin|theme)-editor.php#', $location, $match ) ) { + if ( ! preg_match( '#(plugin)-editor.php#', $location, $match ) ) { return $location; } diff --git a/connectors/widgets.php b/connectors/widgets.php index da6f5feb8..83e63e787 100644 --- a/connectors/widgets.php +++ b/connectors/widgets.php @@ -59,7 +59,7 @@ public static function get_context_labels() { $labels[ $sidebar['id'] ] = $sidebar['name']; } - $labels['wp_inactive_widgets'] = esc_html__( 'Inactive Widgets' ); + $labels['wp_inactive_widgets'] = esc_html__( 'Inactive Widgets', 'stream' ); return $labels; } diff --git a/includes/admin.php b/includes/admin.php index 02fb33b3b..06602e75a 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -93,11 +93,13 @@ public static function load() { add_action( 'wp_ajax_stream_activity_dashboard_update', array( __CLASS__, 'dashboard_stream_activity_update_contents' ) ); // Heartbeat live update - add_filter( 'heartbeat_received', array( __CLASS__, 'live_update' ), 10, 2 ); + add_filter( 'heartbeat_received', array( __CLASS__, 'heartbeat_received' ), 10, 2 ); // Enable/Disable live update per user add_action( 'wp_ajax_stream_enable_live_update', array( __CLASS__, 'enable_live_update' ) ); + add_action( 'wp_ajax_stream_toggle_filters', array( __CLASS__, 'toggle_filters' ) ); + // Ajax authors list add_action( 'wp_ajax_wp_stream_filters', array( __CLASS__, 'ajax_filters' ) ); @@ -206,7 +208,8 @@ public static function admin_enqueue_scripts( $hook ) { wp_enqueue_style( 'wp-stream-admin', WP_STREAM_URL . 'ui/admin.css', array() ); if ( ! in_array( $hook, self::$screen_id ) && 'dashboard.php' !== $hook ) { - wp_enqueue_script( 'wp-stream-admin-dashboard', WP_STREAM_URL . 'ui/dashboard.js', array( 'jquery' ) ); + + wp_enqueue_script( 'wp-stream-admin-dashboard', WP_STREAM_URL . 'ui/dashboard.js', array( 'jquery', 'heartbeat' ) ); return; } @@ -225,7 +228,7 @@ public static function admin_enqueue_scripts( $hook ) { 'wp-stream-admin', 'wp_stream', array( - 'i18n' => array( + 'i18n' => array( 'confirm_purge' => __( 'Are you sure you want to delete all Stream activity records from the database? This cannot be undone.', 'stream' ), 'confirm_uninstall' => __( 'Are you sure you want to uninstall and deactivate Stream? This will delete all Stream tables from the database and cannot be undone.', 'stream' ), ), @@ -234,6 +237,7 @@ public static function admin_enqueue_scripts( $hook ) { 'current_page' => isset( $_GET['paged'] ) ? esc_js( $_GET['paged'] ) : '1', 'current_order' => isset( $_GET['order'] ) ? esc_js( $_GET['order'] ) : 'desc', 'current_query' => json_encode( $_GET ), + 'filters' => self::$list_table->get_filters(), ) ); } @@ -242,7 +246,9 @@ public static function admin_enqueue_scripts( $hook ) { * Add a specific body class to all Stream admin screens * * @filter admin_body_class + * * @param array $classes + * * @return array $classes */ public static function admin_body_class( $classes ) { @@ -326,10 +332,10 @@ public static function admin_menu_css() { */ public static function plugin_action_links( $links, $file ) { if ( plugin_basename( WP_STREAM_DIR . 'stream.php' ) === $file ) { - $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); + $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $links[] = sprintf( '%s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'stream' ) ); - $url = add_query_arg( + $url = add_query_arg( array( 'action' => 'wp_stream_uninstall', 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), @@ -367,7 +373,7 @@ public static function render_page() {

$data ) : ?> - + @@ -378,24 +384,24 @@ public static function render_page() {
- $data ) { - $i++; - $is_active = ( ( 1 === $i && ! $active_tab ) || $active_tab === $section ); - if ( $is_active ) { - settings_fields( $option_key ); - do_settings_sections( $option_key ); - } - } - submit_button(); - ?> + $data ) { + $i++; + $is_active = ( ( 1 === $i && ! $active_tab ) || $active_tab === $section ); + if ( $is_active ) { + settings_fields( $option_key ); + do_settings_sections( $option_key ); + } + } + submit_button(); + ?>

- true ) , admin_url( 'plugins.php' ) ) ); + wp_redirect( add_query_arg( array( 'deactivate' => true ), admin_url( 'plugins.php' ) ) ); exit; } else { wp_die( "You don't have sufficient privileges to do this action." ); @@ -587,16 +593,17 @@ public static function dashboard_stream_activity() { ); } - public static function dashboard_get_total_found_rows(){ + public static function dashboard_get_total_found_rows() { global $wpdb; + return $wpdb->get_var( 'SELECT FOUND_ROWS()' ); } - public static function dashboard_stream_activity_initial_contents(){ + public static function dashboard_stream_activity_initial_contents() { self::dashboard_stream_activity_contents(); } - public static function dashboard_stream_activity_update_contents(){ + public static function dashboard_stream_activity_update_contents() { $paged = ! empty( $_POST['stream-paged'] ) ? absint( $_POST['stream-paged'] ) : 1; self::dashboard_stream_activity_contents( $paged ); @@ -628,58 +635,16 @@ public static function dashboard_stream_activity_contents( $paged = 1 ) { echo '
- self::RECORDS_PAGE_SLUG ) ); + + $last_id = intval( $data['wp-stream-heartbeat-last-id'] ); + $query = $data['wp-stream-heartbeat-query']; + if ( empty( $query ) ) { + $query = array(); + } - if ( isset( $data['wp-stream-heartbeat'] ) && 'live-update' === $data['wp-stream-heartbeat'] && $enable_update ) { - // Register list table - require_once WP_STREAM_INC_DIR . 'list-table.php'; - self::$list_table = new WP_Stream_List_Table( array( 'screen' => self::RECORDS_PAGE_SLUG ) ); + // Decode the query + $query = json_decode( wp_kses_stripslashes( $query ) ); - $last_id = intval( $data['wp-stream-heartbeat-last-id'] ); - $query = $data['wp-stream-heartbeat-query']; - if ( empty( $query ) ) { - $query = array(); + $updated_items = self::gather_updated_items( $last_id, $query ); + + if ( ! empty( $updated_items ) ) { + ob_start(); + foreach ( $updated_items as $item ) { + self::$list_table->single_row( $item ); } - // Decode the query - $query = json_decode( wp_kses_stripslashes( $query ) ); + $send = ob_get_clean(); + } else { + $send = ''; + } - $updated_items = self::gather_updated_items( $last_id, $query ); + return $send; + } - if ( ! empty( $updated_items ) ) { - ob_start(); - foreach ( $updated_items as $item ) { - self::$list_table->single_row( $item ); - } - $response['wp-stream-heartbeat'] = ob_get_clean(); + /** + * Handles Live Updates for Stream Activity Dashboard Widget. + * + * @uses gather_updated_items + * + * @param array Response to heartbeat + * @param array Response from heartbeat + * @return array Data sent to heartbeat + */ + public static function live_update_dashboard( $response, $data ) { + + $send = array(); + + $last_id = intval( $data['wp-stream-heartbeat-last-id'] ); + + $updated_items = self::gather_updated_items( $last_id ); + + if ( ! empty( $updated_items ) ) { + ob_start(); + foreach ( $updated_items as $item ) { + echo self::dashboard_widget_row( $item ); //xss okay } - } else { - $response['log'] = 'udpates disabled'; + + $send = ob_get_clean(); } - return $response; + return $send; } /** - * Sends Updated Actions to the List Table View - * - * @param int $last_id Timestamp of last update - * @param array $query - * - * @return array Array of recently updated items - */ - public static function gather_updated_items( $last_id, $query = null ) { + * Sends Updated Actions to the List Table View + * + * @param int Timestamp of last update + * @param array $query + * + * @return array Array of recently updated items + */ + public static function gather_updated_items( $last_id, $query = array() ) { if ( false === $last_id ) { return ''; } - if ( is_null( $query ) ) { - $query = array(); - } - $default = array( 'record_greater_than' => (int) $last_id, ); @@ -877,12 +898,73 @@ public static function gather_updated_items( $last_id, $query = null ) { return $items; } + + /** + * Renders rows for Stream Activity Dashboard Widget + * + * @param obj Record to be inserted + * @param int Row number + * @return string Contents of new row + */ + public static function dashboard_widget_row( $item, $i = null ) { + $records_link = add_query_arg( + array( 'page' => self::RECORDS_PAGE_SLUG ), + admin_url( self::ADMIN_PARENT_PAGE ) + ); + + $author = get_userdata( $item->author ); + $author_link = add_query_arg( + array( 'author' => isset( $author->ID ) ? absint( $author->ID ) : 0 ), + $records_link + ); + + if ( $author ) { + $time_author = sprintf( + _x( + '%1$s ago by %3$s', + '1: Time, 2: User profile URL, 3: User display name', + 'stream' + ), + human_time_diff( strtotime( $item->created ) ), + esc_url( $author_link ), + esc_html( $author->display_name ) + ); + } else { + $time_author = sprintf( + __( '%s ago', 'stream' ), + human_time_diff( strtotime( $item->created ) ) + ); + } + $class = ''; + if ( isset( $i ) ) { + if ( $i % 2 ) { + $class = 'class="alternate"'; + } + } + ob_start() + ?> +
  • data-id="ID ) ?>"> + +
    + + ID, 36 ) ?> + +
    + + +
    + summary ) ?> +
    • + FILTER_SANITIZE_STRING, @@ -908,6 +990,29 @@ public static function enable_live_update() { } } + public static function toggle_filters() { + check_ajax_referer( 'stream_toggle_filters_nonce', 'nonce' ); + + $input = array( + 'checked' => wp_stream_filter_input( INPUT_POST, 'checked', FILTER_SANITIZE_STRING ), + 'user' => wp_stream_filter_input( INPUT_POST, 'user', FILTER_SANITIZE_NUMBER_INT ), + 'checkbox' => sanitize_key( $_POST['checkbox'] ), + ); + + $filters_option = get_user_meta( $input['user'], 'stream_toggle_filters', true ); + + $filters_option[ $input['checkbox'] ] = ( 'checked' === $input['checked'] ); + + $success = update_user_meta( $input['user'], 'stream_toggle_filters', $filters_option ); + + if ( $success ) { + wp_send_json( array( 'control' => $input['checkbox'] ) ); + } else { + wp_send_json_error( 'Toggled filter checkbox error' ); + } + + } + /** * @action wp_ajax_wp_stream_filters */ @@ -915,7 +1020,7 @@ public static function ajax_filters() { switch ( $_REQUEST['filter'] ) { case 'author': $results = array_map( - function( $user ) { + function ( $user ) { return array( 'id' => $user->id, 'text' => $user->display_name, @@ -929,7 +1034,7 @@ function( $user ) { // `search` arg for get_users() is not enough $results = array_filter( $results, - function( $result ) { + function ( $result ) { return mb_strpos( mb_strtolower( $result['text'] ), mb_strtolower( $_REQUEST['q'] ) ) !== false; } ); diff --git a/includes/context-query.php b/includes/context-query.php index 1a1c2907e..a204242cd 100644 --- a/includes/context-query.php +++ b/includes/context-query.php @@ -45,10 +45,12 @@ function parse_query_vars( $query ) { $lookup = array( '=', 'IN', 'NOT IN' ); $compare = $lookup[ $i ]; if ( ! empty( $query[ $key . $suffix ] ) ) { - $context_query[0][ $key ] = array( - 'value' => $query[ $key . $suffix ], - 'compare' => $compare, - ); + $context_query[] = array( + $key => array( + 'value' => $query[ $key . $suffix ], + 'compare' => $compare, + ), + ); } } } diff --git a/includes/install.php b/includes/install.php index 17acc6c12..4bc460ace 100644 --- a/includes/install.php +++ b/includes/install.php @@ -209,7 +209,13 @@ public static function update( $db_version, $current ) { // If version is lower than 1.3.0, do the update routine for site options // Backward settings compatibility for old version plugins if ( version_compare( $db_version, '1.3.0', '<' ) ) { - add_filter( 'wp_stream_after_connectors_registration', 'WP_Stream_Install::migrate_old_options_to_exclude_tab' ); + add_action( 'wp_stream_after_connectors_registration', 'WP_Stream_Install::migrate_old_options_to_exclude_tab' ); + } + + // If version is lower than 1.3.1, do the update routine + // Update records of Installer to Theme Editor connector + if ( version_compare( $db_version, '1.3.1', '<' ) ) { + add_action( 'wp_stream_after_connectors_registration', 'WP_Stream_Install::migrate_installer_edits_to_theme_editor_connector' ); } // If version is lower than 1.4.0, manually alter the column order. Not possible using dbDelta alone. @@ -222,10 +228,9 @@ public static function update( $db_version, $current ) { * Function will migrate old options from the General and Connectors tabs into the new Exclude tab * * @param $labels array connectors terms labels - * @used wp_stream_after_connector_term_labels_loaded + * @action wp_stream_after_connectors_registration */ public static function migrate_old_options_to_exclude_tab( $labels ) { - $old_options = get_option( WP_Stream_Settings::KEY, array() ); // Stream > Settings > General > Log Activity for @@ -250,4 +255,61 @@ public static function migrate_old_options_to_exclude_tab( $labels ) { update_option( WP_Stream_Settings::KEY, WP_Stream_Settings::$options ); } + /** + * Function will migrate theme file edit records from Installer connector to the Theme Editor connector + * + * @action wp_stream_after_connectors_registration + */ + public static function migrate_installer_edits_to_theme_editor_connector() { + global $wpdb; + + $args = array( + 'connector' => 'installer', + 'context' => 'themes', + 'action' => 'edited', + ); + $records = stream_query( $args ); + + foreach ( $records as $record ) { + $file_name = get_stream_meta( $record->ID, 'file', true ); + $theme_name = get_stream_meta( $record->ID, 'name', true ); + + if ( '' !== $theme_name ) { + $matched_themes = array_filter( + wp_get_themes(), + function( $theme ) use ( $theme_name ) { + return (string) $theme === $theme_name; + } + ); + $theme = array_shift( $matched_themes ); + + // `stream` + $wpdb->update( + $wpdb->stream, + array( + 'summary' => sprintf( WP_Stream_Connector_Editor::get_message(), $file_name, $theme_name ), + ), + array( 'ID' => $record->ID ) + ); + + // `stream_context` + $wpdb->update( + $wpdb->streamcontext, + array( + 'connector' => 'editor', + 'context' => is_object( $theme ) ? $theme->get_template() : $theme_name, + 'action' => 'updated', + ), + array( 'record_id' => $record->ID ) + ); + + update_stream_meta( $record->ID, 'theme_name', $theme_name ); + + if ( is_object( $theme ) ) { + update_stream_meta( $record->ID, 'theme_slug', $theme->get_template() ); + } + } + } + } + } diff --git a/includes/list-table.php b/includes/list-table.php index bdc3eb5c4..a61535bb2 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -6,8 +6,8 @@ function __construct( $args = array() ) { parent::__construct( array( 'post_type' => 'stream', - 'plural' => 'records', - 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, + 'plural' => 'records', + 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, ) ); @@ -23,8 +23,8 @@ function __construct( $args = array() ) { // Check for default hidden columns $this->get_hidden_columns(); + add_filter( 'screen_settings', array( $this, 'screen_controls' ), 10, 2 ); add_filter( 'set-screen-option', array( __CLASS__, 'set_screen_option' ), 10, 3 ); - add_filter( 'screen_settings', array( __CLASS__, 'live_update_checkbox' ), 10, 2 ); add_filter( 'stream_query_args', array( __CLASS__, 'set_network_option_value' ) ); add_action( 'wp_ajax_wp_stream_filters', array( __CLASS__, 'ajax_filters' ) ); @@ -51,7 +51,7 @@ static function ajax_filters() { } function extra_tablenav( $which ) { - if ( 'top' === $which ){ + if ( 'top' === $which ) { $this->filters_form(); } } @@ -67,6 +67,7 @@ function get_columns(){ * Allows devs to add new columns to table * * @param array default columns + * * @return array updated list of columns */ return apply_filters( @@ -131,12 +132,15 @@ function prepare_items() { * Render the checkbox column * * @param array $item Contains all the data for the checkbox column + * * @return string Displays a checkbox */ function column_cb( $item ) { return sprintf( '', + /*$1%s*/ 'wp_stream_checkbox', + /*$2%s*/ $item->ID ); } @@ -188,6 +192,7 @@ function get_records() { function get_total_found_rows() { global $wpdb; + return $wpdb->get_var( 'SELECT FOUND_ROWS()' ); } @@ -199,7 +204,7 @@ function column_default( $item, $column_name ) { $item->created, get_date_from_gmt( $item->created, 'Y/m/d' ) ); - $out = $this->column_link( $date_string, 'date', date( 'Y/m/d', strtotime( $item->created ) ) ); + $out = $this->column_link( $date_string, 'date', date( 'Y/m/d', strtotime( $item->created ) ) ); $out .= '
    '; $out .= get_date_from_gmt( $item->created, 'h:i:s A' ); break; @@ -207,13 +212,13 @@ function column_default( $item, $column_name ) { case 'summary' : if ( $item->object_id ) { $out = $this->column_link( - $item->summary, - array( - 'object_id' => $item->object_id, - 'context' => $item->context, - ), - null, - __( 'View all records for this object', 'stream' ) + $item->summary, + array( + 'object_id' => $item->object_id, + 'context' => $item->context, + ), + null, + __( 'View all records for this object', 'stream' ) ); } else { $out = $item->summary; @@ -276,7 +281,7 @@ function column_default( $item, $column_name ) { * Registers new Columns to be inserted into the table. The cell contents of this column is set * below with 'wp_stream_inster_column_default-' * - * @param array $new_columns Array of new column titles to add + * @param array $new_columns Array of new column titles to add */ $inserted_columns = apply_filters( 'wp_stream_register_column_defaults', $new_columns = array() ); @@ -294,8 +299,8 @@ function column_default( $item, $column_name ) { /** * This action allows for the addition of content under the specified column ($column_title) * - * @param string $column_title Title of the column (set in wp_stream_register_column_defaults) - * @param obj $item Contents of the row + * @param string $column_title Title of the column (set in wp_stream_register_column_defaults) + * @param obj $item Contents of the row */ $out = do_action( 'wp_stream_insert_column_default-' . $column_title, $item ); } else { @@ -323,7 +328,7 @@ public static function get_network_blog() { } - public static function get_action_links( $record ){ + public static function get_action_links( $record ) { $out = ''; /** @@ -332,6 +337,7 @@ public static function get_action_links( $record ){ * @param string connector * @param array array of action links for this connector * @param obj record + * * @return arrray action links for this connector */ $action_links = apply_filters( 'wp_stream_action_links_' . $record->connector, array(), $record ); @@ -342,6 +348,7 @@ public static function get_action_links( $record ){ * @param string connector * @param array array of custom links for this connector * @param obj record + * * @return arrray custom links for this connector */ $custom_links = apply_filters( 'wp_stream_custom_action_links_' . $record->connector, array(), $record ); @@ -355,7 +362,7 @@ public static function get_action_links( $record ){ $links = array(); $i = 0; foreach ( $action_links as $al_title => $al_href ) { - $i++; + $i ++; $links[] = sprintf( '%s%s', $al_href, @@ -410,9 +417,10 @@ function column_link( $display, $key, $value = null, $title = null ) { } public function get_term_title( $term, $type ) { - if ( isset( WP_Stream_Connectors::$term_labels[ "stream_$type" ][ $term ] ) ) { - return WP_Stream_Connectors::$term_labels[ "stream_$type" ][ $term ]; - } else { + if ( isset( WP_Stream_Connectors::$term_labels["stream_$type"][ $term ] ) ) { + return WP_Stream_Connectors::$term_labels["stream_$type"][ $term ]; + } + else { return $term; } } @@ -426,15 +434,34 @@ public function get_term_title( $term, $type ) { * * @uses existing_records (see query.php) * @since 1.0.4 + * * @param string Column requested * @param string Table to be queried + * * @return array options to be displayed in search filters */ function assemble_records( $column, $table = '' ) { + + $setting_key = self::get_column_excluded_setting_key( $column ); + + /** + * Toggle visibility of disabled connectors/actions/contexts on list table filter dropdown + * + * @param bool $hidden Visibility status, default is Hide Previous Record value set in Exclude setting. + */ + $hide_disabled_column_filter = apply_filters( 'wp_stream_list_table_hide_disabled_ ' . $setting_key, ( WP_Stream_Settings::$options[ 'exclude_hide_previous_records' ] === 0 ) ? false : true ); + if ( 'author' === $column ) { $all_records = array(); $authors = get_users(); + if ( $hide_disabled_column_filter ) { + $excluded_records = WP_Stream_Settings::get_excluded_by_key( $setting_key ); + } + foreach ( $authors as $author ) { + if ( $hide_disabled_column_filter && in_array( $author->ID, $excluded_records ) ) { + continue; + } $author = get_user_by( 'id', $author->ID ); if ( $author ) { $all_records[ $author->ID ] = $author; @@ -444,20 +471,11 @@ function assemble_records( $column, $table = '' ) { $prefixed_column = sprintf( 'stream_%s', $column ); $all_records = WP_Stream_Connectors::$term_labels[ $prefixed_column ]; - if ( 'connector' === $column ) { - /** - * Toggle visibility of disabled connectors on list table filter dropdown - * - * @param bool $hidden Visibility status, hidden by default. - */ - $hide_disabled_connectors_filter = apply_filters( 'wp_stream_list_table_hide_disabled_connectors', true ); - - if ( true === $hide_disabled_connectors_filter ) { - $excluded_connectors = WP_Stream_Settings::get_excluded_by_key( 'connectors' ); - foreach ( array_keys( $all_records ) as $_connector ) { - if ( in_array( $_connector, $excluded_connectors ) ) { - unset( $all_records[ $_connector ] ); - } + if ( true === $hide_disabled_column_filter ) { + $excluded_records = WP_Stream_Settings::get_excluded_by_key( $setting_key ); + foreach ( array_keys( $all_records ) as $_connector ) { + if ( in_array( $_connector, $excluded_records ) ) { + unset( $all_records[ $_connector ] ); } } } @@ -468,7 +486,7 @@ function assemble_records( $column, $table = '' ) { $disabled_records = array(); foreach ( $all_records as $record => $label ) { - if ( array_key_exists( $record , $existing_records ) ) { + if ( array_key_exists( $record, $existing_records ) ) { $active_records[ $record ] = array( 'label' => $label, 'disabled' => '' ); } else { $disabled_records[ $record ] = array( 'label' => $label, 'disabled' => 'disabled="disabled"' ); @@ -484,10 +502,16 @@ function assemble_records( $column, $table = '' ) { return $all_records; } - function filters_form() { + public function get_filters() { $filters = array(); - $filters_string = sprintf( '', 'wp_stream' ); + require_once WP_STREAM_INC_DIR . 'date-interval.php'; + $date_interval = new WP_Stream_Date_Interval(); + + $filters['date'] = array( + 'title' => __( 'dates', 'stream' ), + 'items' => $date_interval->intervals, + ); $authors_records = $this->assemble_records( 'author', 'stream' ); @@ -508,8 +532,7 @@ function filters_form() { ); } - $filters['author'] = array(); - + $filters['author'] = array(); $filters['author']['title'] = __( 'authors', 'stream' ); if ( count( $authors_records ) <= WP_Stream_Admin::PRELOAD_AUTHORS_MAX ) { @@ -555,7 +578,7 @@ function filters_form() { } $filters['blog_id'] = array( - 'title' => __( 'blogs', 'stream' ), + 'title' => __( 'sites', 'stream' ), 'items' => $blogs, ); } @@ -566,13 +589,27 @@ function filters_form() { * containing a title and array of items. * * @param array Array of filters + * * @return array Updated array of filters */ - $filters = apply_filters( 'wp_stream_list_table_filters', $filters ); - $filters_string .= $this->filter_date(); + return apply_filters( 'wp_stream_list_table_filters', $filters ); + } + + function filters_form() { + + $user_id = get_current_user_id(); + + $filters = $this->get_filters(); + + $filters_string = sprintf( '', 'wp_stream' ); + $filters_string .= sprintf( __( '%1$sShow filter controls via the screen options tab above%2$s', 'stream' ), '' ); foreach ( $filters as $name => $data ) { + if ( 'date' === $name ) { + $filters_string .= $this->filter_date( $data['items'] ); + continue; + } $filters_string .= $this->filter_select( $name, $data['title'], isset( $data['items'] ) ? $data['items'] : array(), isset( $data['ajax'] ) && $data['ajax'] ); } @@ -584,6 +621,7 @@ function filters_form() { } function filter_select( $name, $title, $items, $ajax ) { + if ( $ajax ) { $out = sprintf( '', @@ -630,29 +668,25 @@ function filter_search() { return $out; } - function filter_date() { - - require_once WP_STREAM_INC_DIR . 'date-interval.php'; + function filter_date( $items ) { wp_enqueue_style( 'jquery-ui' ); wp_enqueue_style( 'wp-stream-datepicker' ); wp_enqueue_script( 'jquery-ui-datepicker' ); - $date_interval = new WP_Stream_Date_Interval(); - $date_predefined = wp_stream_filter_input( INPUT_GET, 'date_predefined' ); $date_from = wp_stream_filter_input( INPUT_GET, 'date_from' ); $date_to = wp_stream_filter_input( INPUT_GET, 'date_to' ); ob_start(); ?> -
    +
    + name="date_from" + class="date-picker field-from" + placeholder="" + value="">
    +
    + name="date_to" + class="date-picker field-to" + placeholder="" + value="">
    @@ -710,7 +745,7 @@ function display_tablenav( $which ) {
    - +
    get_filters(); + + foreach ( $filters as $key => $val ) { + $filters_option_defaults[ $key ] = true; + } + + $filters_option = apply_filters( + 'wp_stream_filters_option', + wp_parse_args( + (array) get_user_meta( $user_id, 'stream_toggle_filters', true ), + $filters_option_defaults + ) + ); + + if ( empty( $filters_option ) ) { + update_user_meta( $user_id, 'stream_toggle_filters', $filters_option_defaults ); + $filters_option = get_user_meta( $user_id, 'stream_toggle_filters', true ); + } + $stream_live_update_records_nonce = wp_create_nonce( 'stream_live_update_records_nonce' ); + $stream_toggle_filters_nonce = wp_create_nonce( 'stream_toggle_filters_nonce' ); ob_start(); ?>
    -
    -
    + +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    + $val ) : + ?> + + +
    +
    + sprintf( __( 'When checked, all past records that match the excluded rules above will be hidden from view.', 'stream' ) ), - 'after_field' => __( 'Hide Previous Records' ), + 'after_field' => __( 'Hide Previous Records', 'stream' ), 'default' => 0, ), ), @@ -671,7 +671,12 @@ public static function render_field( $field ) { } foreach ( $choices as $key => $role ) { - $data_values[] = array( 'id' => $key, 'text' => $role ); + $args = array( 'id' => $key, 'text' => $role ); + $users = get_users( array( 'role' => $key ) ); + if ( count( $users ) ) { + $args['user_count'] = sprintf( _n( '1 user', '%s users', count( $users ), 'stream' ), count( $users ) ); + } + $data_values[] = $args; } $selected_values = array(); diff --git a/languages/stream-pl_PL.mo b/languages/stream-pl_PL.mo index e01d276430f5dfe307b716e69e9d8993f402238d..58439d57956d00471e4800a8ec844e8c76f615ae 100644 GIT binary patch delta 6136 zcmZwLd0drM9>?(mf-Lf46_wC>R0vT}P%F_?+y%_7vU%k)UEw-hK`<^zkao*7$H{W+ znp4_jR_bVDqmhlyxKN2xS?QSOQkrGiN@kgDTJ!nx9DDW0JTHH~&pFR|&i*{t+WAz- z@pU1AlZjyu8?K}fV>;sVk;YV#9+RL_V)X~=3}oEx8d11n*3%QgFoPnIPwZ(hT=-p zb0=^vrlq>=uE86~H=~{(z$^#i0vt^L<|SJY+R2z9+{i~&n2*rg>c8tlxG7QJH7#$$-3<)jac8tJAjKWt?6%QhVH%F1( zG3T*6UP9IH*4Zu3LFMz%i$ib$uDAEIy14bOLA5&w1L}AIMaGJ#*<%R zU5`2w+fc{kb!4~9Nz@*HhuZtNuEvC6Cse&Is58?SvvE{c)_)v{8VWSCCe+N|L^W^} zHKWt^{^vG-9yP#=s0k#dxgDgSp6h|?I1k(4AZsCNf|F3sd(&8dCGMm^Gg^k4$y!v$ zyHKZjFRJ0UPy;=Q8tBKU2G5~pX42h`lTa(x0rgxas(xQodxPx#q5uiaU8v5qJ!H|TX+oB;isqxokz77d9^#Bc+~6L8FfE!txXi7_HG)6 z;~Z3nb5R{F#!y_1Y_E9|)ln0w-T~BeCr~p#jhgX!>(8jIh|F-mGi@49z<1iAOLUTX%Qc&%#)} z|HDXV#1kBq ztr$>2841nEk9uIS^&!-rtwOyO>rq?LXz%a09!1rA9~qNrM!gLwyyO~47P9^3I@A_T zL)G_Yv;L}ZyS*_Nb&Bt`6@sXdu10md+1}rcL&)z(O(22wRR<~9GGkPE0jm88$j^eA zf?Ba!TRyiZ>#rZ3MHFacdy%iDdBavXi&5l%#MKzq%gsNHI#kc1X7Vzs|LIBpecFQ6r4!C>LTX#^MZ|f;Fgt9YoFOIO==xA!=Y3Z9b)s zodBv{9_kPe!vuT;wbC1r_5x-L3B7LH-2!s}HISpIk)KA*B;KOU(4^-H7{P2*^Kn-vNY68=77|z5*z5ma)B#e0x_1+#ro#MED?)y9d)qoGL z$NTUad>IGh56B;r$B(k0@H94s-1(j`~+%iKO4yU`$&94 z!2>vz^;5;qQLohn)E|TP)jwYM*!I{XZ^GUrhPX*JX}#+r=k z_)6@KJy2T~m_$M|or;=S6>1=N+x!yL;aiF7r~x&Ao%a4A>wBmfHlt?tEvlVJ-Zh=6 zw&-9_)L9yb3@BhcBy@@^Pz@|b4QLsv<8{{EsD_TB>VJ)zLG*C9ep^)iObo@LsF{vH zt;lTD1nN-z+>1%{Z|*0dnXk5PLM_!c%)}<-9GbJJ8TB0D?rDG2b7N7T?kT9(upD(5 z=cDQeZTV_cy{*_GqKFo|^h5?hvPq}xGHoJ;vo49DH52AWUHgef*V=Nu%8gHzC_+mZO75P<#44YM^Zj+y--T0{KGJ zmOX}@a0}|S+>a6XC2C+7FbaP{O(?vO_199hDRe7#L@j9=Mq)42UiY)*H=;W5pjIG& z>R^e@FSqyCpjK)(s-yiFjfYXsox)z&T*&(C{p?iaE@dwA5j6Rzy_|=-A4CmwJ+{Ve zs1@0bYWN^(1y0%gx2RLzYK;3^kc{g17R~7ac4U{# zUeo|$Z*W&488y>BsON{_S{!Th=TQUs1$9;u#=1JFl?(JDp_yD~3kp#Kn22p~3aa5! z)Qb2~GhK|a_&92XHleocMeKsFVJ0@CCeVHy|Bl2oT!D?q1Ow)l@$QVKqGnQpTIy=N z3Kyczz*_8vji?4c#hdT~>U0-z5{t0}HM3Vx6FGqTU>!$(5Y0Kv#_Wlz$No=lN$@b< z%8fGAK=z`x=55qgyn~wA`=}1WZgf{B2Gvn}Y=xaM7SmBH*cbI$=VJ(#5>ts7GI!Gd zuUBgd-n*P5{Wa+iY(9*9N75e>{QIP3j}O~>594BjakX5Xtr<9(IAHTT@j2oif?a93 zf{!J1EO?D%BpqD74w0y{nJ+M&s3M}Mvl(>&e;{@czrEH4LlTn;PE(|>M;Wo--u^E} z+aCBzwOqaV`vu|=qJYp+JV^8>%85O}sfih#x06aE9AY=2YXk8B@lWEr;M&Bl;qQ=o zI`~FnYQf8-;%!f7No(ioiBrTjVhnMF&}Sr-(2nW)H<3WhCw?L#g1Jelfi0wT29^^E zw7MFfBxVtrL<4b*_y?iuU&L)h6!94m!ZZ33K2Dq=t{`fN%hv!B=ZHdEaIZBK`|#P> zmlPHFh4d4|i^OQ+c49BlkN7?DCh6CZCN5v?Nd$=##H&Oep`Vt6#4_T3 z;&Wm)@d*)0v~gE)nt6kau4ESz%MJbSLR~uGx)RB2gGaepa{+%QCfNM*_&u?R_=*U% z&#wq>X`2+-N68~VmNV$SV|lxiikT1UAqW2VbWL|@`S1Ftg7+l%nD7xL zUlQ-zJD2&CLd+-U zH_hM0@l`lo(t9gaGrPo7?Ja32aXtzkFxpq*b;ehD=lCjX{LVygab;DB-xLhzPk$%9 zB>HB*w~B;6dc-V`ue>ESv9jE&L_^WlM?xcdRaQAwmF2<4ZkY|^GDk#4PxASF(|zT> z>bhVscgo~aZ-rA_>MbtwmSj1e@^WXk$6xJKxg9yxrJibMmZ!S7l%&`3-cej$Q{pXg zs%px;e#bMta*o%j_3_knuT$zPDWS0$Rh6@xIX-V~&xYpQ9U-}WvvYEt+}{2B=Jd$P z&B=)#KQ4PB)A9Q%E3$_((f&^F998P|WpN{KE~~1W>G=HB6+Z9GJqwGyPQ7Qg z&tLc3xi{^ot1hdot?-q(OOXBBHSn~o!Kh)6whHT2UNgPn)W{Q&F}L_iDvRqYDw|gA zSrptcuCln$+qA0ON89xkp5pq-3U8KE>#wi#SC{#`|EG7yKik_hzryEnhr}4Gy;VMs hQ(IS7UQ=A}<&INd>96)w>{;m4wA}95(0zO`x5lH|#`prgf+FM;yrhw$aA?21`*7 zx`I8hO^h)qSb|x&9<%XlY>z3i#`s|ohPo+?p`alw!2q0zK{y|E;xeSsW+gH^rV5+m zPSp9|p!VOg_4`;v-K&W)vvCCK_;u@D)O{bKTMzb)WB$>FwJ-|nVRLI1)}}ttIs&yO zCZm?gB4n1#TGSlBkDB|V=!@r3=UqarnLF451L7I~eiSm|ofghP^}G~=aV4sU754aM zTdzVja0jXbCr}SKi+b=i)PwJ%3m;m8n>rngL|vcIl<`-gBRkZid{j@0P!FDgTFrA& z4f3FdaxJQ%Z=*)+T~yC@qc5IBjo4?X>#m~Czk|BpLwnriPH=kA2-Sml)Ppln56ZOl zo~R3-K=rr~)$m~$i<41PxC-^aO{fl4q3(AO)u3aj*Y`_%++A%8!Ofhxi$*_AcpUY> zPUwxfs2lgO`=3IcHym~2(Wo9ywa!5e{SxHGGHWmuKd{HIBG-y|~;)x(9T`@D_=@Ez23eo4+qyD(Vqe`5-|FbVaV zbwQn2h(0(JHPl7cso0wOtEg4H58L8*s2(;?Hl`&OVgfEe-G3{pK?hI`K8?Y8|G%Y> zhj+0*W;Hiv3NFWDtj*UX0AE30T!=Ba6xGnJs8zoW196}A2o-vy`T^a# zAoN$xg^}o@9)o%dQcx|R!w}qwy76JuYje_i3-zE-R@g#}z*1a?+TSwG>1jIZ`u3>%bwf=} zKh%SVVJuF-Jam^)s72u-sv$Q}J*Y-~%eBh)-dYH>^4%@?Q(YSo*^`8Gf-@|)OnM>TLL z>VY$`JI=*$JZwFW9jM>J6infr)%r6}QP2(MU?+SNGw>pI!FuhC;XgBgA6h)6sKs~$ zbv%q;>Z~u*5B2?+j=J9})cM;m5$|FWHl`J7cu$Ps`DQqU1~?n}8^V;MzF<4BAs$D) zuh*^K9i9CRP&aOaw8a!6vu4Vy`%xos59_0g-aUr#sOMy&JCwp;3YxposKqqRItw*d z^HFo^LA@=jQHyH_@{7zILY;TR?!S*(g#MZQIfr4m7)wy+1u!gni^4lI{+i=xcId&a zP>V4G`IT+5F&amr&YOq2!AevED(wEP);*}}PN2RI)fk42nJ0b9TcAcF4K>2KT^N5x z)jZ1%Es9mB2YifL-N$VG9I8i`?fx6qd#J_go#iaPNL0h3QA3}CTHKvcJ??Jphf&lE z-4s~ZW|G~p86&A5K+Ww1R73n(aT=N0sD{K?ldNf|2Y0~c*b6mf#i*W^pr*PM)sWY0 z-Mx{57T-41gN~vaa27QZw@?>8K)qf;-JG7)LEWe+YEh+PEasus(il{OrlS_|0@U^E zQ4QLHJlAdZItBAN>PB}^7u4bDJL*P<&=)VE4_?8hc+DQK-P8F1C1ZQ`k3u?S zDliML*yBmPoPQyW#8~!kMlH@yP=9}#ixl)gzZ`}WqftXX4jbbfjK&HKz`dx39mbk9 zgMQS{qDJZ>>bzU1DY%D$=#%SAZ3t?l6LT4VJs^V}8i4}Tg+pw8B347yqErl1B~LiO}2s;2>coEy}~ z_0;2R{UE9#Cs94TY`udTIiJ2xM_j0SG^zp3(1od}hIK-Xh`SdB_4FCk4U17j^fGGB zmSY^Q#bn%rA$Sef;63~UmObJ0Fr}ZNqYawDD-E?PShd{ zf6{4r3aaI8P#>gB>benF^Y{N) z3VP5K)N3{yH4^htL$(6-9#^0jjwC50kjhll_6+f+e!iyW{J8Z$WnI{a`X$1j6{dom zBqp7B$UO3EqOFNT&G)~M@~5``5pE^_@f@#{n0wIfeZ&b0CARV{)+WWok4OI*waR`V z+le-xG%RK<`76mGLv3`SC~ihpjKb@5yeGO|&g0pOM~VGSRk! zgpxF}nf#7qkub8FTqB#vY%-9nBEckFzr#;c&^CfBCBw6dJDYm$&8Hhn#H{%JkLkg zPB_QDS4aZ6N3{J&YLS(sEBV6nMr2gie^UAr8B4V7cc}T9!OxAh9*INAU^3tCyNs^N zpCXq8H5f2%_|S<(!(-zT(wa_)iyieMrPh=x--^BL=bf8fxv$w7@5;5w#etrv)`gWP zTW|LYZqp(yBQ`a)Lt0zUiuCB9|5ht^rH={IHDj|^`BaAFoDcL=Klx(i!Te=jzW^Q| BbaVg! diff --git a/languages/stream-pl_PL.po b/languages/stream-pl_PL.po index 416c3c126..f990a82a2 100644 --- a/languages/stream-pl_PL.po +++ b/languages/stream-pl_PL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Stream\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/stream\n" -"POT-Creation-Date: 2014-03-15 00:17+0100\n" -"PO-Revision-Date: 2014-03-15 00:19+0100\n" +"POT-Creation-Date: 2014-04-01 12:40+0100\n" +"PO-Revision-Date: 2014-04-01 12:49+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl_PL\n" @@ -470,11 +470,11 @@ msgid "Post" msgstr "Wpis" #: ../connectors/settings.php:63 ../connectors/settings.php:84 -#: ../includes/admin.php:114 ../includes/admin.php:270 +#: ../includes/admin.php:114 ../includes/admin.php:271 msgid "Settings" msgstr "Ustawienia" -#: ../connectors/settings.php:85 ../includes/settings.php:156 +#: ../connectors/settings.php:85 ../includes/settings.php:211 msgid "General" msgstr "Ogólne" @@ -875,7 +875,7 @@ msgstr "Usunięto \"%1$s\" z \"%2$s\"" #: ../connectors/widgets.php:222 #, php-format msgctxt "1: Widget title, 2: Sidebar name" -msgid "Updated \"%1$s\" in \"%2$s\"" +msgid "\"%1$s\" in \"%2$s\" updated" msgstr "Zaktualizowano \"%1$s\" w \"%2$s\"" #: ../connectors/widgets.php:275 @@ -888,7 +888,7 @@ msgstr "Kolejność widgetów w \"%s\" została zmieniona" msgid "All records have been successfully erased." msgstr "Wszystkie zapisy zostały usunięte." -#: ../includes/admin.php:113 ../includes/admin.php:294 +#: ../includes/admin.php:113 ../includes/admin.php:295 msgid "Stream Settings" msgstr "Ustawienia Stream" @@ -908,68 +908,68 @@ msgstr "" "Czy na pewno chcesz odinstalować i wyłączyć Stream? Ta czynność usunie " "wszystkie tabele Stream z bazy danych i nie można jej cofnąć." -#: ../includes/admin.php:279 +#: ../includes/admin.php:280 msgid "Uninstall" msgstr "Odinstaluj" -#: ../includes/admin.php:343 +#: ../includes/admin.php:344 msgid "Stream Records" msgstr "Zapisy Stream" -#: ../includes/admin.php:515 +#: ../includes/admin.php:518 msgid "Stream Activity" msgstr "Aktywność Stream" -#: ../includes/admin.php:559 +#: ../includes/admin.php:556 msgid "Sorry, no activity records were found." msgstr "Niestety żadne zapisy aktywności nie zostały odnalezione." -#: ../includes/admin.php:586 +#: ../includes/admin.php:583 #, php-format msgctxt "1: Time, 2: User profile URL, 3: User display name" msgid "%1$s ago by %3$s" msgstr "%1$s temu przez %3$s" -#: ../includes/admin.php:596 +#: ../includes/admin.php:593 #, php-format msgid "%s ago" msgstr "%s temu" -#: ../includes/admin.php:650 +#: ../includes/admin.php:647 msgid "View all records" msgstr "Wyświetl wszystkie zapisy" -#: ../includes/admin.php:652 +#: ../includes/admin.php:649 msgid "View All" msgstr "Zobacz wszystko" -#: ../includes/admin.php:667 +#: ../includes/admin.php:664 msgid "Go to the first page" msgstr "Idź do pierwszej strony" -#: ../includes/admin.php:675 +#: ../includes/admin.php:672 msgid "Go to the previous page" msgstr "Idź do poprzedniej strony" -#: ../includes/admin.php:682 +#: ../includes/admin.php:679 #, php-format msgctxt "paging" msgid "%1$s of %2$s" msgstr "%1$s z %2$s" -#: ../includes/admin.php:687 +#: ../includes/admin.php:684 msgid "Go to the next page" msgstr "Idź do następnej strony" -#: ../includes/admin.php:696 +#: ../includes/admin.php:693 msgid "Go to the last page" msgstr "Idź do ostatniej strony" -#: ../includes/admin.php:732 ../includes/list-table.php:18 +#: ../includes/admin.php:729 ../includes/list-table.php:18 msgid "Records per page" msgstr "Liczba zapisów na stronę" -#: ../includes/admin.php:879 +#: ../includes/admin.php:878 #, php-format msgid "One more result..." msgid_plural "%d more results..." @@ -982,39 +982,39 @@ msgstr[2] "%d wyników więcej..." msgid "%s class wasn't loaded because it doesn't extends the %s class." msgstr "Klasa %s nie została załadowana, ponieważ nie rozszerza klasy %s" -#: ../includes/date-interval.php:38 +#: ../includes/date-interval.php:51 msgid "Today" msgstr "Dzisiaj" -#: ../includes/date-interval.php:42 +#: ../includes/date-interval.php:56 msgid "Yesterday" msgstr "Wczoraj" -#: ../includes/date-interval.php:47 ../includes/date-interval.php:52 -#: ../includes/date-interval.php:57 +#: ../includes/date-interval.php:61 ../includes/date-interval.php:66 +#: ../includes/date-interval.php:71 #, php-format msgid "Last %d Days" msgstr "Ostatnie %d dni" -#: ../includes/date-interval.php:62 +#: ../includes/date-interval.php:76 msgid "This Month" msgstr "Obecny miesiąc" -#: ../includes/date-interval.php:66 +#: ../includes/date-interval.php:80 msgid "Last Month" msgstr "Zeszły miesiąc" -#: ../includes/date-interval.php:71 ../includes/date-interval.php:76 -#: ../includes/date-interval.php:81 +#: ../includes/date-interval.php:85 ../includes/date-interval.php:90 +#: ../includes/date-interval.php:95 #, php-format msgid "Last %d Months" msgstr "Ostatnie %d miesięcy" -#: ../includes/date-interval.php:86 +#: ../includes/date-interval.php:100 msgid "This Year" msgstr "Obecny rok" -#: ../includes/date-interval.php:90 +#: ../includes/date-interval.php:104 msgid "Last Year" msgstr "Zeszły rok" @@ -1056,120 +1056,133 @@ msgstr "" "Nie masz uprawnień, by wyświetlić ten kanał. Skontaktuj się z " "Administratorem strony." -#: ../includes/feeds.php:193 +#: ../includes/feeds.php:187 msgid "Stream Feed" msgstr "Kanał Stream" -#: ../includes/filters.php:50 +#: ../includes/filters.php:49 msgid "Invalid use, type must be one of INPUT_* family." msgstr "Nieprawidłowe użycie, stała musi należeć do grupy INPUT_*" -#: ../includes/filters.php:62 +#: ../includes/filters.php:61 msgid "Filter not supported." msgstr "Filtr nie jest wspierany." -#: ../includes/list-table.php:61 +#: ../includes/list-table.php:64 msgid "Date" msgstr "Data" -#: ../includes/list-table.php:62 +#: ../includes/list-table.php:65 msgid "Summary" msgstr "Streszczenie" -#: ../includes/list-table.php:63 +#: ../includes/list-table.php:66 msgid "Author" msgstr "Autor" -#: ../includes/list-table.php:64 +#: ../includes/list-table.php:67 msgid "Connector" msgstr "Łącznik" -#: ../includes/list-table.php:65 +#: ../includes/list-table.php:68 msgid "Context" msgstr "Kontekst" -#: ../includes/list-table.php:66 +#: ../includes/list-table.php:69 msgid "Action" msgstr "Akcja" -#: ../includes/list-table.php:67 +#: ../includes/list-table.php:70 msgid "IP Address" msgstr "Adres IP" -#: ../includes/list-table.php:68 +#: ../includes/list-table.php:71 msgid "ID" msgstr "ID" -#: ../includes/list-table.php:183 +#: ../includes/list-table.php:197 msgid "View all records for this object" msgstr "Pokaż wszystkie zapisy dla tego obiektu" -#: ../includes/list-table.php:214 +#: ../includes/list-table.php:228 msgid "N/A" msgstr "n/d" -#: ../includes/list-table.php:448 +#: ../includes/list-table.php:463 ../includes/settings.php:135 +#, php-format +msgid "" +"ID: %d\n" +"User: %s\n" +"Email: %s\n" +"Role: %s" +msgstr "" +"ID: %d\n" +"Użytkownik: %s\n" +"E-mail: %s\n" +"Rola: %s" + +#: ../includes/list-table.php:472 msgid "authors" msgstr "autorzy" -#: ../includes/list-table.php:457 +#: ../includes/list-table.php:481 msgid "connectors" msgstr "łączniki" -#: ../includes/list-table.php:462 +#: ../includes/list-table.php:486 msgid "contexts" msgstr "konteksty" -#: ../includes/list-table.php:467 +#: ../includes/list-table.php:491 msgid "actions" msgstr "akcje" -#: ../includes/list-table.php:487 +#: ../includes/list-table.php:511 msgid "Filter" msgstr "Przefiltruj" -#: ../includes/list-table.php:517 +#: ../includes/list-table.php:542 #, php-format msgid "Show all %s" msgstr "Wszystko: %s" -#: ../includes/list-table.php:532 +#: ../includes/list-table.php:557 msgid "Search Records" msgstr "Szukaj zapisów" -#: ../includes/list-table.php:558 +#: ../includes/list-table.php:583 msgid "All Time" msgstr "Kiedykolwiek" -#: ../includes/list-table.php:560 +#: ../includes/list-table.php:585 msgid "Custom" msgstr "Własne" -#: ../includes/list-table.php:579 +#: ../includes/list-table.php:604 msgid "Start date" msgstr "Data początkowa" -#: ../includes/list-table.php:588 +#: ../includes/list-table.php:613 msgid "End date" msgstr "Data końcowa" -#: ../includes/list-table.php:658 +#: ../includes/list-table.php:683 msgid "Live updates" msgstr "Aktualizacje na żywo" -#: ../includes/list-table.php:664 ../includes/settings.php:179 +#: ../includes/list-table.php:689 ../includes/settings.php:234 msgid "Enabled" msgstr "Włączone" -#: ../includes/settings.php:87 +#: ../includes/settings.php:88 msgid "There was an error in the request" msgstr "Wystąpił błąd w żądaniu" -#: ../includes/settings.php:160 +#: ../includes/settings.php:215 msgid "Role Access" msgstr "Dostęp ról" -#: ../includes/settings.php:162 +#: ../includes/settings.php:217 msgid "" "Users from the selected roles above will have permission to view Stream " "Records. However, only site Administrators can access Stream Settings." @@ -1177,11 +1190,11 @@ msgstr "" "Użytkownicy z wybranymi powyżej rolami będą mogli wyświetlać Zapisy Stream. " "Tylko Administratorzy jednak otrzymają dostęp do Ustawień Stream." -#: ../includes/settings.php:168 +#: ../includes/settings.php:223 msgid "Private Feeds" msgstr "Prywatne kanały" -#: ../includes/settings.php:171 +#: ../includes/settings.php:226 #, php-format msgid "" "Users from the selected roles above will be given a private key found in " @@ -1190,15 +1203,15 @@ msgstr "" "Użytkowicy z wybranymi powyżej rolami otrzymają prywatny klucz dostępny w " "ich %sprofilu%s, by uzyskać bezpieczny dostęp do kanałów Zapisów Stream." -#: ../includes/settings.php:175 +#: ../includes/settings.php:230 msgid "View Profile" msgstr "Wyświetl profil" -#: ../includes/settings.php:184 +#: ../includes/settings.php:239 msgid "Keep Records for" msgstr "Przechowuj zapisy z" -#: ../includes/settings.php:187 +#: ../includes/settings.php:242 msgid "" "Maximum number of days to keep activity records. Leave blank to keep records " "forever." @@ -1206,80 +1219,100 @@ msgstr "" "Maksymalna liczba dni, dla których zachowana zostanie aktywność. By " "przechowywać zapisy bez limitu, pozostaw puste pole." -#: ../includes/settings.php:189 +#: ../includes/settings.php:244 msgid "days" msgstr "dni" -#: ../includes/settings.php:193 +#: ../includes/settings.php:248 msgid "Reset Stream Database" msgstr "Wyczyść bazę danych Stream" -#: ../includes/settings.php:202 +#: ../includes/settings.php:257 msgid "" "Warning: Clicking this will delete all activity records from the database." msgstr "" "Ostrzeżenie: Kliknięcie w link wymaże wszystkie zapisy aktywności z bazy " "danych." -#: ../includes/settings.php:208 +#: ../includes/settings.php:263 msgid "Exclude" msgstr "Wyklucz" -#: ../includes/settings.php:212 +#: ../includes/settings.php:267 msgid "Authors & Roles" msgstr "Autorzy i role" -#: ../includes/settings.php:214 -msgid "No activity will be logged for these authors and roles." -msgstr "Żadna aktywność nie będzie zapisywana dla tych autorów i ról." +#: ../includes/settings.php:269 +msgid "No activity will be logged for these authors and/or roles." +msgstr "Żadna aktywność nie będzie zapisywana dla tych autorów i/lub ról." -#: ../includes/settings.php:220 +#: ../includes/settings.php:275 msgid "Connectors" msgstr "Łączniki" -#: ../includes/settings.php:222 +#: ../includes/settings.php:277 msgid "No activity will be logged for these connectors." msgstr "Żadna aktywność nie będzie zapisywana dla tych łączników." -#: ../includes/settings.php:229 +#: ../includes/settings.php:284 msgid "Contexts" msgstr "Konteksty" -#: ../includes/settings.php:231 +#: ../includes/settings.php:286 msgid "No activity will be logged for these contexts." msgstr "Żadna aktywność nie będzie zapisywana dla tych kontekstów." -#: ../includes/settings.php:238 +#: ../includes/settings.php:293 msgid "Actions" msgstr "Akcje" -#: ../includes/settings.php:240 +#: ../includes/settings.php:295 msgid "No activity will be logged for these actions." msgstr "Żadna aktywność nie będzie zapisywana dla tych akcji." -#: ../includes/settings.php:247 +#: ../includes/settings.php:302 msgid "IP Addresses" msgstr "Adresy IP" -#: ../includes/settings.php:249 +#: ../includes/settings.php:304 msgid "No activity will be logged for these IP addresses." msgstr "Żadna aktywność nie będzie zapisywana dla tych adresów IP." -#: ../stream.php:181 +#: ../includes/settings.php:311 +msgid "Visibility" +msgstr "Widoczność" + +#: ../includes/settings.php:314 +msgid "" +"When checked, all past records that match the excluded rules above will be " +"hidden from view." +msgstr "" +"Jeśli zaznaczone, wszystkie istniejące zapisy spełniające kryteria " +"wykluczenia zostaną ukryte." + +#: ../includes/settings.php:316 +msgid "Hide Previous Records" +msgstr "Ukryj istniejące zapisy" + +#: ../stream.php:180 msgid "The following table is not present in the WordPress database :" msgstr "Następująca tabela nie została znaleziona w bazie danych WordPressa:" -#: ../stream.php:192 +#: ../stream.php:191 #, php-format msgid "" "Please uninstall the Stream plugin and activate it again." msgstr "" "Proszę odinstalować wtyczkę Stream i włączyć ją ponownie." -#: ../stream.php:206 +#: ../stream.php:205 msgid "Stream requires PHP version 5.3+, plugin is currently NOT ACTIVE." msgstr "Stream wymaga PHP w wersji 5.3+, wtyczka jest obecnie NIEAKTYWNA." +#~ msgctxt "1: Widget title, 2: Sidebar name" +#~ msgid "Updated \"%1$s\" in \"%2$s\"" +#~ msgstr "Zaktualizowano \"%1$s\" w \"%2$s\"" + #~ msgid "More" #~ msgstr "Więcej" diff --git a/readme.md b/readme.md index 2cae43fbc..74ba910ad 100755 --- a/readme.md +++ b/readme.md @@ -105,16 +105,38 @@ Thank you for wanting to make Stream better for everyone! We salute you. ## Changelog ## +### 1.3.1 - April 3, 2014 ### +* New: Theme Editor connector for tracking changes made to theme files ([#313](https://github.com/x-team/wp-stream/issues/313)) +* New: Additional screen options to show/hide only the filters you care about ([#329](https://github.com/x-team/wp-stream/issues/329)) +* New: Visibility option in Exclude settings to hide past records from view ([#355](https://github.com/x-team/wp-stream/issues/355)) +* New: Stream Activity dashboard widget now supports live updates ([#356](https://github.com/x-team/wp-stream/issues/356)) +* New: Hover authors to reveal a tooltip with helpful user meta ([#338](https://github.com/x-team/wp-stream/issues/338)) +* New: Hover roles to reveal a tooltip with the number of authors assigned to that role ([#377](https://github.com/x-team/wp-stream/issues/377)) +* Tweak: Future dates now disabled in Start date field datepicker ([#334](https://github.com/x-team/wp-stream/issues/334)) +* Tweak: Now showing user Gravatars in Exclude Authors & Roles settings field ([#333](https://github.com/x-team/wp-stream/issues/333)) +* Tweak: ID column is now hidden by default in Screen Options ([#348](https://github.com/x-team/wp-stream/issues/348)) +* Tweak: Widget updated summary message improvement ([8818976](https://github.com/x-team/wp-stream/commit/88189761d4a8836038e8d9ec348096a0aab3072d)) +* Fix: Autocomplete not working correctly in Exclude IP Addressees settings field ([#335](https://github.com/x-team/wp-stream/issues/335)) +* Fix: Reset Stream Database link not clearing everything in all cases ([#347](https://github.com/x-team/wp-stream/issues/347)) +* Fix: PHP 5.3.3 compatibility issue with filter constant ([#351](https://github.com/x-team/wp-stream/issues/351)) +* Fix: Predefined date range intervals not honoring the site timezone setting ([#353](https://github.com/x-team/wp-stream/issues/353)) +* Fix: wpdb::prepare() notice appearing in WordPress 3.9 ([#354](https://github.com/x-team/wp-stream/issues/354)) +* Fix: Invalid argument warning thrown on fresh installations of WordPress ([#358](https://github.com/x-team/wp-stream/issues/358)) +* Fix: Record TTL purge not functioning correctly ([#371](https://github.com/x-team/wp-stream/issues/371)) +* Fix: Small CSS bug in jQuery UI datepicker skins ([04c80af](https://github.com/x-team/wp-stream/commit/04c80afa99486086612be9f6ad83148dfbbe533a)) + +Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [faishal](http://profiles.wordpress.org/faishal/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [Powdered-Toast-Man](https://github.com/Powdered-Toast-Man) + ### 1.3.0 - March 12, 2014 ### -* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([issue-251](https://github.com/x-team/wp-stream/issues/251)) -* New: Now logging Custom Background and Custom Header changes ([issue-309](https://github.com/x-team/wp-stream/issues/309)) -* New: Predefined date intervals now available when filtering records ([issue-320](https://github.com/x-team/wp-stream/issues/320)) -* Tweak: User avatars now displayed in Authors dropdown filter ([issue-311](https://github.com/x-team/wp-stream/issues/311)) -* Tweak: Live updates are enabled by default for new installs ([issue-312](https://github.com/x-team/wp-stream/issues/312)) -* Tweak: Action links are now available for Stream Settings records ([issue-305](https://github.com/x-team/wp-stream/issues/305)) -* Fix: Superfluous auto-draft posts are now prevented from being logged ([issue-293](https://github.com/x-team/wp-stream/issues/293)) -* Fix: Fallback to the term slug if a label does not exist in list-table ([issue-214](https://github.com/x-team/wp-stream/issues/214)) -* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([issue-283](https://github.com/x-team/wp-stream/issues/283)) +* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([#251](https://github.com/x-team/wp-stream/issues/251)) +* New: Now logging Custom Background and Custom Header changes ([#309](https://github.com/x-team/wp-stream/issues/309)) +* New: Predefined date intervals now available when filtering records ([#320](https://github.com/x-team/wp-stream/issues/320)) +* Tweak: Action links are now available for Stream Settings records ([#305](https://github.com/x-team/wp-stream/issues/305)) +* Tweak: User avatars now displayed in Authors dropdown filter ([#311](https://github.com/x-team/wp-stream/issues/311)) +* Tweak: Live updates are enabled by default for new installs ([#312](https://github.com/x-team/wp-stream/issues/312)) +* Fix: Fallback to the term slug if a label does not exist in list-table ([#214](https://github.com/x-team/wp-stream/issues/214)) +* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([#283](https://github.com/x-team/wp-stream/issues/283)) +* Fix: Superfluous auto-draft posts are now prevented from being logged ([#293](https://github.com/x-team/wp-stream/issues/293)) Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) diff --git a/readme.txt b/readme.txt index 613143beb..e9e88968c 100644 --- a/readme.txt +++ b/readme.txt @@ -90,17 +90,40 @@ Thank you for wanting to make Stream better for everyone! We salute you. == Changelog == += 1.3.1 - April 3, 2014 = + +* New: Theme Editor connector for tracking changes made to theme files ([#313](https://github.com/x-team/wp-stream/issues/313)) +* New: Additional screen options to show/hide only the filters you care about ([#329](https://github.com/x-team/wp-stream/issues/329)) +* New: Visibility option in Exclude settings to hide past records from view ([#355](https://github.com/x-team/wp-stream/issues/355)) +* New: Stream Activity dashboard widget now supports live updates ([#356](https://github.com/x-team/wp-stream/issues/356)) +* New: Hover authors to reveal a tooltip with helpful user meta ([#338](https://github.com/x-team/wp-stream/issues/338)) +* New: Hover roles to reveal a tooltip with the number of authors assigned to that role ([#377](https://github.com/x-team/wp-stream/issues/377)) +* Tweak: Future dates now disabled in Start date field datepicker ([#334](https://github.com/x-team/wp-stream/issues/334)) +* Tweak: Now showing user Gravatars in Exclude Authors & Roles settings field ([#333](https://github.com/x-team/wp-stream/issues/333)) +* Tweak: ID column is now hidden by default in Screen Options ([#348](https://github.com/x-team/wp-stream/issues/348)) +* Tweak: Widget updated summary message improvement ([8818976](https://github.com/x-team/wp-stream/commit/88189761d4a8836038e8d9ec348096a0aab3072d)) +* Fix: Autocomplete not working correctly in Exclude IP Addressees settings field ([#335](https://github.com/x-team/wp-stream/issues/335)) +* Fix: Reset Stream Database link not clearing everything in all cases ([#347](https://github.com/x-team/wp-stream/issues/347)) +* Fix: PHP 5.3.3 compatibility issue with filter constant ([#351](https://github.com/x-team/wp-stream/issues/351)) +* Fix: Predefined date range intervals not honoring the site timezone setting ([#353](https://github.com/x-team/wp-stream/issues/353)) +* Fix: wpdb::prepare() notice appearing in WordPress 3.9 ([#354](https://github.com/x-team/wp-stream/issues/354)) +* Fix: Invalid argument warning thrown on fresh installations of WordPress ([#358](https://github.com/x-team/wp-stream/issues/358)) +* Fix: Record TTL purge not functioning correctly ([#371](https://github.com/x-team/wp-stream/issues/371)) +* Fix: Small CSS bug in jQuery UI datepicker skins ([04c80af](https://github.com/x-team/wp-stream/commit/04c80afa99486086612be9f6ad83148dfbbe533a)) + +Props [powelski](http://profiles.wordpress.org/powelski/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [jonathanbardo](http://profiles.wordpress.org/jonathanbardo/), [faishal](http://profiles.wordpress.org/faishal/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [johnregan3](http://profiles.wordpress.org/johnregan3/), [Powdered-Toast-Man](https://github.com/Powdered-Toast-Man) + = 1.3.0 - March 12, 2014 = -* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([issue-251](https://github.com/x-team/wp-stream/issues/251)) -* New: Now logging Custom Background and Custom Header changes ([issue-309](https://github.com/x-team/wp-stream/issues/309)) -* New: Predefined date intervals now available when filtering records ([issue-320](https://github.com/x-team/wp-stream/issues/320)) -* Tweak: User avatars now displayed in Authors dropdown filter ([issue-311](https://github.com/x-team/wp-stream/issues/311)) -* Tweak: Live updates are enabled by default for new installs ([issue-312](https://github.com/x-team/wp-stream/issues/312)) -* Tweak: Action links are now available for Stream Settings records ([issue-305](https://github.com/x-team/wp-stream/issues/305)) -* Fix: Superfluous auto-draft posts are now prevented from being logged ([issue-293](https://github.com/x-team/wp-stream/issues/293)) -* Fix: Fallback to the term slug if a label does not exist in list-table ([issue-214](https://github.com/x-team/wp-stream/issues/214)) -* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([issue-283](https://github.com/x-team/wp-stream/issues/283)) +* New: Exclude tab in Settings to prevent specific types of activity from being tracked ([#251](https://github.com/x-team/wp-stream/issues/251)) +* New: Now logging Custom Background and Custom Header changes ([#309](https://github.com/x-team/wp-stream/issues/309)) +* New: Predefined date intervals now available when filtering records ([#320](https://github.com/x-team/wp-stream/issues/320)) +* Tweak: Action links are now available for Stream Settings records ([#305](https://github.com/x-team/wp-stream/issues/305)) +* Tweak: User avatars now displayed in Authors dropdown filter ([#311](https://github.com/x-team/wp-stream/issues/311)) +* Tweak: Live updates are enabled by default for new installs ([#312](https://github.com/x-team/wp-stream/issues/312)) +* Fix: Fallback to the term slug if a label does not exist in list-table ([#214](https://github.com/x-team/wp-stream/issues/214)) +* Fix: Widget sorting is now being tracked properly as well as Inactive widgets ([#283](https://github.com/x-team/wp-stream/issues/283)) +* Fix: Superfluous auto-draft posts are now prevented from being logged ([#293](https://github.com/x-team/wp-stream/issues/293)) Props [powelski](http://profiles.wordpress.org/powelski/), [faishal](http://profiles.wordpress.org/faishal/), [fjarrett](http://profiles.wordpress.org/fjarrett/), [desaiuditd](http://profiles.wordpress.org/desaiuditd/), [lukecarbis](http://profiles.wordpress.org/lukecarbis/), [shadyvb](http://profiles.wordpress.org/shadyvb/) diff --git a/stream.php b/stream.php index 194d8ed3e..e0b824551 100644 --- a/stream.php +++ b/stream.php @@ -3,7 +3,7 @@ * Plugin Name: Stream * Plugin URI: http://wordpress.org/plugins/stream/ * Description: Stream tracks logged-in user activity so you can monitor every change made on your WordPress site in beautifully organized detail. All activity is organized by context, action and IP address for easy filtering. Developers can extend Stream with custom connectors to log any kind of action. - * Version: 1.3.0 + * Version: 1.3.1 * Author: X-Team * Author URI: http://x-team.com/wordpress/ * License: GPLv2+ @@ -36,7 +36,7 @@ class WP_Stream { * * @const string */ - const VERSION = '1.3.0'; + const VERSION = '1.3.1'; /** * Hold Stream instance @@ -165,6 +165,7 @@ public static function install() { // Install plugin tables require_once WP_STREAM_INC_DIR . 'install.php'; WP_Stream_Install::check(); + } /** diff --git a/ui/admin.css b/ui/admin.css index cb489f682..cb46b23a1 100644 --- a/ui/admin.css +++ b/ui/admin.css @@ -1,5 +1,9 @@ /* Dashboard Widget */ +#dashboard_stream_activity:hover .edit-box { + display: inline; +} + #dashboard_stream_activity.postbox h3 { border-bottom: 0; } @@ -41,12 +45,6 @@ display: block; } -#dashboard_stream_activity .record-avatar img { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - #dashboard_stream_activity .record-meta { color: #666; } @@ -170,10 +168,6 @@ float: left; margin-right: 10px; margin-top: 1px; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; } .toplevel_page_wp_stream .filter-date-range { @@ -205,7 +199,8 @@ margin-top: 5px; } -.toplevel_page_wp_stream .new-row { +.toplevel_page_wp_stream .new-row, +#dashboard_stream_activity .new-row { background-color: #ffffe0; -webkit-transition: background 0.5s linear; @@ -215,7 +210,8 @@ transition: background 0.5s linear; } -.toplevel_page_wp_stream .new-row.fadeout { +.toplevel_page_wp_stream .new-row.fadeout, +#dashboard_stream_activity .new-row.fadeout { background-color: transparent; } diff --git a/ui/admin.js b/ui/admin.js index 94f40e552..43e0f9c8e 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -241,6 +241,12 @@ jQuery(function($){ // Add more info to the container container.attr('title', object.tooltip); } + // Add more info to the container + if ( 'undefined' !== typeof object.tooltip ) { + container.attr( 'title', object.tooltip ); + } else if ( 'undefined' !== typeof object.user_count ) { + container.attr( 'title', object.user_count ); + } return result; }, formatSelection: function (object){ @@ -335,7 +341,7 @@ jQuery(function($){ $(document).on( 'heartbeat-tick.stream', function( e, data ) { // If this no rows return then we kill the script - if ( ! data['wp-stream-heartbeat'] ) { + if ( ! data['wp-stream-heartbeat'] || data['wp-stream-heartbeat'].length === 0 ) { return; } @@ -386,7 +392,7 @@ jQuery(function($){ //Enable Live Update Checkbox Ajax $( '#enable_live_update' ).click( function() { var nonce = $( '#enable_live_update_nonce' ).val(); - var user = $( '#enable_live_update_user' ).val(); + var user = $( '#enable_live_update_user' ).val(); var checked = 'unchecked'; if ( $('#enable_live_update' ).is( ':checked' ) ) { checked = 'checked'; @@ -406,6 +412,88 @@ jQuery(function($){ }); }); + function toggle_filter_submit() { + var all_hidden = true; + // If all filters are hidden, hide the button + if ( ! $( 'div.date-interval' ).is( ':hidden' ) ) { + all_hidden = false; + } + var divs = $( 'div.alignleft.actions div.select2-container' ); + divs.each( function() { + if ( ! $(this).is( ':hidden' ) ) { + all_hidden = false; + return false; + } + }); + if ( all_hidden ) { + $( 'input#record-query-submit' ).hide(); + $( 'span.filter_info' ).show(); + } else { + $( 'input#record-query-submit' ).show(); + $( 'span.filter_info' ).hide(); + } + } + + if ( $( 'div.stream-toggle-filters [id="date"]' ).is( ':checked' ) ) { + $( 'div.date-interval' ).show(); + } else { + $( 'div.date-interval' ).hide(); + } + + for( var filter in wp_stream.filters ) { + if ( $( 'div.stream-toggle-filters [id="' + filter + '"]' ).is( ':checked' ) ) { + $( '[name="' + filter + '"]' ).prev( '.select2-container' ).show(); + } else { + $( '[name="' + filter + '"]' ).prev( '.select2-container' ).hide(); + } + } + + toggle_filter_submit(); + + //Enable Filter Toggle Checkbox Ajax + $( 'div.stream-toggle-filters input[type=checkbox]' ).click( function() { + + // Disable other checkboxes for duration of request to avoid "clickjacking" + var siblings = $(this).closest('div').find('input:checkbox'); + siblings.attr( 'disabled', true ); + var nonce = $( '#toggle_filters_nonce' ).val(); + var user = $( '#toggle_filters_user' ).val(); + var checked = 'unchecked'; + var checkbox = $(this).attr('id'); + if ( $(this).is( ':checked' ) ) { + checked = 'checked'; + } + + $.ajax({ + type: 'POST', + url: ajaxurl, + data: { action: 'stream_toggle_filters', nonce : nonce, user : user, checked : checked, checkbox: checkbox }, + dataType: 'json', + beforeSend : function() { + $( checkbox + ' .spinner' ).show().css( { 'display' : 'inline-block' } ); + + }, + success : function( data ) { + + var date_interval_div = $( 'div.date-interval' ); + // toggle visibility of input whose name attr matches checkbox ID + if ( data.control === 'date' ) { + date_interval_div.toggle(); + } else { + var control = $( '[name="' + data.control + '"]'); + if ( control.is( 'select' ) ) { + $( control ).prev( '.select2-container' ).toggle(); + } + } + + toggle_filter_submit(); + + } + }); + siblings.attr( 'disabled', false ); + }); + + $( '#ui-datepicker-div' ).addClass( 'stream-datepicker' ); }); diff --git a/ui/dashboard.js b/ui/dashboard.js index 3b532abe2..13be92f95 100644 --- a/ui/dashboard.js +++ b/ui/dashboard.js @@ -7,10 +7,74 @@ jQuery(function($){ 'action' : 'stream_activity_dashboard_update', 'stream-paged' : $(this).data('page'), }; - + $.post( window.ajaxurl, data, function( response ){ $( '#dashboard_stream_activity .inside' ).html( response ); } ); - } ); + }); + + + + /** + * Dashboard Live Update + */ + $( document ).ready( function() { + wp.heartbeat.interval( 'fast' ); + + var listSel = '#dashboard_stream_activity .inside ul'; + + $(document).on( 'heartbeat-send.stream', function(e, data) { + data['wp-stream-heartbeat'] = 'dashboard-update'; + var lastId = $( listSel + ' li:first').attr( 'data-id' ); + lastId = ( '' === lastId ) ? 1 : lastId; + data['wp-stream-heartbeat-last-id'] = lastId; + }); + + + // Listen for "heartbeat-tick" on $(document). + $(document).on( 'heartbeat-tick.stream', function( e, data ) { + + // If this no rows return then we kill the script + if ( ! data['wp-stream-heartbeat'] || data['wp-stream-heartbeat'].length === 0 ) { + return; + } + + //Prevent updates from being applied directly to pages that aren't the first in the list + if ( ! $( '#dashboard_stream_activity a.prev-page' ).hasClass( 'disabled' ) ) { + return; + } + + // Get all new rows + var $new_items = $(data['wp-stream-heartbeat']); + + var itemArray = []; + $( $new_items ).each( function() { + if ( typeof( $(this).html() ) === 'string' ) { + itemArray.push( '
  • ' + $(this).html() + '
    • ' ); + } + }); + + //Use records per page here + var addedItems = itemArray.slice( 0, data.per_page ); + + // Add element to the dom + $(listSel).prepend( addedItems ); + + //hide last visible element in list (will appear on next page) + // Remove the number of element added to the end of the list table + + $( listSel + ' li').slice(-itemArray.length).hide(); + + // Remove background after a certain amount of time + setTimeout( function() { + $('.new-row').addClass( 'fadeout' ); + setTimeout( function() { + $( listSel + ' li').removeClass('new-row fadeout'); + }, 500); + }, 3000); + + }); + + }); }); From 59fe5c6ffcb063ecdbf1aa53d60016c9363e41a4 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 16:40:19 +1000 Subject: [PATCH 052/123] Fix Travis CI Errors --- includes/admin.php | 32 +++++++++++++++----------------- includes/list-table.php | 24 ++++++++++-------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 06602e75a..a699ffb4a 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -358,6 +358,9 @@ public static function render_page() { $option_key = WP_Stream_Settings::get_option_key(); $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); $form_action = is_network_admin() ? add_query_arg( array( 'action' => $current_page ), 'edit.php' ) : admin_url( 'options.php' ); + + $sections = WP_Stream_Settings::get_fields(); + $active_tab = wp_stream_filter_input( INPUT_GET, 'tab' ); ?>
    @@ -365,11 +368,6 @@ public static function render_page() { - -

    $data ) : ?> @@ -384,18 +382,18 @@ public static function render_page() {
    - $data ) { - $i++; - $is_active = ( ( 1 === $i && ! $active_tab ) || $active_tab === $section ); - if ( $is_active ) { - settings_fields( $option_key ); - do_settings_sections( $option_key ); - } - } - submit_button(); - ?> + $data ) { + $i++; + $is_active = ( ( 1 === $i && ! $active_tab ) || $active_tab === $section ); + if ( $is_active ) { + settings_fields( $option_key ); + do_settings_sections( $option_key ); + } + } + submit_button(); + ?>
    diff --git a/includes/list-table.php b/includes/list-table.php index a61535bb2..7754364ff 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -602,7 +602,7 @@ function filters_form() { $filters = $this->get_filters(); - $filters_string = sprintf( '', 'wp_stream' ); + $filters_string = sprintf( '', 'wp_stream' ); $filters_string .= sprintf( __( '%1$sShow filter controls via the screen options tab above%2$s', 'stream' ), '' ); foreach ( $filters as $name => $data ) { @@ -782,8 +782,8 @@ static function set_live_update_option( $dummy, $option, $value ) { public function screen_controls( $status, $args ) { - $user_id = get_current_user_id(); - $option = get_user_meta( $user_id, 'enable_live_update', true ); + $user_id = get_current_user_id(); + $option = get_user_meta( $user_id, 'enable_live_update', true ); $filters = $this->get_filters(); @@ -833,17 +833,13 @@ public function screen_controls( $status, $args ) {

    - $val ) : - ?> - - + $val ) : ?> + +
    From 739f6b23aa36d63ab6f4b3f765d0913d97f472b2 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 18:01:30 +1000 Subject: [PATCH 053/123] Fix fatal error on settings page. --- includes/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index a699ffb4a..893cc8a94 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -237,7 +237,7 @@ public static function admin_enqueue_scripts( $hook ) { 'current_page' => isset( $_GET['paged'] ) ? esc_js( $_GET['paged'] ) : '1', 'current_order' => isset( $_GET['order'] ) ? esc_js( $_GET['order'] ) : 'desc', 'current_query' => json_encode( $_GET ), - 'filters' => self::$list_table->get_filters(), + 'filters' => self::$list_table ? self::$list_table->get_filters() : false, ) ); } From 4728dfda4ac1a1307425529402eb9cb705688801 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 3 Apr 2014 19:14:16 +1000 Subject: [PATCH 054/123] Add Reset Site Settings option --- includes/admin.php | 44 +++++++++++++++++++++++++++++++++++++++++++- includes/network.php | 18 ++++++++++++++++++ ui/admin.js | 8 +++++++- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 893cc8a94..de791051d 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -75,6 +75,9 @@ public static function load() { // Reset Streams database add_action( 'wp_ajax_wp_stream_reset', array( __CLASS__, 'wp_ajax_reset' ) ); + // Reset Streams settings + add_action( 'wp_ajax_wp_stream_defaults', array( __CLASS__, 'wp_ajax_defaults' ) ); + // Uninstall Streams and Deactivate plugin add_action( 'wp_ajax_wp_stream_uninstall', array( __CLASS__, 'uninstall_plugin' ) ); @@ -121,6 +124,9 @@ public static function admin_notices() { case 'data_erased': printf( '

    %s

    ', __( 'All records have been successfully erased.', 'stream' ) ); break; + case 'settings_reset': + printf( '

    %s

    ', __( 'All site settings have been successfully reset.', 'stream' ) ); + break; } } @@ -230,6 +236,7 @@ public static function admin_enqueue_scripts( $hook ) { array( 'i18n' => array( 'confirm_purge' => __( 'Are you sure you want to delete all Stream activity records from the database? This cannot be undone.', 'stream' ), + 'confirm_defaults' => __( 'Are you sure you want to reset all site settings to default? This cannot be undone.', 'stream' ), 'confirm_uninstall' => __( 'Are you sure you want to uninstall and deactivate Stream? This will delete all Stream tables from the database and cannot be undone.', 'stream' ), ), 'gmt_offset' => get_option( 'gmt_offset' ), @@ -435,7 +442,7 @@ public static function wp_ajax_reset() { } } - public static function erase_stream_records() { + private static function erase_stream_records() { global $wpdb; $wpdb->query( @@ -452,6 +459,41 @@ public static function erase_stream_records() { ); } + public static function wp_ajax_defaults() { + check_ajax_referer( 'stream_nonce', 'wp_stream_nonce' ); + if ( ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + wp_die( "You don't have sufficient privileges to do this action." ); + } + if ( current_user_can( self::SETTINGS_CAP ) ) { + self::reset_stream_settings(); + wp_redirect( + add_query_arg( + array( + 'page' => 'wp_stream_settings', + 'message' => 'settings_reset', + ), + is_plugin_active_for_network( WP_STREAM_PLUGIN ) ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) + ) + ); + exit; + } else { + wp_die( "You don't have sufficient privileges to do this action." ); + } + } + + private static function reset_stream_settings() { + global $wpdb; + + $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs}", ARRAY_A ); + if ( $blogs ) { + foreach ( $blogs as $blog ) { + switch_to_blog( $blog['blog_id'] ); + delete_option( WP_Stream_Settings::SETTINGS_KEY ); + } + restore_current_blog(); + } + } + /** * This function is used to uninstall all custom tables and uninstall the plugin * It will also uninstall custom actions diff --git a/includes/network.php b/includes/network.php index b41aa260a..de528c099 100644 --- a/includes/network.php +++ b/includes/network.php @@ -90,6 +90,24 @@ function get_fields( $fields ) { ); $fields = array_merge_recursive( $new_fields, $fields ); + + $reset_site_settings_href = add_query_arg( + array( + 'action' => 'wp_stream_defaults', + 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), + ), + admin_url( 'admin-ajax.php' ) + ); + + $fields['general']['fields'][] = array( + 'name' => 'reset_site_settings', + 'title' => __( 'Reset Site Settings', 'stream' ), + 'type' => 'link', + 'href' => $reset_site_settings_href, + 'desc' => __( 'Warning: Clicking this will override all site settings with defaults.', 'stream' ), + 'default' => 0, + ); + } return $fields; diff --git a/ui/admin.js b/ui/admin.js index 43e0f9c8e..a015ca31a 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -275,6 +275,12 @@ jQuery(function($){ } }); + $('#wp_stream_general_reset_site_settings').click(function(e){ + if ( ! confirm( wp_stream.i18n.confirm_defaults ) ) { + e.preventDefault(); + } + }); + $('#wp_stream_uninstall').click(function(e){ if ( ! confirm( wp_stream.i18n.confirm_uninstall ) ) { e.preventDefault(); @@ -283,7 +289,7 @@ jQuery(function($){ // Admin page tabs var $tabs = $('.nav-tab-wrapper'), - $panels = $('table.form-table'), + $panels = $('.nav-tab-content table.form-table'), $activeTab = $tabs.find('.nav-tab-active'), defaultIndex = $activeTab.length > 0 ? $tabs.find('a').index( $activeTab ) : 0, hashIndex = window.location.hash.match(/^#(\d+)$/), From 8b5ea3d045c042da56674853407b8122afc4c70b Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 4 Apr 2014 10:23:37 +1000 Subject: [PATCH 055/123] Fix live update and columns --- includes/list-table.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/list-table.php b/includes/list-table.php index 7754364ff..f40c37d2c 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -31,6 +31,7 @@ function __construct( $args = array() ) { set_screen_options(); if ( is_network_admin() ) { + add_filter( 'manage_' . $this->screen->id . '-network_columns', array( $this, 'get_columns' ), 0 ); add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); } } @@ -57,9 +58,13 @@ function extra_tablenav( $which ) { } function network_admin_columns( $columns ) { - unset( $columns['id'] ); - $columns['blog_id'] = __( 'Site', 'stream' ); - return $columns; + return array_merge( + array_slice( $columns, 0, -1 ), + array( + 'blog_id' => esc_html__( 'Site', 'stream' ), + ), + array_slice( $columns, -1 ) + ); } function get_columns(){ From 3f84124b4bf8ca737c33fb6e2f4473ce66636a7f Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 4 Apr 2014 12:39:53 +1000 Subject: [PATCH 056/123] Add Network Settings to settings connector. --- connectors/settings.php | 91 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/connectors/settings.php b/connectors/settings.php index 0683071c2..cb406689f 100644 --- a/connectors/settings.php +++ b/connectors/settings.php @@ -18,6 +18,7 @@ class WP_Stream_Connector_Settings extends WP_Stream_Connector { */ public static $actions = array( 'whitelist_options', + 'update_site_option', 'update_option_permalink_structure', 'update_option_category_base', 'update_option_tag_base', @@ -34,6 +35,37 @@ class WP_Stream_Connector_Settings extends WP_Stream_Connector { 'tag_base', ); + /** + * Option names used in network/settings.php + * + * @var array + */ + public static $network_options = array( + 'registrationnotification', + 'registration', + 'add_new_users', + 'menu_items', + 'upload_space_check_disabled', + 'blog_upload_space', + 'upload_filetypes', + 'site_name', + 'first_post', + 'first_page', + 'first_comment', + 'first_comment_url', + 'first_comment_author', + 'welcome_email', + 'welcome_user_email', + 'fileupload_maxk', + 'global_terms_enabled', + 'illegal_names', + 'limited_email_domains', + 'banned_email_domains', + 'WPLANG', + 'admin_email', + ); + + /** * Register all context hooks * @@ -88,6 +120,7 @@ public static function get_context_labels() { 'discussion' => __( 'Discussion', 'stream' ), 'media' => __( 'Media', 'stream' ), 'permalink' => __( 'Permalinks', 'stream' ), + 'network' => __( 'Network', 'stream' ), 'wp_stream' => __( 'Stream', 'stream' ), 'custom_background' => __( 'Custom Background', 'stream' ), 'custom_header' => __( 'Custom Header', 'stream' ), @@ -221,6 +254,29 @@ public static function get_field_label( $field_key ) { 'permalink_structure' => __( 'Permalink structure', 'stream' ), 'category_base' => __( 'Category base', 'stream' ), 'tag_base' => __( 'Tag base', 'stream' ), + // Network + 'registrationnotification' => __( 'Registration notification', 'stream' ), + 'registration' => __( 'Allow new registrations', 'stream' ), + 'add_new_users' => __( 'Add New Users', 'stream' ), + 'menu_items' => __( 'Enable administration menus', 'stream' ), + 'upload_space_check_disabled' => __( 'Site upload space check', 'stream' ), + 'blog_upload_space' => __( 'Site upload space', 'stream' ), + 'upload_filetypes' => __( 'Upload file types', 'stream' ), + 'site_name' => __( 'Network Title', 'stream' ), + 'first_post' => __( 'First Post', 'stream' ), + 'first_page' => __( 'First Page', 'stream' ), + 'first_comment' => __( 'First Comment', 'stream' ), + 'first_comment_url' => __( 'First Comment URL', 'stream' ), + 'first_comment_author' => __( 'First Comment Author', 'stream' ), + 'welcome_email' => __( 'Welcome Email', 'stream' ), + 'welcome_user_email' => __( 'Welcome User Email', 'stream' ), + 'fileupload_maxk' => __( 'Max upload file size', 'stream' ), + 'global_terms_enabled' => __( 'Terms Enabled', 'stream' ), + 'illegal_names' => __( 'Banned Names', 'stream' ), + 'limited_email_domains' => __( 'Limited Email Registrations', 'stream' ), + 'banned_email_domains' => __( 'Banned Email Domains', 'stream' ), + 'WPLANG' => __( 'Network Language', 'stream' ), + 'admin_email' => __( 'Network Admin Email', 'stream' ), ); if ( isset( $labels[ $field_key ] ) ) { @@ -342,6 +398,21 @@ public static function action_links( $links, $record ) { return ! empty( $submenu['options-general.php'] ); }, ), + 'network' => array( + 'menu_slug' => 'settings.php', + 'submenu_slug' => function( $record ) { + return 'settings.php'; + }, + 'url' => function( $rule, $record ) { + return network_admin_url( $rule['menu_slug'] ); + }, + 'applicable' => function( $submenu, $record ) { + if ( ! $record->blog_id ) { + return ! empty( $submenu['settings.php'] ); + } + return false; + }, + ), ); if ( 'settings' !== $record->context && in_array( $record->context, array_keys( $context_labels ) ) ) { @@ -412,6 +483,15 @@ public static function callback_update_option_permalink_structure( $old_value, $ self::callback_updated_option( 'permalink_structure', $old_value, $value ); } + /** + * Trigger this connector core tracker, only on network/settings.php page + * + * @action update_site_option + */ + public static function callback_update_site_option( $option, $value, $old_value ) { + self::callback_updated_option( $option, $value, $old_value ); + } + /** * Trigger this connector core tracker, only on options-permalink.php page * @@ -445,7 +525,8 @@ public static function callback_updated_option( $option, $old_value, $value ) { $options = array_merge( (array) $whitelist_options, (array) $new_whitelist_options, - array( 'permalink' => self::$permalink_options ) + array( 'permalink' => self::$permalink_options ), + array( 'network' => self::$network_options ) ); foreach ( $options as $key => $opts ) { @@ -460,8 +541,14 @@ public static function callback_updated_option( $option, $old_value, $value ) { } $changed_options = array(); - + $option_group = false; if ( is_array( $old_value ) || is_array( $value ) ) { + if ( count( array_filter( array_keys( $value ), 'is_string' ) ) > 0 ) { + $option_group = true; + } + } + + if ( $option_group ) { foreach ( self::get_changed_keys( $old_value, $value ) as $field_key ) { if ( ! self::is_key_ignored( $option, $field_key ) ) { $key_context = self::get_context_by_key( $option, $field_key ); From 2416dcc11c52da2964f3c952e44e84d28db8dcf9 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 4 Apr 2014 13:47:15 +1000 Subject: [PATCH 057/123] Fix screen option column toggles --- includes/admin.php | 2 +- includes/list-table.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index de791051d..16b6870d7 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -854,7 +854,7 @@ public static function live_update( $response, $data ) { // Register list table require_once WP_STREAM_INC_DIR . 'list-table.php'; - self::$list_table = new WP_Stream_List_Table( array( 'screen' => self::RECORDS_PAGE_SLUG ) ); + self::$list_table = new WP_Stream_List_Table( array( 'screen' => 'toplevel_page_' . self::RECORDS_PAGE_SLUG ) ); $last_id = intval( $data['wp-stream-heartbeat-last-id'] ); $query = $data['wp-stream-heartbeat-query']; diff --git a/includes/list-table.php b/includes/list-table.php index f40c37d2c..ad132788f 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -3,11 +3,18 @@ class WP_Stream_List_Table extends WP_List_Table { function __construct( $args = array() ) { + + $screen_id = isset( $args['screen'] ) ? $args['screen'] : null; + + if ( is_network_admin() && $screen_id && '-network' !== substr( $screen_id, -8 ) ) { + $screen_id .= '-network'; + } + parent::__construct( array( 'post_type' => 'stream', 'plural' => 'records', - 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, + 'screen' => $screen_id, ) ); @@ -31,7 +38,6 @@ function __construct( $args = array() ) { set_screen_options(); if ( is_network_admin() ) { - add_filter( 'manage_' . $this->screen->id . '-network_columns', array( $this, 'get_columns' ), 0 ); add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); } } @@ -106,7 +112,7 @@ function get_hidden_columns() { $hidden = get_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', true ); // If user meta is not found; add the default hidden column 'id' - if ( false === $hidden ) { + if ( ! $hidden ) { $hidden = array( 'id' ); update_user_meta( $user->ID, 'manage' . $this->screen->id . 'columnshidden', $hidden ); } @@ -117,7 +123,7 @@ function get_hidden_columns() { function prepare_items() { $columns = $this->get_columns(); $sortable = $this->get_sortable_columns(); - $hidden = get_hidden_columns( $this->screen ); + $hidden = $this->get_hidden_columns(); $this->_column_headers = array( $columns, $hidden, $sortable ); From 78432aaf37c01148e305f469394b06cd05ce3a1d Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Mon, 7 Apr 2014 17:25:59 +1000 Subject: [PATCH 058/123] Clean up admin, install and db-actions --- includes/admin.php | 79 ++++++++++-------------------------- includes/db-actions.php | 8 +--- includes/install.php | 8 +--- includes/network.php | 88 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 73 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 16b6870d7..ee2b66a7b 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -17,7 +17,7 @@ class WP_Stream_Admin { public static $list_table = null; /** - * Network option to disable access on individual sites + * Option to disable access to Stream * * @var bool */ @@ -36,31 +36,13 @@ public static function load() { add_filter( 'user_has_cap', array( __CLASS__, '_filter_user_caps' ), 10, 4 ); add_filter( 'role_has_cap', array( __CLASS__, '_filter_role_caps' ), 10, 3 ); - if ( is_multisite() ) { - $settings = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), - WP_Stream_Settings::get_defaults() - ); - if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { - self::$disable_access = true; - } - } + self::$disable_access = apply_filters( 'wp_stream_disable_admin_access', false ); - // Register settings page for network admin - if ( is_network_admin() ) { - // Register network settings page - add_action( 'network_admin_menu', array( __CLASS__, 'register_menu' ) ); + // Register settings page + add_action( 'admin_menu', array( __CLASS__, 'register_menu' ) ); - // Network admin notices - add_action( 'network_admin_notices', array( __CLASS__, 'admin_notices' ) ); - - } else { - // Register settings page - add_action( 'admin_menu', array( __CLASS__, 'register_menu' ) ); - - // Admin notices - add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); - } + // Admin notices + add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); // Add admin body class add_filter( 'admin_body_class', array( __CLASS__, 'admin_body_class' ) ); @@ -90,7 +72,6 @@ public static function load() { // Load Dashboard widget add_action( 'wp_dashboard_setup', array( __CLASS__, 'dashboard_stream_activity' ) ); - add_action( 'wp_network_dashboard_setup', array( __CLASS__, 'dashboard_stream_activity' ) ); // Dashboard AJAX pagination add_action( 'wp_ajax_stream_activity_dashboard_update', array( __CLASS__, 'dashboard_stream_activity_update_contents' ) ); @@ -140,7 +121,7 @@ public static function register_menu() { if ( is_network_admin() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) return false; - if ( ! is_network_admin() && self::$disable_access ) + if ( self::$disable_access ) return false; self::$screen_id['main'] = add_menu_page( @@ -153,35 +134,16 @@ public static function register_menu() { '2.999999' // Using longtail decimal string to reduce the chance of position conflicts, see Codex ); - if ( is_network_admin() ) { - self::$screen_id['settings'] = add_submenu_page( - self::RECORDS_PAGE_SLUG, - __( 'Stream Network Settings', 'stream' ), - __( 'Network Settings', 'stream' ), - self::SETTINGS_CAP, - 'wp_stream_settings', - array( __CLASS__, 'render_page' ) - ); - if ( ! self::$disable_access ) { - self::$screen_id['default_settings'] = add_submenu_page( - self::RECORDS_PAGE_SLUG, - __( 'Stream Default Settings', 'stream' ), - __( 'Default Settings', 'stream' ), - self::SETTINGS_CAP, - 'wp_stream_default_settings', - array( __CLASS__, 'render_page' ) - ); - } - } else { - self::$screen_id['settings'] = add_submenu_page( - self::RECORDS_PAGE_SLUG, - __( 'Stream Settings', 'stream' ), - __( 'Settings', 'stream' ), - self::SETTINGS_CAP, - 'wp_stream_settings', - array( __CLASS__, 'render_page' ) - ); - } + self::$screen_id['settings'] = add_submenu_page( + self::RECORDS_PAGE_SLUG, + __( 'Stream Settings', 'stream' ), + __( 'Settings', 'stream' ), + self::SETTINGS_CAP, + 'wp_stream_settings', + array( __CLASS__, 'render_page' ) + ); + + do_action( 'wp_stream_admin_menu_screens' ); // Register the list table early, so it associates the column headers with 'Screen settings' add_action( 'load-' . self::$screen_id['main'], array( __CLASS__, 'register_list_table' ) ); @@ -339,7 +301,7 @@ public static function admin_menu_css() { */ public static function plugin_action_links( $links, $file ) { if ( plugin_basename( WP_STREAM_DIR . 'stream.php' ) === $file ) { - $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); + $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), network_admin_url( self::ADMIN_PARENT_PAGE ) ); $links[] = sprintf( '%s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'stream' ) ); $url = add_query_arg( @@ -362,9 +324,8 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $option_key = WP_Stream_Settings::get_option_key(); - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - $form_action = is_network_admin() ? add_query_arg( array( 'action' => $current_page ), 'edit.php' ) : admin_url( 'options.php' ); + $option_key = WP_Stream_Settings::get_option_key(); + $form_action = apply_filters( 'wp_stream_settings_form_action', admin_url( 'options.php' ) ); $sections = WP_Stream_Settings::get_fields(); $active_tab = wp_stream_filter_input( INPUT_GET, 'tab' ); diff --git a/includes/db-actions.php b/includes/db-actions.php index 3177302c4..38cc1c16b 100644 --- a/includes/db-actions.php +++ b/includes/db-actions.php @@ -19,13 +19,7 @@ public function __construct() { * @param string database prefix * @return string udpated database prefix */ - if ( is_multisite() ) { - $prefix = $wpdb->base_prefix; - } else { - $prefix = $wpdb->prefix; - } - - $prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); + $prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); self::$table = $prefix . 'stream'; self::$table_meta = $prefix . 'stream_meta'; diff --git a/includes/install.php b/includes/install.php index 4bc460ace..17a29d3e6 100644 --- a/includes/install.php +++ b/includes/install.php @@ -22,13 +22,7 @@ public static function check() { * @param string database prefix * @return string udpated database prefix */ - if ( is_multisite() ) { - $prefix = $wpdb->base_prefix; - } else { - $prefix = $wpdb->prefix; - } - - self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); + self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); if ( empty( $db_version ) ) { self::install(); diff --git a/includes/network.php b/includes/network.php index de528c099..3ed2aec1d 100644 --- a/includes/network.php +++ b/includes/network.php @@ -15,13 +15,88 @@ function __construct() { } function actions() { + add_action( 'network_admin_menu', array( 'WP_Stream_Admin', 'register_menu' ) ); + add_action( 'network_admin_notices', array( 'WP_Stream_Admin', 'admin_notices' ) ); add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); + add_action( 'wp_network_dashboard_setup', array( 'WP_Stream_Admin', 'dashboard_stream_activity' ) ); + add_action( 'wp_stream_admin_menu_screens', array( $this, 'admin_menu_screens' ) ); } function filters() { + add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); + add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); add_filter( 'wp_stream_options', array( $this, 'get_network_options' ) ); add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); + add_filter( 'wp_stream_db_tables_prefix', array( $this, 'db_tables_prefix' ) ); + } + + /** + * If site access has been disabled from the network admin, disallow access + * + * @param $disable_access + * + * @return boolean + */ + function disable_admin_access( $disable_access ) { + if ( ! is_network_admin() ) { + $settings = wp_parse_args( + (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), + WP_Stream_Settings::get_defaults() + ); + if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { + return true; + } + } + return $disable_access; + } + + /** + * Add Network Settings and Default Settings menu items + * + * @param $screen_id + * + * @return array + */ + function admin_menu_screens() { + if ( is_network_admin() ) { + remove_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, 'wp_stream_settings' ); + + WP_Stream_Admin::$screen_id['settings'] = add_submenu_page( + WP_Stream_Admin::RECORDS_PAGE_SLUG, + __( 'Stream Network Settings', 'stream' ), + __( 'Network Settings', 'stream' ), + WP_Stream_Admin::SETTINGS_CAP, + 'wp_stream_settings', + array( 'WP_Stream_Admin', 'render_page' ) + ); + + if ( ! WP_Stream_Admin::$disable_access ) { + WP_Stream_Admin::$screen_id['default_settings'] = add_submenu_page( + WP_Stream_Admin::RECORDS_PAGE_SLUG, + __( 'Stream Default Settings', 'stream' ), + __( 'Default Settings', 'stream' ), + WP_Stream_Admin::SETTINGS_CAP, + 'wp_stream_default_settings', + array( 'WP_Stream_Admin', 'render_page' ) + ); + } + } + } + + /** + * Adjust the action of the settings form when in the Network Admin + * + * @param $action + * + * @return string + */ + function settings_form_action( $action ) { + if ( is_network_admin() ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + $action = add_query_arg( array( 'action' => $current_page ), 'edit.php' ); + } + return $action; } /** @@ -199,4 +274,17 @@ function toggle_filters( $filters ) { return $filters; } + + /** + * Use a single primary database table for multisite installs + * + * @param $options + * + * @return array + */ + function db_tables_prefix( $prefix ) { + global $wpdb; + return $wpdb->base_prefix; + } + } From 0f63f205b0c6061b353e98a985f244713515efa5 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Mon, 7 Apr 2014 22:47:41 +1000 Subject: [PATCH 059/123] Clean up admin, list-table --- includes/admin.php | 11 ++-- includes/list-table.php | 74 +--------------------- includes/network.php | 136 +++++++++++++++++++++++++++++++++++----- 3 files changed, 127 insertions(+), 94 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index ee2b66a7b..98463d877 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -49,6 +49,7 @@ public static function load() { // Plugin action links add_filter( 'plugin_action_links', array( __CLASS__, 'plugin_action_links' ), 10, 2 ); + add_filter( 'network_admin_plugin_action_links', array( __CLASS__, 'plugin_action_links' ), 10, 2 ); // Load admin scripts and styles add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_enqueue_scripts' ) ); @@ -301,10 +302,10 @@ public static function admin_menu_css() { */ public static function plugin_action_links( $links, $file ) { if ( plugin_basename( WP_STREAM_DIR . 'stream.php' ) === $file ) { - $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), network_admin_url( self::ADMIN_PARENT_PAGE ) ); + $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $links[] = sprintf( '%s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'stream' ) ); - $url = add_query_arg( + $url = add_query_arg( array( 'action' => 'wp_stream_uninstall', 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), @@ -476,9 +477,9 @@ public static function uninstall_plugin() { } // Delete database option - delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); - delete_option( WP_Stream_Settings::SETTINGS_KEY ); - delete_option( 'dashboard_stream_activity_options' ); + delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + delete_site_option( WP_Stream_Settings::SETTINGS_KEY ); + delete_site_option( 'dashboard_stream_activity_options' ); // Redirect to plugin page wp_redirect( add_query_arg( array( 'deactivate' => true ), admin_url( 'plugins.php' ) ) ); diff --git a/includes/list-table.php b/includes/list-table.php index ad132788f..536869447 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -5,10 +5,7 @@ class WP_Stream_List_Table extends WP_List_Table { function __construct( $args = array() ) { $screen_id = isset( $args['screen'] ) ? $args['screen'] : null; - - if ( is_network_admin() && $screen_id && '-network' !== substr( $screen_id, -8 ) ) { - $screen_id .= '-network'; - } + $screen_id = apply_filters( 'wp_stream_list_table_screen_id', $screen_id ); parent::__construct( array( @@ -32,14 +29,9 @@ function __construct( $args = array() ) { add_filter( 'screen_settings', array( $this, 'screen_controls' ), 10, 2 ); add_filter( 'set-screen-option', array( __CLASS__, 'set_screen_option' ), 10, 3 ); - add_filter( 'stream_query_args', array( __CLASS__, 'set_network_option_value' ) ); add_action( 'wp_ajax_wp_stream_filters', array( __CLASS__, 'ajax_filters' ) ); set_screen_options(); - - if ( is_network_admin() ) { - add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); - } } static function ajax_filters() { @@ -63,16 +55,6 @@ function extra_tablenav( $which ) { } } - function network_admin_columns( $columns ) { - return array_merge( - array_slice( $columns, 0, -1 ), - array( - 'blog_id' => esc_html__( 'Site', 'stream' ), - ), - array_slice( $columns, -1 ) - ); - } - function get_columns(){ /** * Allows devs to add new columns to table @@ -279,7 +261,7 @@ function column_default( $item, $column_name ) { break; case 'blog_id': - $blog = $item->blog_id ? get_blog_details( $item->blog_id ) : self::get_network_blog(); + $blog = ( $item->blog_id && is_multisite() ) ? get_blog_details( $item->blog_id ) : WP_Stream_Network::get_network_blog(); $out = sprintf( '%s', add_query_arg( array( 'blog_id' => $blog->blog_id ), network_admin_url( 'admin.php?page=wp_stream' ) ), @@ -326,19 +308,6 @@ function column_default( $item, $column_name ) { echo $out; // xss ok } - /** - * Builds a stdClass object used when displaying actions done in network administration - * @return stdClass - */ - public static function get_network_blog() { - $blog = new stdClass; - $blog->blog_id = 0; - $blog->blogname = __( 'Network Admin', 'stream' ); - - return $blog; - } - - public static function get_action_links( $record ) { $out = ''; @@ -567,32 +536,6 @@ public function get_filters() { 'items' => $this->assemble_records( 'action' ), ); - if ( is_network_admin() ) { - $blogs = array(); - - // display network blog as the first option - $network_blog = self::get_network_blog(); - - $blogs['network'] = array( - 'label' => $network_blog->blogname, - 'disabled' => '', - ); - - // add all sites - foreach ( (array) wp_get_sites() as $blog ) { - $blog_data = get_blog_details( $blog ); - - $blogs[ $blog['blog_id'] ] = array( - 'label' => $blog_data->blogname, - 'disabled' => '', - ); - } - - $filters['blog_id'] = array( - 'title' => __( 'sites', 'stream' ), - 'items' => $blogs, - ); - } /** * Filter allows additional filters in the list table dropdowns @@ -888,17 +831,4 @@ function get_column_excluded_setting_key( $column ) { return $output; } - - /** - * This will be moved to blog connector perhaps - * @filter stream_query_args - */ - static function set_network_option_value( $args ) { - if ( isset( $args['blog_id'] ) && $args['blog_id'] === 'network' ) { - $args['blog_id'] = 0; - } - - return $args; - } - } diff --git a/includes/network.php b/includes/network.php index 3ed2aec1d..386fd23fd 100644 --- a/includes/network.php +++ b/includes/network.php @@ -27,8 +27,24 @@ function filters() { add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); add_filter( 'wp_stream_options', array( $this, 'get_network_options' ) ); + add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); add_filter( 'wp_stream_db_tables_prefix', array( $this, 'db_tables_prefix' ) ); + add_filter( 'wp_stream_list_table_screen_id', array( $this, 'list_table_screen_id' ) ); + add_filter( 'stream_query_args', array( $this, 'set_network_option_value' ) ); + add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); + } + + /** + * Builds a stdClass object used when displaying actions done in network administration + * @return stdClass + */ + public static function get_network_blog() { + $blog = new stdClass; + $blog->blog_id = 0; + $blog->blogname = __( 'Network Admin', 'stream' ); + + return $blog; } /** @@ -243,48 +259,134 @@ function network_options_action() { * @return array */ function get_network_options( $options ) { - if ( ! is_network_admin() ) { - return $options; - } + if ( is_network_admin() ) { - $network_options = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), - WP_Stream_Settings::get_defaults() - ); + $network_options = wp_parse_args( + (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), + WP_Stream_Settings::get_defaults() + ); - if ( $network_options ) { - return $network_options; + if ( $network_options ) { + $options = $network_options; + } } return $options; } /** - * Add the Site toggle to screen options when in network settings + * Add the Site filter to the stream activity in network admin * - * @param $options + * @param $filters * * @return array */ - function toggle_filters( $filters ) { - if ( ! is_network_admin() ) { - return $filters; + function list_table_filters( $filters ) { + if ( is_network_admin() ) { + $blogs = array(); + + // display network blog as the first option + $network_blog = self::get_network_blog(); + + $blogs['network'] = array( + 'label' => $network_blog->blogname, + 'disabled' => '', + ); + + // add all sites + foreach ( (array) wp_get_sites() as $blog ) { + $blog_data = get_blog_details( $blog ); + + $blogs[ $blog['blog_id'] ] = array( + 'label' => $blog_data->blogname, + 'disabled' => '', + ); + } + + $filters['blog_id'] = array( + 'title' => __( 'sites', 'stream' ), + 'items' => $blogs, + ); } - $filters['blog_id'] = esc_html__( 'Site', 'stream' ); + return $filters; } + /** + * Add the Site toggle to screen options in network admin + * + * @param $filters + * + * @return array + */ + function toggle_filters( $filters ) { + if ( is_network_admin() ) { + $filters['blog_id'] = esc_html__( 'Site', 'stream' ); + } + return $filters; + } /** * Use a single primary database table for multisite installs * - * @param $options + * @param $prefix * - * @return array + * @return string */ function db_tables_prefix( $prefix ) { global $wpdb; return $wpdb->base_prefix; } + /** + * Add the network suffix to the $screen_id when in the network admin + * + * @param $screen_id + * + * @return string + */ + function list_table_screen_id( $screen_id ) { + if ( $screen_id && is_network_admin() ) { + if ( '-network' !== substr( $screen_id, -8 ) ) { + $screen_id .= '-network'; + } + } + return $screen_id; + } + + /** + * Adjust the stream query to work with changes on the network level + * + * @param $args + * + * @return mixed + */ + static function set_network_option_value( $args ) { + if ( isset( $args['blog_id'] ) && $args['blog_id'] === 'network' ) { + $args['blog_id'] = 0; + } + + return $args; + } + + /** + * Add the Site column to the network stream records + * + * @param $args + * + * @return mixed + */ + function network_admin_columns( $columns ) { + if ( is_network_admin() ) { + $columns = array_merge( + array_slice( $columns, 0, -1 ), + array( + 'blog_id' => esc_html__( 'Site', 'stream' ), + ), + array_slice( $columns, -1 ) + ); + } + return $columns; + } + } From 8de845fe2bd0757d0800161377f396e4f422ad43 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 8 Apr 2014 13:24:14 +1000 Subject: [PATCH 060/123] Add blogs connector --- connectors/blogs.php | 309 +++++++++++++++++++++++++++++++++++++++++++ tmp/blogs.php | 184 -------------------------- 2 files changed, 309 insertions(+), 184 deletions(-) create mode 100644 connectors/blogs.php delete mode 100644 tmp/blogs.php diff --git a/connectors/blogs.php b/connectors/blogs.php new file mode 100644 index 000000000..bc483a2a4 --- /dev/null +++ b/connectors/blogs.php @@ -0,0 +1,309 @@ + __( 'Updated', 'stream' ), + 'created' => __( 'Created', 'stream' ), + 'archive_blog' => __( 'Archived', 'stream' ), + 'deleted' => __( 'Deleted', 'stream' ), + ); + } + + /** + * Return translated context labels + * + * @return array Context label translations + */ + public static function get_context_labels() { + $blogs = wp_get_sites(); + $labels = array(); + + foreach ( $blogs as $blog ) { + $blog_details = get_blog_details( $blog['blog_id'] ); + $key = sanitize_key( $blog_details->blogname ); + $labels[ $key ] = $blog_details->blogname; + } + + return $labels; + } + + /** + * Add action links to Stream drop row in admin list screen + * + * @filter wp_stream_action_links_{connector} + * @param array $links Previous links registered + * @param int $record Stream record + * @return array Action links + */ + public static function action_links( $links, $record ) { + $links [ __( 'Site Admin', 'stream' ) ] = get_admin_url( $record->object_id ); + if ( $record->object_id ) { + $site_admin_link = get_admin_url( $record->object_id ); + + if ( $site_admin_link ) { + $links [ __( 'Site Admin', 'stream' ) ] = $site_admin_link; + } + + $site_settings_link = add_query_arg( + array( + 'id' => $record->object_id, + ), + network_admin_url( 'site-info.php' ) + ); + + if ( $site_settings_link ) { + $links [ __( 'Site Settings', 'stream' ) ] = $site_settings_link; + } + } + return $links; + } + + /** + * @param $blog_id + * @action wpmu_new_blog + */ + public static function callback_wpmu_new_blog( $blog_id ) { + $blog = get_blog_details( $blog_id ); + $context = sanitize_key( $blog->blogname ); + self::log( + _x( + 'A new site called "%1$s" has been created.', + '1. Site name', + 'stream' + ), + array( + 'site_name' => $blog->blogname, + ), + $blog_id, + array( $context => 'created' ) + ); + } + + /** + * @param $blog_id + * @param $user_id + * @action wpmu_activate_blog + */ + public static function callback_wpmu_activate_blog( $blog_id, $user_id ) { + $blog = get_blog_details( $blog_id ); + $context = sanitize_key( $blog->blogname ); + self::log( + _x( + 'A new site called "%1$s" has been registered.', + '1. Site name', + 'stream' + ), + array( + 'site_name' => $blog->blogname, + ), + $blog_id, + array( $context => 'created' ), + $user_id + ); + } + + /** + * @param $user_id + * @param $role + * @param $blog_id + * @action add_user_to_blog + */ + public static function callback_add_user_to_blog( $user_id, $role, $blog_id ) { + $blog = get_blog_details( $blog_id ); + $user = get_user_by( 'id', $user_id ); + $context = sanitize_key( $blog->blogname ); + + if ( ! is_a( $user, 'WP_User' ) ) { + return; + } + + self::log( + _x( + '%1$s has been added to the site "%2$s" with %3$s capabilities.', + '1. User\'s name, 2. Site name, 3. Role', + 'stream' + ), + array( + 'user_name' => $user->display_name, + 'site_name' => $blog->blogname, + 'role_name' => $role, + ), + $blog_id, + array( $context => 'updated' ) + ); + } + + /** + * @param $user_id + * @param $blog_id + * @action remove_user_from_blog + */ + public static function callback_remove_user_from_blog( $user_id, $blog_id ) { + $blog = get_blog_details( $blog_id ); + $user = get_user_by( 'id', $user_id ); + $context = sanitize_key( $blog->blogname ); + + if ( ! is_a( $user, 'WP_User' ) ) { + return; + } + + self::log( + _x( + '%1$s has been removed from the site "%2$s".', + '1. User\'s name, 2. Site name', + 'stream' + ), + array( + 'user_name' => $user->display_name, + 'site_name' => $blog->blogname, + ), + $blog_id, + array( $context => 'updated' ) + ); + } + + /** + * @param $blog_id + * @action make_spam_blog + */ + public static function callback_make_spam_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'marked as spam', 'stream' ), 'updated' ); + } + + /** + * @param $blog_id + * @action make_spam_blog + */ + public static function callback_make_ham_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'marked as not spam', 'stream' ), 'updated' ); + } + + /** + * @param $blog_id + * @action mature_blog + */ + public static function callback_mature_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'marked as mature', 'stream' ), 'updated' ); + } + + /** + * @param $blog + * @action unmature_blog + */ + public static function callback_unmature_blog( $blog ) { + self::callback_update_blog_status( $blog_id, __( 'marked as not mature', 'stream' ), 'updated' ); + } + + /** + * @param $blog + * @action archive_blog + */ + public static function callback_archive_blog( $blog ) { + self::callback_update_blog_status( $blog_id, __( 'archived', 'stream' ), 'archive_blog' ); + } + + /** + * @param $blog_id + * @action unarchive_blog + */ + public static function callback_unarchive_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'restored from archive', 'stream' ), 'updated' ); + } + + /** + * @param $blog_id + * @action make_delete_blog + */ + public static function callback_make_delete_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'deleted', 'stream' ), 'deleted' ); + } + + /** + * @param $blog_id + * @action undelete_blog + */ + public static function callback_make_undelete_blog( $blog_id ) { + self::callback_update_blog_status( $blog_id, __( 'restored', 'stream' ), 'updated' ); + } + + /** + * @param $blog_id + * @param $value + * @action update_blog_public + */ + public static function callback_update_blog_public( $blog_id, $value ) { + if ( $value ) { + $status = __( 'marked as public', 'stream' ); + } else { + $status = __( 'marked as private', 'stream' ); + } + self::callback_update_blog_status( $blog_id, $status, 'updated' ); + } + + /** + * @param $blog_id + * @action update_blog_public + */ + public static function callback_update_blog_status( $blog_id, $status, $action ) { + $blog = get_blog_details( $blog_id ); + $context = sanitize_key( $blog->blogname ); + self::log( + _x( + '"%1$s" has been %2$s.', + '1. Site name, 2. Status', + 'stream' + ), + array( + 'site_name' => $blog->blogname, + 'status' => $status, + ), + $blog_id, + array( $context => $action ) + ); + + } + +} diff --git a/tmp/blogs.php b/tmp/blogs.php deleted file mode 100644 index 31f30107b..000000000 --- a/tmp/blogs.php +++ /dev/null @@ -1,184 +0,0 @@ - __( 'Updated', 'stream' ), - 'created' => __( 'Created', 'stream' ), - 'archive_blog' => __( 'Archived', 'stream' ), - 'deleted' => __( 'Deleted', 'stream' ), - ); - } - - /** - * Return translated context labels - * - * @return array Context label translations - */ - /* - public static function get_context_labels() { - $blogs = wp_get_sites(); - $blog_labels = array(); - - foreach( $blogs as $blog ) { - $blog_labels[ $blog['blog_id'] ] = array( - 'domain' => $blog['domain'], - 'public' => $blog['public'], - 'last_updated' => $blog['last_updated'], - 'registered' => $blog['registered'], - 'archived' => $blog['archived'], - 'mature' => $blog['mature'], - 'spam' => $blog['spam'], - 'deleted' => $blog['deleted'], - ); - } - - return $blog_labels; - } - */ - - /** - * Add action links to Stream drop row in admin list screen - * - * @filter wp_stream_action_links_{connector} - * @param array $links Previous links registered - * @param int $record Stream record - * @return array Action links - */ - public static function action_links( $links, $record ) { - return $links; - } - - /** - * @param $blog_id - * @action activate_blog - */ - public static function callback_activate_blog( $blog_id ) { - - } - - /** - * @param $blog_id - * @action wpmu_new_blog - */ - public static function callback_wpmu_new_blog( $blog_id ) { - - } - - /** - * @param $post_id - * @action make_spam_blog - */ - public static function callback_make_spam_blog( $post_id ) { - - } - - /** - * @param $blog - * @action make_ham_blog - */ - public static function callback_make_ham_blog( $blog ) { - - } - - /** - * @param $blog_id - * @action mature_blog - */ - public static function callback_mature_blog( $blog_id ) { - - } - - /** - * @param $blog - * @action unmature_blog - */ - public static function callback_unmature_blog( $blog ) { - - } - - /** - * @param $blog - * @action archive_blog - */ - public static function callback_archive_blog( $blog ) { - - } - - /** - * @param $blog_id - * @action unarchive_blog - */ - public static function callback_unarchive_blog( $blog_id ) { - - } - - /** - * @param $blog_id - * @action make_delete_blog - */ - public static function callback_make_delete_blog( $blog_id ) { - - } - - /** - * @param $blog_id - * @action undelete_blog - */ - public static function callback_make_undelete_blog( $blog_id ) { - - } - - /** - * @param $blog_id - * @action update_blog_public - */ - public static function callback_update_blog_public( $blog_id ) { - - } - -} From 0eed70c5ac4e2b58dab026db167fa4f1379d886b Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 8 Apr 2014 15:02:45 +1000 Subject: [PATCH 061/123] Fix non-multisite error when using wp_get_sites() --- connectors/blogs.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/connectors/blogs.php b/connectors/blogs.php index bc483a2a4..7f7c41262 100644 --- a/connectors/blogs.php +++ b/connectors/blogs.php @@ -58,15 +58,16 @@ public static function get_action_labels() { * @return array Context label translations */ public static function get_context_labels() { - $blogs = wp_get_sites(); $labels = array(); + if ( is_multisite() ) { + $blogs = wp_get_sites(); - foreach ( $blogs as $blog ) { - $blog_details = get_blog_details( $blog['blog_id'] ); - $key = sanitize_key( $blog_details->blogname ); - $labels[ $key ] = $blog_details->blogname; + foreach ( $blogs as $blog ) { + $blog_details = get_blog_details( $blog['blog_id'] ); + $key = sanitize_key( $blog_details->blogname ); + $labels[ $key ] = $blog_details->blogname; + } } - return $labels; } From dbd66b41078803e9412ed7ebabb1187a64c27529 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 8 Apr 2014 16:19:54 +1000 Subject: [PATCH 062/123] Upgrade routine for merging multisite tables --- connectors/settings.php | 2 +- includes/install.php | 60 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/connectors/settings.php b/connectors/settings.php index cb406689f..76119a3ed 100644 --- a/connectors/settings.php +++ b/connectors/settings.php @@ -518,7 +518,7 @@ public static function callback_update_option_tag_base( $old_value, $value ) { public static function callback_updated_option( $option, $old_value, $value ) { global $whitelist_options, $new_whitelist_options; - if ( 0 === strpos( $option, '_transient_' ) ) { + if ( 0 === strpos( $option, '_transient_' ) || 0 === strpos( $option, '_site_transient_' ) ) { return; } diff --git a/includes/install.php b/includes/install.php index 17a29d3e6..1333ad7f6 100644 --- a/includes/install.php +++ b/includes/install.php @@ -212,10 +212,66 @@ public static function update( $db_version, $current ) { add_action( 'wp_stream_after_connectors_registration', 'WP_Stream_Install::migrate_installer_edits_to_theme_editor_connector' ); } - // If version is lower than 1.4.0, manually alter the column order. Not possible using dbDelta alone. - if ( version_compare( $db_version, '1.4.0', '<' ) ) { + // If version is lower than 1.3.2, manually alter the column order. Not possible using dbDelta alone. + if ( version_compare( $db_version, '1.3.2', '<' ) ) { $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); } + + // If version is lower than 1.3.2, merge multisite tables. + if ( version_compare( $db_version, '1.3.2', '<' ) ) { + if ( is_multisite() ) { + + $blogs = wp_get_sites(); + + foreach ( $blogs as $blog ) { + switch_to_blog( $blog['blog_id'] ); + + if ( $wpdb->prefix === $wpdb->base_prefix ) { + continue; + } + + $sql = "SELECT * FROM {$wpdb->prefix}stream"; + + $blog_stream = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream as $key => $stream_entry ) { + + $prev_entry_id = $stream_entry['ID']; + + unset( $stream_entry['ID'] ); + $stream_entry['blog_id'] = $blog['blog_id']; + + $wpdb->insert( $wpdb->base_prefix . 'stream', $stream_entry ); + $stream_entry_id = $wpdb->insert_id; + + $sql = "SELECT * FROM {$wpdb->prefix}stream_context WHERE record_id = $prev_entry_id"; + + $blog_stream_context = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream_context as $key => $stream_context ) { + unset( $stream_context['meta_id'] ); + $stream_context['record_id'] = $stream_entry_id; + + $wpdb->insert( $wpdb->base_prefix . 'stream_context', $stream_context ); + } + + $sql = "SELECT * FROM {$wpdb->prefix}stream_meta WHERE record_id = $prev_entry_id"; + + $blog_stream_meta = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream_meta as $key => $stream_meta ) { + unset( $stream_meta['meta_id'] ); + $stream_meta['record_id'] = $stream_entry_id; + + $wpdb->insert( $wpdb->base_prefix . 'stream_meta', $stream_meta ); + } + + } + $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}stream, {$wpdb->prefix}stream_context, {$wpdb->prefix}stream_meta" ); + } + restore_current_blog(); + } + } } /** From cb6f50d924d8da96e67aa4c0165573ff07e75517 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 8 Apr 2014 16:26:31 +1000 Subject: [PATCH 063/123] Update routine version change --- includes/install.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/install.php b/includes/install.php index 1333ad7f6..bb9ed8ea3 100644 --- a/includes/install.php +++ b/includes/install.php @@ -212,13 +212,13 @@ public static function update( $db_version, $current ) { add_action( 'wp_stream_after_connectors_registration', 'WP_Stream_Install::migrate_installer_edits_to_theme_editor_connector' ); } - // If version is lower than 1.3.2, manually alter the column order. Not possible using dbDelta alone. - if ( version_compare( $db_version, '1.3.2', '<' ) ) { + // If version is lower than 1.3.3, manually alter the column order. Not possible using dbDelta alone. + if ( version_compare( $db_version, '1.3.3', '<' ) ) { $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); } - // If version is lower than 1.3.2, merge multisite tables. - if ( version_compare( $db_version, '1.3.2', '<' ) ) { + // If version is lower than 1.3.3, merge multisite tables. + if ( version_compare( $db_version, '1.3.3', '<' ) ) { if ( is_multisite() ) { $blogs = wp_get_sites(); From 1fbb93d6808a5d2fca1b62012f48162b60611f3c Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 8 Apr 2014 16:28:42 +1000 Subject: [PATCH 064/123] Fix spacing errors --- connectors/blogs.php | 3 +-- includes/install.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/connectors/blogs.php b/connectors/blogs.php index 7f7c41262..9ca59c820 100644 --- a/connectors/blogs.php +++ b/connectors/blogs.php @@ -60,8 +60,7 @@ public static function get_action_labels() { public static function get_context_labels() { $labels = array(); if ( is_multisite() ) { - $blogs = wp_get_sites(); - + $blogs = wp_get_sites(); foreach ( $blogs as $blog ) { $blog_details = get_blog_details( $blog['blog_id'] ); $key = sanitize_key( $blog_details->blogname ); diff --git a/includes/install.php b/includes/install.php index bb9ed8ea3..cb1721219 100644 --- a/includes/install.php +++ b/includes/install.php @@ -265,7 +265,6 @@ public static function update( $db_version, $current ) { $wpdb->insert( $wpdb->base_prefix . 'stream_meta', $stream_meta ); } - } $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}stream, {$wpdb->prefix}stream_context, {$wpdb->prefix}stream_meta" ); } From 297f8775b323b11f4a39bf4e6b8e8fe9b14c0f6d Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 11 Apr 2014 11:28:23 +1000 Subject: [PATCH 065/123] Should have been in merge --- includes/list-table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/list-table.php b/includes/list-table.php index bf82f9590..b2b2de30c 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -737,7 +737,7 @@ static function set_live_update_option( $dummy, $option, $value ) { public function screen_controls( $status, $args ) { $user_id = get_current_user_id(); - $option = get_user_meta( $user_id, 'enable_live_update', true ); + $option = get_user_meta( $user_id, 'stream_live_update_records', true ); $filters = $this->get_filters(); From 5a3e26f9fc5225d6c8cd4358be20674782bf592c Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 10 Apr 2014 22:42:04 -0500 Subject: [PATCH 066/123] Add blog count to records page title in network admin --- includes/admin.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index 225341bb4..22667cd88 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -381,7 +381,14 @@ public static function stream_page() { self::$list_table->prepare_items(); echo '
    '; - printf( '

    %s

    ', __( 'Stream Records', 'stream' ) ); // xss ok + + if ( is_network_admin() ) { + $site_count = sprintf( _n( '1 site', '%d sites', get_blog_count(), 'stream' ), get_blog_count() ); + printf( '

    %s (%s)

    ', __( 'Stream Records', 'stream' ), $site_count ); // xss ok + } else { + printf( '

    %s

    ', __( 'Stream Records', 'stream' ) ); // xss ok + } + self::$list_table->display(); echo '
    '; } From 78fe00a213bc83762e6143fe76af85d0f44ed900 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 11 Apr 2014 13:48:52 +1000 Subject: [PATCH 067/123] New settings layout in network admin. --- connectors/settings.php | 24 +++--- includes/admin.php | 17 +++- includes/network.php | 180 +++++++++++++++++++++++++++++++++++----- includes/settings.php | 34 ++++---- 4 files changed, 199 insertions(+), 56 deletions(-) diff --git a/connectors/settings.php b/connectors/settings.php index 76119a3ed..32f0ef85c 100644 --- a/connectors/settings.php +++ b/connectors/settings.php @@ -113,17 +113,19 @@ public static function get_action_labels() { */ public static function get_context_labels() { return array( - 'settings' => __( 'Settings', 'stream' ), - 'general' => __( 'General', 'stream' ), - 'writing' => __( 'Writing', 'stream' ), - 'reading' => __( 'Reading', 'stream' ), - 'discussion' => __( 'Discussion', 'stream' ), - 'media' => __( 'Media', 'stream' ), - 'permalink' => __( 'Permalinks', 'stream' ), - 'network' => __( 'Network', 'stream' ), - 'wp_stream' => __( 'Stream', 'stream' ), - 'custom_background' => __( 'Custom Background', 'stream' ), - 'custom_header' => __( 'Custom Header', 'stream' ), + 'settings' => __( 'Settings', 'stream' ), + 'general' => __( 'General', 'stream' ), + 'writing' => __( 'Writing', 'stream' ), + 'reading' => __( 'Reading', 'stream' ), + 'discussion' => __( 'Discussion', 'stream' ), + 'media' => __( 'Media', 'stream' ), + 'permalink' => __( 'Permalinks', 'stream' ), + 'network' => __( 'Network', 'stream' ), + 'wp_stream' => __( 'Stream', 'stream' ), + 'wp_stream_network' => __( 'Stream Network', 'stream' ), + 'wp_stream_defaults' => __( 'Stream Defaults', 'stream' ), + 'custom_background ' => __( 'Custom Background', 'stream' ), + 'custom_header' => __( 'Custom Header', 'stream' ), ); } diff --git a/includes/admin.php b/includes/admin.php index 22667cd88..c9e241ff1 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -329,12 +329,19 @@ public static function render_page() { $option_key = WP_Stream_Settings::get_option_key(); $form_action = apply_filters( 'wp_stream_settings_form_action', admin_url( 'options.php' ) ); + $page_title = apply_filters( 'wp_stream_settings_form_title', get_admin_page_title() ); + $page_description = apply_filters( 'wp_stream_settings_form_description', '' ); + $sections = WP_Stream_Settings::get_fields(); $active_tab = wp_stream_filter_input( INPUT_GET, 'tab' ); ?>
    -

    +

    + + +

    + @@ -380,6 +387,8 @@ public static function register_list_table() { public static function stream_page() { self::$list_table->prepare_items(); + $page_title = __( 'Stream Records', 'stream' ); + echo '
    '; if ( is_network_admin() ) { @@ -459,7 +468,7 @@ private static function reset_stream_settings() { if ( $blogs ) { foreach ( $blogs as $blog ) { switch_to_blog( $blog['blog_id'] ); - delete_option( WP_Stream_Settings::SETTINGS_KEY ); + delete_option( WP_Stream_Settings::KEY ); } restore_current_blog(); } @@ -488,7 +497,9 @@ public static function uninstall_plugin() { // Delete database option delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); - delete_site_option( WP_Stream_Settings::SETTINGS_KEY ); + delete_site_option( WP_Stream_Settings::KEY ); + delete_site_option( WP_Stream_Settings::DEFAULT_KEY ); + delete_site_option( WP_Stream_Settings::NETWORK_KEY ); delete_site_option( 'dashboard_stream_activity_options' ); // Redirect to plugin page diff --git a/includes/network.php b/includes/network.php index 386fd23fd..41382e767 100644 --- a/includes/network.php +++ b/includes/network.php @@ -25,8 +25,11 @@ function actions() { function filters() { add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); + add_filter( 'wp_stream_settings_form_description', array( $this, 'settings_form_description' ) ); + add_filter( 'wp_stream_settings_option_key', array( $this, 'get_option_key' ) ); add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); - add_filter( 'wp_stream_options', array( $this, 'get_network_options' ) ); + add_filter( 'wp_stream_options', array( $this, 'get_network_options' ), 10, 2 ); + add_filter( 'wp_stream_serialized_labels', array( $this, 'get_settings_translations' ) ); add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); add_filter( 'wp_stream_db_tables_prefix', array( $this, 'db_tables_prefix' ) ); @@ -57,7 +60,7 @@ public static function get_network_blog() { function disable_admin_access( $disable_access ) { if ( ! is_network_admin() ) { $settings = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), + (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ), WP_Stream_Settings::get_defaults() ); if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { @@ -76,22 +79,21 @@ function disable_admin_access( $disable_access ) { */ function admin_menu_screens() { if ( is_network_admin() ) { - remove_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, 'wp_stream_settings' ); - WP_Stream_Admin::$screen_id['settings'] = add_submenu_page( + WP_Stream_Admin::$screen_id['network_settings'] = add_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, __( 'Stream Network Settings', 'stream' ), __( 'Network Settings', 'stream' ), WP_Stream_Admin::SETTINGS_CAP, - 'wp_stream_settings', + 'wp_stream_network_settings', array( 'WP_Stream_Admin', 'render_page' ) ); if ( ! WP_Stream_Admin::$disable_access ) { WP_Stream_Admin::$screen_id['default_settings'] = add_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, - __( 'Stream Default Settings', 'stream' ), - __( 'Default Settings', 'stream' ), + __( 'New Site Settings', 'stream' ), + __( 'Site Defaults', 'stream' ), WP_Stream_Admin::SETTINGS_CAP, 'wp_stream_default_settings', array( 'WP_Stream_Admin', 'render_page' ) @@ -115,6 +117,52 @@ function settings_form_action( $action ) { return $action; } + /** + * Add a description to each of the Settings pages in the Network Admin + * + * @param $description + * + * @return string + */ + function settings_form_description( $description ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + switch ( $current_page ) { + case 'wp_stream_settings' : + $description = __( 'These settings only apply to the Network Admin Stream.', 'stream' ); + break; + case 'wp_stream_network_settings' : + $description = __( 'These settings apply to all sites on the network.', 'stream' ); + break; + case 'wp_stream_default_settings' : + $description = __( 'These default settings will apply to new sites created on the network. These settings do not alter existing sites.', 'stream' ); + break; + } + return $description; + } + + /** + * Changes the option key depending on which settings page is being viewed + * + * @param $fields + * + * @return mixed + */ + function get_option_key( $option_key ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( ! $current_page ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); + } + + if ( 'wp_stream_default_settings' === $current_page ) { + $option_key = WP_Stream_Settings::DEFAULTS_KEY; + } + if ( 'wp_stream_network_settings' === $current_page ) { + $option_key = WP_Stream_Settings::NETWORK_KEY; + } + + return $option_key; + } + /** * Adds a network settings field to stream options in network admin * @@ -133,30 +181,67 @@ function get_fields( $fields ) { $option_key = WP_Stream_Settings::get_option_key(); - $network_only_options = apply_filters( + $stream_hidden_options = apply_filters( + 'wp_stream_network_only_option_fields', + array( + 'general' => array( + 'delete_all_records', + 'records_ttl', + ), + ) + ); + + $network_stream_hidden_options = apply_filters( 'wp_stream_network_only_option_fields', array( 'general' => array( 'delete_all_records', 'records_ttl', + 'role_access', + ), + 'exclude' => array( + 'authors_and_roles', + 'connectors', + 'contexts', + 'actions', + 'ip_addresses', + 'hide_previous_records', ), ) ); - $site_only_options = apply_filters( + $network_hidden_options = apply_filters( 'wp_stream_site_only_option_fields', array( 'general' => array( 'role_access', 'private_feeds', ), + 'exclude' => array( + 'authors_and_roles', + 'connectors', + 'contexts', + 'actions', + 'ip_addresses', + 'hide_previous_records', + ), ) ); - if ( WP_Stream_Settings::SETTINGS_KEY === $option_key && is_network_admin() ) { - $hidden_options = $site_only_options; + $defaults_hidden_options = apply_filters( + 'wp_stream_site_only_option_fields', + array() + ); + + // Remove settings based on context + if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { + $hidden_options = $network_stream_hidden_options; + } elseif ( WP_Stream_Settings::NETWORK_KEY === $option_key && is_network_admin() ) { + $hidden_options = $network_hidden_options; + } elseif ( WP_Stream_Settings::DEFAULTS_KEY === $option_key && is_network_admin() ) { + $hidden_options = $defaults_hidden_options; } else { - $hidden_options = $network_only_options; + $hidden_options = $stream_hidden_options; } foreach ( $fields as $section_key => $section ) { @@ -170,7 +255,14 @@ function get_fields( $fields ) { } } - if ( WP_Stream_Settings::SETTINGS_KEY === $option_key && is_network_admin() ) { + foreach ( $fields as $section_key => $section ) { + if ( empty( $section['fields'] ) ) { + unset( $fields[ $section_key ] ); + } + } + + // Add and change settings, based on context + if ( WP_Stream_Settings::NETWORK_KEY === $option_key && is_network_admin() ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', 'title' => __( 'Enable Site Access', 'stream' ), @@ -198,17 +290,64 @@ function get_fields( $fields ) { 'desc' => __( 'Warning: Clicking this will override all site settings with defaults.', 'stream' ), 'default' => 0, ); - + } + if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { + foreach ( $fields['general']['fields'] as $key => $field ) { + if ( 'private_feeds' === $field['name'] ) { + $fields['general']['fields'][ $key ]['desc'] = sprintf( + __( 'Super Admins will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), + sprintf( + '', + admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), + esc_attr__( 'View Profile', 'stream' ) + ), + '' + ); + break; + } + } } return $fields; } + /** + * Get translations of serialized Stream Network and Stream Default settings + * + * @filter wp_stream_serialized_labels + * @return array Multidimensional array of fields + */ + function get_settings_translations( $labels ) { + $network_key = WP_Stream_Settings::NETWORK_KEY; + $defaults_key = WP_Stream_Settings::DEFAULTS_KEY; + + if ( ! isset( $labels[ $network_key ] ) ) { + $labels[ $network_key ] = array(); + } + if ( ! isset( $labels[ $defaults_key ] ) ) { + $labels[ $defaults_key ] = array(); + } + + foreach ( WP_Stream_Settings::get_fields() as $section_slug => $section ) { + foreach ( $section['fields'] as $field ) { + $labels[ $network_key ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; + $labels[ $defaults_key ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; + } + } + + return $labels; + } + /** * Wrapper for the settings API to work on the network settings page */ function network_options_action() { - if ( ! isset( $_GET['action'] ) || ( 'wp_stream_settings' !== $_GET['action'] && 'wp_stream_default_settings' !== $_GET['action'] ) ) { + $allowed_referers = array( + 'wp_stream_settings', + 'wp_stream_network_settings', + 'wp_stream_default_settings', + ); + if ( ! isset( $_GET['action'] ) || ! in_array( $_GET['action'], $allowed_referers ) ) { return; } @@ -258,17 +397,12 @@ function network_options_action() { * * @return array */ - function get_network_options( $options ) { + function get_network_options( $options, $option_key ) { if ( is_network_admin() ) { - - $network_options = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::SETTINGS_KEY, array() ), + $options = wp_parse_args( + (array) get_site_option( $option_key, array() ), WP_Stream_Settings::get_defaults() ); - - if ( $network_options ) { - $options = $network_options; - } } return $options; diff --git a/includes/settings.php b/includes/settings.php index 2c9b08d4b..1f59be15e 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -10,7 +10,12 @@ class WP_Stream_Settings { /** * Settings key/identifier */ - const SETTINGS_KEY = 'wp_stream'; + const KEY = 'wp_stream'; + + /** + * Settings key/identifier + */ + const NETWORK_KEY = 'wp_stream_network'; /** * Default Settings key/identifier @@ -48,9 +53,10 @@ public static function get_options() { return apply_filters( 'wp_stream_options', wp_parse_args( - (array) get_option( self::SETTINGS_KEY, array() ), + (array) get_option( self::KEY, array() ), self::get_defaults() - ) + ), + $option_key ); } @@ -67,10 +73,10 @@ public static function load() { add_action( 'admin_init', array( __CLASS__, 'register_settings' ) ); // Check if we need to flush rewrites rules - add_action( 'update_option_' . self::SETTINGS_KEY, array( __CLASS__, 'updated_option_trigger_flush_rules' ), 10, 2 ); + add_action( 'update_option_' . self::KEY, array( __CLASS__, 'updated_option_trigger_flush_rules' ), 10, 2 ); // Remove records when records TTL is shortened - add_action( 'update_option_' . self::SETTINGS_KEY, array( __CLASS__, 'updated_option_ttl_remove_records' ), 10, 2 ); + add_action( 'update_option_' . self::KEY, array( __CLASS__, 'updated_option_ttl_remove_records' ), 10, 2 ); add_filter( 'wp_stream_serialized_labels', array( __CLASS__, 'get_settings_translations' ) ); @@ -381,17 +387,7 @@ public static function get_defaults() { * @return array Default option values */ public static function get_option_key() { - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - if ( ! $current_page ) { - $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); - } - if ( 'wp_stream_default_settings' === $current_page ) { - $option_key = WP_Stream_Settings::DEFAULTS_KEY; - } else { - $option_key = WP_Stream_Settings::SETTINGS_KEY; - } - - return $option_key; + return apply_filters( 'wp_stream_settings_option_key', WP_Stream_Settings::KEY ); } /** @@ -834,13 +830,13 @@ public static function get_excluded_by_key( $column ) { * @return array Multidimensional array of fields */ public static function get_settings_translations( $labels ) { - if ( ! isset( $labels[ self::SETTINGS_KEY ] ) ) { - $labels[ self::SETTINGS_KEY ] = array(); + if ( ! isset( $labels[ self::KEY ] ) ) { + $labels[ self::KEY ] = array(); } foreach ( self::get_fields() as $section_slug => $section ) { foreach ( $section['fields'] as $field ) { - $labels[ self::SETTINGS_KEY ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; + $labels[ self::KEY ][ sprintf( '%s_%s', $section_slug, $field['name'] ) ] = $field['title']; } } From 52968128c0391bfd4a84948678e2b9b1668f6ea4 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 10 Apr 2014 22:49:31 -0500 Subject: [PATCH 068/123] Add 1 for network admin --- includes/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index 22667cd88..7349da67e 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -383,7 +383,8 @@ public static function stream_page() { echo '
    '; if ( is_network_admin() ) { - $site_count = sprintf( _n( '1 site', '%d sites', get_blog_count(), 'stream' ), get_blog_count() ); + $site_count = get_blog_count() + 1; // Add 1 to treat the Network Admin as a site + $site_count = sprintf( _n( '1 site', '%d sites', $site_count, 'stream' ), $site_count ); printf( '

    %s (%s)

    ', __( 'Stream Records', 'stream' ), $site_count ); // xss ok } else { printf( '

    %s

    ', __( 'Stream Records', 'stream' ) ); // xss ok From d089d8b3e6e3b3c14e48ba18a5a14e627f92429c Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 10 Apr 2014 23:48:05 -0500 Subject: [PATCH 069/123] Revert "Add 1 for network admin" This reverts commit 52968128c0391bfd4a84948678e2b9b1668f6ea4. --- includes/admin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index d73004d0e..c9e241ff1 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -392,8 +392,7 @@ public static function stream_page() { echo '
    '; if ( is_network_admin() ) { - $site_count = get_blog_count() + 1; // Add 1 to treat the Network Admin as a site - $site_count = sprintf( _n( '1 site', '%d sites', $site_count, 'stream' ), $site_count ); + $site_count = sprintf( _n( '1 site', '%d sites', get_blog_count(), 'stream' ), get_blog_count() ); printf( '

    %s (%s)

    ', __( 'Stream Records', 'stream' ), $site_count ); // xss ok } else { printf( '

    %s

    ', __( 'Stream Records', 'stream' ) ); // xss ok From 30682dde8fd636f5e523c84bab51095c5a0d1fd2 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 10 Apr 2014 23:59:07 -0500 Subject: [PATCH 070/123] Fix undefined key notice --- includes/list-table.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/list-table.php b/includes/list-table.php index b2b2de30c..e853acc2e 100644 --- a/includes/list-table.php +++ b/includes/list-table.php @@ -424,12 +424,14 @@ function assemble_records( $column, $table = '' ) { $setting_key = self::get_column_excluded_setting_key( $column ); + $exclude_hide_previous_records = isset( WP_Stream_Settings::$options['exclude_hide_previous_records'] ) ? WP_Stream_Settings::$options['exclude_hide_previous_records'] : 0; + /** * Toggle visibility of disabled connectors/actions/contexts on list table filter dropdown * * @param bool $hidden Visibility status, default is Hide Previous Record value set in Exclude setting. */ - $hide_disabled_column_filter = apply_filters( 'wp_stream_list_table_hide_disabled_ ' . $setting_key, ( WP_Stream_Settings::$options[ 'exclude_hide_previous_records' ] === 0 ) ? false : true ); + $hide_disabled_column_filter = apply_filters( 'wp_stream_list_table_hide_disabled_ ' . $setting_key, ( 0 === $exclude_hide_previous_records ) ? false : true ); if ( 'author' === $column ) { $all_records = array(); From b9ab2fdf3a6b427af38688c73391d874e0a67160 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 11 Apr 2014 00:02:10 -0500 Subject: [PATCH 071/123] Don't show descriptions unless in the network admin --- includes/network.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/network.php b/includes/network.php index 41382e767..98206db05 100644 --- a/includes/network.php +++ b/includes/network.php @@ -125,7 +125,12 @@ function settings_form_action( $action ) { * @return string */ function settings_form_description( $description ) { + if ( ! is_network_admin() ) { + return; + } + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + switch ( $current_page ) { case 'wp_stream_settings' : $description = __( 'These settings only apply to the Network Admin Stream.', 'stream' ); @@ -137,6 +142,7 @@ function settings_form_description( $description ) { $description = __( 'These default settings will apply to new sites created on the network. These settings do not alter existing sites.', 'stream' ); break; } + return $description; } From 2b3153490fcd82d3a995ac477f125f0da6e09c76 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 11 Apr 2014 00:15:53 -0500 Subject: [PATCH 072/123] Code formatting --- includes/network.php | 46 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/includes/network.php b/includes/network.php index 98206db05..c6c6e5027 100644 --- a/includes/network.php +++ b/includes/network.php @@ -63,10 +63,12 @@ function disable_admin_access( $disable_access ) { (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ), WP_Stream_Settings::get_defaults() ); + if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { return true; } } + return $disable_access; } @@ -78,27 +80,28 @@ function disable_admin_access( $disable_access ) { * @return array */ function admin_menu_screens() { - if ( is_network_admin() ) { + if ( ! is_network_admin() ) { + return; + } - WP_Stream_Admin::$screen_id['network_settings'] = add_submenu_page( + WP_Stream_Admin::$screen_id['network_settings'] = add_submenu_page( + WP_Stream_Admin::RECORDS_PAGE_SLUG, + __( 'Stream Network Settings', 'stream' ), + __( 'Network Settings', 'stream' ), + WP_Stream_Admin::SETTINGS_CAP, + 'wp_stream_network_settings', + array( 'WP_Stream_Admin', 'render_page' ) + ); + + if ( ! WP_Stream_Admin::$disable_access ) { + WP_Stream_Admin::$screen_id['default_settings'] = add_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, - __( 'Stream Network Settings', 'stream' ), - __( 'Network Settings', 'stream' ), + __( 'New Site Settings', 'stream' ), + __( 'Site Defaults', 'stream' ), WP_Stream_Admin::SETTINGS_CAP, - 'wp_stream_network_settings', + 'wp_stream_default_settings', array( 'WP_Stream_Admin', 'render_page' ) ); - - if ( ! WP_Stream_Admin::$disable_access ) { - WP_Stream_Admin::$screen_id['default_settings'] = add_submenu_page( - WP_Stream_Admin::RECORDS_PAGE_SLUG, - __( 'New Site Settings', 'stream' ), - __( 'Site Defaults', 'stream' ), - WP_Stream_Admin::SETTINGS_CAP, - 'wp_stream_default_settings', - array( 'WP_Stream_Admin', 'render_page' ) - ); - } } } @@ -112,8 +115,9 @@ function admin_menu_screens() { function settings_form_action( $action ) { if ( is_network_admin() ) { $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - $action = add_query_arg( array( 'action' => $current_page ), 'edit.php' ); + $action = add_query_arg( array( 'action' => $current_page ), 'edit.php' ); } + return $action; } @@ -162,6 +166,7 @@ function get_option_key( $option_key ) { if ( 'wp_stream_default_settings' === $current_page ) { $option_key = WP_Stream_Settings::DEFAULTS_KEY; } + if ( 'wp_stream_network_settings' === $current_page ) { $option_key = WP_Stream_Settings::NETWORK_KEY; } @@ -297,6 +302,7 @@ function get_fields( $fields ) { 'default' => 0, ); } + if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { foreach ( $fields['general']['fields'] as $key => $field ) { if ( 'private_feeds' === $field['name'] ) { @@ -330,6 +336,7 @@ function get_settings_translations( $labels ) { if ( ! isset( $labels[ $network_key ] ) ) { $labels[ $network_key ] = array(); } + if ( ! isset( $labels[ $defaults_key ] ) ) { $labels[ $defaults_key ] = array(); } @@ -463,6 +470,7 @@ function toggle_filters( $filters ) { if ( is_network_admin() ) { $filters['blog_id'] = esc_html__( 'Site', 'stream' ); } + return $filters; } @@ -491,6 +499,7 @@ function list_table_screen_id( $screen_id ) { $screen_id .= '-network'; } } + return $screen_id; } @@ -502,7 +511,7 @@ function list_table_screen_id( $screen_id ) { * @return mixed */ static function set_network_option_value( $args ) { - if ( isset( $args['blog_id'] ) && $args['blog_id'] === 'network' ) { + if ( isset( $args['blog_id'] ) && 'network' === $args['blog_id'] ) { $args['blog_id'] = 0; } @@ -526,6 +535,7 @@ function network_admin_columns( $columns ) { array_slice( $columns, -1 ) ); } + return $columns; } From ffd452950ae91c05c6ede6181e02d96e3b133733 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 11 Apr 2014 15:55:29 +1000 Subject: [PATCH 073/123] Change the Private Feeds desc in the Network Admin --- includes/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/network.php b/includes/network.php index c6c6e5027..7529fb2f8 100644 --- a/includes/network.php +++ b/includes/network.php @@ -307,7 +307,7 @@ function get_fields( $fields ) { foreach ( $fields['general']['fields'] as $key => $field ) { if ( 'private_feeds' === $field['name'] ) { $fields['general']['fields'][ $key ]['desc'] = sprintf( - __( 'Super Admins will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), + __( 'Add Network Admin actions to the %sPrivate Feeds%s of Super Admin users.', 'stream' ), sprintf( '', admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), From 86b0e34b9d43ad4e5a72034c060cdac9ec87a8d3 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 11 Apr 2014 16:06:40 +1000 Subject: [PATCH 074/123] Remove tabs when only one exists --- includes/admin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/admin.php b/includes/admin.php index c9e241ff1..16a8b2b63 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -345,6 +345,7 @@ public static function render_page() { + 1 ) : ?>

    $data ) : ?> @@ -355,6 +356,7 @@ public static function render_page() {

    +
    From 5dd02a9dd00230c1df81b0600e39fe41aa8887e8 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 11 Apr 2014 12:17:27 -0500 Subject: [PATCH 075/123] Updating field description for network admin private feeds --- includes/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/network.php b/includes/network.php index 7529fb2f8..e06fb8ffc 100644 --- a/includes/network.php +++ b/includes/network.php @@ -307,7 +307,7 @@ function get_fields( $fields ) { foreach ( $fields['general']['fields'] as $key => $field ) { if ( 'private_feeds' === $field['name'] ) { $fields['general']['fields'][ $key ]['desc'] = sprintf( - __( 'Add Network Admin actions to the %sPrivate Feeds%s of Super Admin users.', 'stream' ), + __( 'Allows Super Admins to see actvity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), sprintf( '', admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), From 83e3c4324279124649a184227b275af8cfab4200 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 11 Apr 2014 14:02:39 -0500 Subject: [PATCH 076/123] Changes to dashboard widget when viewed in Network Admin --- includes/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 3ed993ead..5bd2afaed 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -611,7 +611,7 @@ public static function dashboard_stream_activity() { wp_add_dashboard_widget( 'dashboard_stream_activity', - esc_html__( 'Stream Activity', 'stream' ), + is_network_admin() ? esc_html__( 'Network Stream Activity', 'stream' ) : esc_html__( 'Stream Activity', 'stream' ), array( __CLASS__, 'dashboard_stream_activity_initial_contents' ), array( __CLASS__, 'dashboard_stream_activity_options' ) ); @@ -688,7 +688,7 @@ public static function dashboard_pagination( $args = array() ) { $records_link = add_query_arg( array( 'page' => self::RECORDS_PAGE_SLUG ), - admin_url( self::ADMIN_PARENT_PAGE ) + is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $html_view_all = sprintf( From e734f037b8eeedf568dc7c4421790ee73a9da1a3 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Mon, 14 Apr 2014 08:04:31 +1000 Subject: [PATCH 077/123] Remove settings from New Site Settings screen --- includes/network.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/includes/network.php b/includes/network.php index e06fb8ffc..121653d3f 100644 --- a/includes/network.php +++ b/includes/network.php @@ -193,7 +193,7 @@ function get_fields( $fields ) { $option_key = WP_Stream_Settings::get_option_key(); $stream_hidden_options = apply_filters( - 'wp_stream_network_only_option_fields', + 'wp_stream_hidden_option_fields', array( 'general' => array( 'delete_all_records', @@ -203,7 +203,7 @@ function get_fields( $fields ) { ); $network_stream_hidden_options = apply_filters( - 'wp_stream_network_only_option_fields', + 'wp_stream_network_stream_option_fields', array( 'general' => array( 'delete_all_records', @@ -222,7 +222,7 @@ function get_fields( $fields ) { ); $network_hidden_options = apply_filters( - 'wp_stream_site_only_option_fields', + 'wp_stream_network_option_fields', array( 'general' => array( 'role_access', @@ -240,8 +240,13 @@ function get_fields( $fields ) { ); $defaults_hidden_options = apply_filters( - 'wp_stream_site_only_option_fields', - array() + 'wp_stream_defaults_option_fields', + array( + 'general' => array( + 'delete_all_records', + 'records_ttl', + ), + ) ); // Remove settings based on context From 0e85746adfbe425982564141f171cd107229fcf4 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 21:32:34 +1000 Subject: [PATCH 078/123] Nicer way of editing the private feeds setting --- includes/network.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/includes/network.php b/includes/network.php index 121653d3f..2a28e0668 100644 --- a/includes/network.php +++ b/includes/network.php @@ -209,6 +209,7 @@ function get_fields( $fields ) { 'delete_all_records', 'records_ttl', 'role_access', + 'private_feeds', ), 'exclude' => array( 'authors_and_roles', @@ -309,20 +310,24 @@ function get_fields( $fields ) { } if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { - foreach ( $fields['general']['fields'] as $key => $field ) { - if ( 'private_feeds' === $field['name'] ) { - $fields['general']['fields'][ $key ]['desc'] = sprintf( - __( 'Allows Super Admins to see actvity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), - sprintf( - '', - admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), - esc_attr__( 'View Profile', 'stream' ) - ), - '' - ); - break; - } - } + $new_fields['general']['fields'][] = array( + 'name' => 'network_actions_in_private_feeds', + 'title' => __( 'Network Admin in Feeds', 'stream' ), + 'after_field' => __( 'Enabled' ), + 'default' => 1, + 'desc' => sprintf( + __( 'Allows Super Admins to see activity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), + sprintf( + '', + admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), + esc_attr__( 'View Profile', 'stream' ) + ), + '' + ), + 'type' => 'checkbox', + ); + + $fields = array_merge_recursive( $new_fields, $fields ); } return $fields; From e29e7d85b4424fd43380e43677dadc66225ca864 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:03:15 +1000 Subject: [PATCH 079/123] Adds feed support on multisite --- includes/feeds.php | 52 +++++++++++++++++++++++++++++++++++++++------- includes/query.php | 12 +++++++++-- 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index 109a87a9c..b681722f2 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -5,14 +5,30 @@ class WP_Stream_Feeds { const FEED_QUERY_VAR = 'stream'; + const FEED_NETWORK_QUERY_VAR = 'network-stream'; const FEED_KEY_QUERY_VAR = 'key'; const FEED_TYPE_QUERY_VAR = 'type'; const USER_FEED_KEY = 'stream_user_feed_key'; const GENERATE_KEY_QUERY_VAR = 'stream_new_user_feed_key'; + public static $is_network_feed = false; + public static function load() { - if ( ! isset( WP_Stream_Settings::$options['general_private_feeds'] ) || ! WP_Stream_Settings::$options['general_private_feeds'] ) { - return; + if ( is_network_admin() ) { + self::$is_network_feed = true; + } + + if ( ! is_admin() ) { + $feed_path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ); + if ( self::FEED_NETWORK_QUERY_VAR === basename( $feed_path ) ) { + self::$is_network_feed = true; + } + } + + if ( ! self::$is_network_feed ) { + if ( ! isset( WP_Stream_Settings::$options['general_private_feeds'] ) || ! WP_Stream_Settings::$options['general_private_feeds'] ) { + return; + } } add_action( 'show_user_profile', array( __CLASS__, 'save_user_feed_key' ) ); @@ -22,6 +38,7 @@ public static function load() { add_action( 'edit_user_profile', array( __CLASS__, 'user_feed_key' ) ); add_feed( self::FEED_QUERY_VAR, array( __CLASS__, 'feed_template' ) ); + add_feed( self::FEED_NETWORK_QUERY_VAR, array( __CLASS__, 'feed_template' ) ); } /** @@ -56,14 +73,19 @@ public static function user_feed_key( $user ) { return; } + if ( is_network_admin() && ! is_super_admin( $user->ID ) ) { + return; + } + $key = get_user_meta( $user->ID, self::USER_FEED_KEY, true ); + $query_var = is_network_admin() ? self::FEED_NETWORK_QUERY_VAR : self::FEED_QUERY_VAR; $pretty_permalinks = get_option( 'permalink_structure' ); if ( empty( $pretty_permalinks ) ) { $link = add_query_arg( array( - 'feed' => self::FEED_QUERY_VAR, + 'feed' => $query_var, self::FEED_KEY_QUERY_VAR => $key, ), home_url( '/' ) @@ -76,7 +98,7 @@ public static function user_feed_key( $user ) { home_url( sprintf( '/feed/%s/', - self::FEED_QUERY_VAR + $query_var ) ) ); @@ -117,6 +139,19 @@ public static function feed_template() { wp_die( $die_message, $die_title ); } + $blog_id = self::$is_network_feed ? null : get_current_blog_id(); + + if ( self::$is_network_feed ) { + $network_settings = (array) get_site_option( WP_Stream_Settings::KEY, array() ); + if ( isset( $network_settings['general_network_actions_in_private_feeds'] ) && ! $network_settings['general_network_actions_in_private_feeds'] ) { + $blog_id = array(); + $blogs = wp_get_sites(); + foreach ( $blogs as $blog ) { + $blog_id[] = $blog['blog_id']; + } + } + } + $args = array( 'meta_key' => self::USER_FEED_KEY, 'meta_value' => $_GET[self::FEED_KEY_QUERY_VAR], @@ -124,10 +159,12 @@ public static function feed_template() { ); $user = get_users( $args ); - $roles = isset( $user[0]->roles ) ? (array) $user[0]->roles : array(); + if ( ! is_super_admin( $user[0]->ID ) ) { + $roles = isset( $user[0]->roles ) ? (array) $user[0]->roles : array(); - if ( ! $roles || ! array_intersect( $roles, WP_Stream_Settings::$options['general_role_access'] ) ) { - wp_die( $die_message, $die_title ); + if ( ! $roles || ! array_intersect( $roles, WP_Stream_Settings::$options['general_role_access'] ) ) { + wp_die( $die_message, $die_title ); + } } $args = array( @@ -135,6 +172,7 @@ public static function feed_template() { 'search' => isset( $_GET['search'] ) ? (string) $_GET['search'] : null, 'object_id' => isset( $_GET['object_id'] ) ? (int) $_GET['object_id'] : null, 'ip' => isset( $_GET['ip'] ) ? (string) $_GET['ip'] : null, + 'blog_id' => $blog_id, 'author' => isset( $_GET['author'] ) ? (int) $_GET['author'] : null, 'date' => isset( $_GET['date'] ) ? (string) $_GET['date'] : null, 'date_from' => isset( $_GET['date_from'] ) ? (string) $_GET['date_from'] : null, diff --git a/includes/query.php b/includes/query.php index 3d3372053..361f22603 100644 --- a/includes/query.php +++ b/includes/query.php @@ -109,11 +109,19 @@ public function query( $args ) { } if ( $args['site_id'] ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); + if ( is_array( $args['site_id'] ) ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.site_id IN (%d)", implode( ',', $args['site_id'] ) ); + } else { + $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); + } } if ( $args['blog_id'] ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); + if ( is_array( $args['blog_id'] ) ) { + $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id IN (%d)", implode( ',', $args['blog_id'] ) ); + } else { + $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); + } } if ( $args['search'] ) { From 8dc371a767f1edf4883eb48f954ffe72580a7390 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:05:43 +1000 Subject: [PATCH 080/123] Better name for "Network Admin in Feeds" setting --- includes/feeds.php | 2 +- includes/network.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index b681722f2..1f8237537 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -143,7 +143,7 @@ public static function feed_template() { if ( self::$is_network_feed ) { $network_settings = (array) get_site_option( WP_Stream_Settings::KEY, array() ); - if ( isset( $network_settings['general_network_actions_in_private_feeds'] ) && ! $network_settings['general_network_actions_in_private_feeds'] ) { + if ( isset( $network_settings['general_private_feeds_network_admin'] ) && ! $network_settings['general_private_feeds_network_admin'] ) { $blog_id = array(); $blogs = wp_get_sites(); foreach ( $blogs as $blog ) { diff --git a/includes/network.php b/includes/network.php index 2a28e0668..5bd66788a 100644 --- a/includes/network.php +++ b/includes/network.php @@ -311,7 +311,7 @@ function get_fields( $fields ) { if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { $new_fields['general']['fields'][] = array( - 'name' => 'network_actions_in_private_feeds', + 'name' => 'private_feeds_network_admin', 'title' => __( 'Network Admin in Feeds', 'stream' ), 'after_field' => __( 'Enabled' ), 'default' => 1, From 8a65b20443f8b10d5c5a829d5e30d919d6e0015e Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:16:38 +1000 Subject: [PATCH 081/123] Patch vulnerability This allowed regular users to access the network stream --- includes/feeds.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/feeds.php b/includes/feeds.php index 1f8237537..f362e27a7 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -162,6 +162,10 @@ public static function feed_template() { if ( ! is_super_admin( $user[0]->ID ) ) { $roles = isset( $user[0]->roles ) ? (array) $user[0]->roles : array(); + if ( self::$is_network_feed ) { + wp_die( $die_message, $die_title ); + } + if ( ! $roles || ! array_intersect( $roles, WP_Stream_Settings::$options['general_role_access'] ) ) { wp_die( $die_message, $die_title ); } From 2e8155a46e9d0f20234a4be8e91c00376d381d08 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:19:54 +1000 Subject: [PATCH 082/123] Moving the furniture around --- includes/feeds.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index f362e27a7..f4aafad2a 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -139,19 +139,6 @@ public static function feed_template() { wp_die( $die_message, $die_title ); } - $blog_id = self::$is_network_feed ? null : get_current_blog_id(); - - if ( self::$is_network_feed ) { - $network_settings = (array) get_site_option( WP_Stream_Settings::KEY, array() ); - if ( isset( $network_settings['general_private_feeds_network_admin'] ) && ! $network_settings['general_private_feeds_network_admin'] ) { - $blog_id = array(); - $blogs = wp_get_sites(); - foreach ( $blogs as $blog ) { - $blog_id[] = $blog['blog_id']; - } - } - } - $args = array( 'meta_key' => self::USER_FEED_KEY, 'meta_value' => $_GET[self::FEED_KEY_QUERY_VAR], @@ -171,6 +158,19 @@ public static function feed_template() { } } + $blog_id = self::$is_network_feed ? null : get_current_blog_id(); + + if ( self::$is_network_feed ) { + $network_settings = (array) get_site_option( WP_Stream_Settings::KEY, array() ); + if ( isset( $network_settings['general_private_feeds_network_admin'] ) && ! $network_settings['general_private_feeds_network_admin'] ) { + $blog_id = array(); + $blogs = wp_get_sites(); + foreach ( $blogs as $blog ) { + $blog_id[] = $blog['blog_id']; + } + } + } + $args = array( 'records_per_page' => isset( $_GET['records_per_page'] ) ? (int) $_GET['records_per_page'] : get_option( 'posts_per_rss' ), 'search' => isset( $_GET['search'] ) ? (string) $_GET['search'] : null, From 50366d0e97ef7a76a70d421873a5983c81ee3e08 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:23:57 +1000 Subject: [PATCH 083/123] Workaround for phpcs check --- includes/network.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/includes/network.php b/includes/network.php index 5bd66788a..38155d743 100644 --- a/includes/network.php +++ b/includes/network.php @@ -310,20 +310,22 @@ function get_fields( $fields ) { } if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { + $private_feeds_network_admin_desc = sprintf( + __( 'Allows Super Admins to see activity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), + sprintf( + '', + admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), + esc_attr__( 'View Profile', 'stream' ) + ), + '' + ); + $new_fields['general']['fields'][] = array( 'name' => 'private_feeds_network_admin', 'title' => __( 'Network Admin in Feeds', 'stream' ), 'after_field' => __( 'Enabled' ), 'default' => 1, - 'desc' => sprintf( - __( 'Allows Super Admins to see activity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), - sprintf( - '', - admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), - esc_attr__( 'View Profile', 'stream' ) - ), - '' - ), + 'desc' => $private_feeds_network_admin_desc, 'type' => 'checkbox', ); From d15672f1eef4c2a8cdf5548b3083322017007292 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Tue, 15 Apr 2014 23:46:48 +1000 Subject: [PATCH 084/123] Replace deprecated filter --- includes/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/network.php b/includes/network.php index 38155d743..d85dca158 100644 --- a/includes/network.php +++ b/includes/network.php @@ -34,7 +34,7 @@ function filters() { add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); add_filter( 'wp_stream_db_tables_prefix', array( $this, 'db_tables_prefix' ) ); add_filter( 'wp_stream_list_table_screen_id', array( $this, 'list_table_screen_id' ) ); - add_filter( 'stream_query_args', array( $this, 'set_network_option_value' ) ); + add_filter( 'wp_stream_query_args', array( $this, 'set_network_option_value' ) ); add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); } From b2a30c379a89b4fb33fe81e79e21dd04232d8f99 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 00:37:05 +1000 Subject: [PATCH 085/123] Fix live updates for all blogs in network admin --- includes/live-update.php | 2 +- includes/network.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/includes/live-update.php b/includes/live-update.php index 91c615184..3aa3ddbb3 100644 --- a/includes/live-update.php +++ b/includes/live-update.php @@ -103,7 +103,7 @@ public static function heartbeat_received( $response, $data ) { // Register list table require_once WP_STREAM_INC_DIR . 'list-table.php'; - self::$list_table = new WP_Stream_List_Table( array( 'screen' => WP_Stream_Admin::RECORDS_PAGE_SLUG ) ); + self::$list_table = new WP_Stream_List_Table( array( 'screen' => 'toplevel_page_' . WP_Stream_Admin::RECORDS_PAGE_SLUG ) ); self::$list_table->prepare_items(); extract( self::$list_table->_pagination_args, EXTR_SKIP ); diff --git a/includes/network.php b/includes/network.php index 1fae20346..3d4393aa2 100644 --- a/includes/network.php +++ b/includes/network.php @@ -15,6 +15,7 @@ function __construct() { } function actions() { + add_action( 'init', array( $this, 'ajax_network_admin' ), 1 ); add_action( 'network_admin_menu', array( 'WP_Stream_Admin', 'register_menu' ) ); add_action( 'network_admin_notices', array( 'WP_Stream_Admin', 'admin_notices' ) ); add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); @@ -38,6 +39,16 @@ function filters() { add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); } + /** + * Workaround to get admin-ajax.php to know when the request is from the network admin + * See https://core.trac.wordpress.org/ticket/22589 + */ + function ajax_network_admin() { + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && is_multisite() && preg_match( '#^' . network_admin_url() . '#i', $_SERVER['HTTP_REFERER'] ) ) { + define( 'WP_NETWORK_ADMIN', true ); + } + } + /** * Builds a stdClass object used when displaying actions done in network administration * @return stdClass From f88816db8d35ff8a5cfbec915693efa01159131a Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 08:35:33 +1000 Subject: [PATCH 086/123] Fix ttl purge and enable for network --- includes/admin.php | 2 +- includes/network.php | 15 +++++++++++++++ stream.php | 12 ++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 4a0aa7943..68a2f12f1 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -65,7 +65,7 @@ public static function load() { add_action( 'wp_ajax_wp_stream_uninstall', array( __CLASS__, 'uninstall_plugin' ) ); // Auto purge setup - add_action( 'wp', array( __CLASS__, 'purge_schedule_setup' ) ); + add_action( 'wp_loaded', array( __CLASS__, 'purge_schedule_setup' ) ); add_action( 'wp_stream_auto_purge', array( __CLASS__, 'purge_scheduled_action' ) ); // Admin notices diff --git a/includes/network.php b/includes/network.php index 3d4393aa2..fc2b244cc 100644 --- a/includes/network.php +++ b/includes/network.php @@ -21,6 +21,7 @@ function actions() { add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); add_action( 'wp_network_dashboard_setup', array( 'WP_Stream_Dashboard_Widget', 'stream_activity' ) ); add_action( 'wp_stream_admin_menu_screens', array( $this, 'admin_menu_screens' ) ); + add_action( 'update_site_option_' . WP_Stream_Settings::NETWORK_KEY, array( $this, 'updated_option_ttl_remove_records' ), 10, 3 ); } function filters() { @@ -116,6 +117,20 @@ function admin_menu_screens() { } } + /** + * Remove records when records TTL is shortened + * + * @param string $option_key + * @param array $old_value + * @param array $new_value + * + * @action update_option_wp_stream + * @return void + */ + function updated_option_ttl_remove_records( $option_key, $new_value, $old_value ) { + WP_Stream_Settings::updated_option_ttl_remove_records( $old_value, $new_value ); + } + /** * Adjust the action of the settings form when in the Network Admin * diff --git a/stream.php b/stream.php index 78b2317b5..5ebc1b8b1 100644 --- a/stream.php +++ b/stream.php @@ -71,12 +71,6 @@ private function __construct() { define( 'WP_STREAM_URL', plugin_dir_url( __FILE__ ) ); define( 'WP_STREAM_INC_DIR', WP_STREAM_DIR . 'includes/' ); - // Load network class - if ( is_multisite() ) { - require_once WP_STREAM_INC_DIR . 'network.php'; - $this->network = new WP_Stream_Network; - } - // Load filters polyfill require_once WP_STREAM_INC_DIR . 'filter-input.php'; @@ -98,6 +92,12 @@ private function __construct() { require_once WP_STREAM_INC_DIR . 'settings.php'; add_action( 'init', array( 'WP_Stream_Settings', 'load' ) ); + // Load network class + if ( is_multisite() ) { + require_once WP_STREAM_INC_DIR . 'network.php'; + $this->network = new WP_Stream_Network; + } + // Load logger class require_once WP_STREAM_INC_DIR . 'log.php'; add_action( 'plugins_loaded', array( 'WP_Stream_Log', 'load' ) ); From d04e706e7529bfb492bbf5e0053d1e78de4a96f4 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 09:05:16 +1000 Subject: [PATCH 087/123] Better uninstall for multisite --- includes/admin.php | 10 ++++++++-- includes/feeds.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 68a2f12f1..09197cd57 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -285,6 +285,12 @@ public static function admin_menu_css() { */ public static function plugin_action_links( $links, $file ) { if ( plugin_basename( WP_STREAM_DIR . 'stream.php' ) === $file ) { + + // Don't show links in Network Admin if Stream isn't network enabled + if ( is_network_admin() && is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + return $links; + } + $admin_page_url = add_query_arg( array( 'page' => self::SETTINGS_PAGE_SLUG ), is_network_admin() ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) ); $links[] = sprintf( '%s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'stream' ) ); @@ -482,12 +488,12 @@ public static function uninstall_plugin() { // Delete database option delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); delete_site_option( WP_Stream_Settings::KEY ); - delete_site_option( WP_Stream_Settings::DEFAULT_KEY ); + delete_site_option( WP_Stream_Settings::DEFAULTS_KEY ); delete_site_option( WP_Stream_Settings::NETWORK_KEY ); delete_site_option( 'dashboard_stream_activity_options' ); // Redirect to plugin page - wp_redirect( add_query_arg( array( 'deactivate' => true ), admin_url( 'plugins.php' ) ) ); + wp_redirect( add_query_arg( array( 'deactivate' => true ), is_network_admin() ? network_admin_url( 'plugins.php' ) : admin_url( 'plugins.php' ) ) ); exit; } else { wp_die( "You don't have sufficient privileges to do this action." ); diff --git a/includes/feeds.php b/includes/feeds.php index ba45bdbb3..3363021bb 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -69,7 +69,7 @@ public static function save_user_feed_key( $user ) { * @return string */ public static function user_feed_key( $user ) { - if ( ! array_intersect( $user->roles, WP_Stream_Settings::$options['general_role_access'] ) ) { + if ( ! is_network_admin() && ! array_intersect( $user->roles, WP_Stream_Settings::$options['general_role_access'] ) ) { return; } From f679d08440dcab5c5b79dfd4ff19b583dce4bbee Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 09:22:18 +1000 Subject: [PATCH 088/123] Better uninstall --- includes/admin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index 09197cd57..4b5af891c 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -485,7 +485,17 @@ public static function uninstall_plugin() { $wpdb->query( "DROP TABLE $table" ); } - // Delete database option + // Delete database options + if ( is_multisite() ) { + $blogs = get_blog_list(); + foreach ( $blogs as $blog ) { + switch_to_blog( $blog->ID ); + delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + delete_option( WP_Stream_Settings::KEY ); + } + restore_current_blog(); + } + delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); delete_site_option( WP_Stream_Settings::KEY ); delete_site_option( WP_Stream_Settings::DEFAULTS_KEY ); From fbccdb50493d909d3a2d09f8b105263dc47b0f0d Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 09:22:42 +1000 Subject: [PATCH 089/123] Revert ttl fix (will open a separate issue) --- includes/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin.php b/includes/admin.php index 4b5af891c..608a6c0de 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -65,7 +65,7 @@ public static function load() { add_action( 'wp_ajax_wp_stream_uninstall', array( __CLASS__, 'uninstall_plugin' ) ); // Auto purge setup - add_action( 'wp_loaded', array( __CLASS__, 'purge_schedule_setup' ) ); + add_action( 'wp', array( __CLASS__, 'purge_schedule_setup' ) ); add_action( 'wp_stream_auto_purge', array( __CLASS__, 'purge_scheduled_action' ) ); // Admin notices From 3e9d64b62d2cf36c6e6554f49914c981cdd1fcf4 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 09:49:33 +1000 Subject: [PATCH 090/123] Fix network feed not showing after #410 merge --- includes/feeds.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/feeds.php b/includes/feeds.php index 3363021bb..2b78c448e 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -172,6 +172,7 @@ public static function feed_template() { } $args = array( + 'blog_id' => $blog_id, 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_option( 'posts_per_rss' ) ) ) ), 'search' => wp_stream_filter_input( INPUT_GET, 'search' ), 'object_id' => wp_stream_filter_input( INPUT_GET, 'object_id', FILTER_SANITIZE_NUMBER_INT ), From 7cc0bd0ecb9dab47b8f6ca4c258e0cb2c3808e7f Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 10:17:43 +1000 Subject: [PATCH 091/123] Fix database reset --- includes/admin.php | 9 +++++++-- includes/db.php | 2 +- includes/network.php | 13 ------------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 608a6c0de..7b7fcdbcc 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -400,7 +400,7 @@ public static function wp_ajax_reset() { wp_redirect( add_query_arg( array( - 'page' => 'wp_stream_settings', + 'page' => is_network_admin() ? 'wp_stream_network_settings' : 'wp_stream_settings', 'message' => 'data_erased', ), is_plugin_active_for_network( WP_STREAM_PLUGIN ) ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) @@ -415,6 +415,11 @@ public static function wp_ajax_reset() { private static function erase_stream_records() { global $wpdb; + $where = ''; + if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $where .= $wpdb->prepare( " AND `blog_id` = %d", get_current_blog_id() ); + } + $wpdb->query( $wpdb->prepare( "DELETE `stream`, `context`, `meta` @@ -423,7 +428,7 @@ private static function erase_stream_records() { ON `context`.`record_id` = `stream`.`ID` LEFT JOIN {$wpdb->streammeta} AS `meta` ON `meta`.`record_id` = `stream`.`ID` - WHERE `stream`.`type` = %s;", + WHERE `stream`.`type` = %s" . $where, 'stream' ) ); diff --git a/includes/db.php b/includes/db.php index 38cc1c16b..862c93af7 100644 --- a/includes/db.php +++ b/includes/db.php @@ -19,7 +19,7 @@ public function __construct() { * @param string database prefix * @return string udpated database prefix */ - $prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->prefix ); + $prefix = apply_filters( 'wp_stream_db_tables_prefix', $wpdb->base_prefix ); self::$table = $prefix . 'stream'; self::$table_meta = $prefix . 'stream_meta'; diff --git a/includes/network.php b/includes/network.php index fc2b244cc..d460702aa 100644 --- a/includes/network.php +++ b/includes/network.php @@ -34,7 +34,6 @@ function filters() { add_filter( 'wp_stream_serialized_labels', array( $this, 'get_settings_translations' ) ); add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); - add_filter( 'wp_stream_db_tables_prefix', array( $this, 'db_tables_prefix' ) ); add_filter( 'wp_stream_list_table_screen_id', array( $this, 'list_table_screen_id' ) ); add_filter( 'wp_stream_query_args', array( $this, 'set_network_option_value' ) ); add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); @@ -512,18 +511,6 @@ function toggle_filters( $filters ) { return $filters; } - /** - * Use a single primary database table for multisite installs - * - * @param $prefix - * - * @return string - */ - function db_tables_prefix( $prefix ) { - global $wpdb; - return $wpdb->base_prefix; - } - /** * Add the network suffix to the $screen_id when in the network admin * From c3756eae59e676c8d2704aad22babf2b6c06a49d Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 11:57:42 +1000 Subject: [PATCH 092/123] Tidy up --- includes/settings.php | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/includes/settings.php b/includes/settings.php index 1f59be15e..647fb9d45 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -36,30 +36,6 @@ class WP_Stream_Settings { */ public static $fields = array(); - public static function get_options() { - - $option_key = self::get_option_key(); - - if ( self::DEFAULTS_KEY === $option_key ) { - return self::get_defaults(); - } - - /** - * Filter allows for modification of options - * - * @param array array of options - * @return array updated array of options - */ - return apply_filters( - 'wp_stream_options', - wp_parse_args( - (array) get_option( self::KEY, array() ), - self::get_defaults() - ), - $option_key - ); - } - /** * Public constructor * @@ -348,6 +324,36 @@ public static function get_fields() { return self::$fields; } + /** + * Returns a list of options based on the current screen. + * + * @return array Options + */ + public static function get_options() { + + $option_key = self::get_option_key(); + $defaults = self::get_defaults(); + + if ( self::DEFAULTS_KEY === $option_key ) { + return $defaults; + } + + /** + * Filter allows for modification of options + * + * @param array array of options + * @return array updated array of options + */ + return apply_filters( + 'wp_stream_options', + wp_parse_args( + (array) get_option( self::KEY, array() ), + $defaults + ), + $option_key + ); + } + /** * Iterate through registered fields and extract default values * @@ -384,7 +390,7 @@ public static function get_defaults() { /** * Returns the correct option key based on the current screen. * - * @return array Default option values + * @return string Option key */ public static function get_option_key() { return apply_filters( 'wp_stream_settings_option_key', WP_Stream_Settings::KEY ); From 7df518768b77938d817e0270380f5bc18b3c53ce Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 12:58:19 +1000 Subject: [PATCH 093/123] Rethinking settings for multisite --- includes/admin.php | 25 +++- includes/network.php | 48 ++----- includes/settings.php | 296 +++++++++++++++++++++++------------------- ui/admin.js | 2 +- 4 files changed, 192 insertions(+), 179 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 7b7fcdbcc..7e5d420b1 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -67,6 +67,7 @@ public static function load() { // Auto purge setup add_action( 'wp', array( __CLASS__, 'purge_schedule_setup' ) ); add_action( 'wp_stream_auto_purge', array( __CLASS__, 'purge_scheduled_action' ) ); + add_action( 'init', array( __CLASS__, 'purge_scheduled_action' ) ); // Admin notices add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); @@ -314,7 +315,7 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $option_key = WP_Stream_Settings::get_option_key(); + $option_key = WP_Stream_Settings::$screen_key; $form_action = apply_filters( 'wp_stream_settings_form_action', admin_url( 'options.php' ) ); $page_title = apply_filters( 'wp_stream_settings_form_title', get_admin_page_title() ); @@ -428,7 +429,8 @@ private static function erase_stream_records() { ON `context`.`record_id` = `stream`.`ID` LEFT JOIN {$wpdb->streammeta} AS `meta` ON `meta`.`record_id` = `stream`.`ID` - WHERE `stream`.`type` = %s" . $where, + WHERE `stream`.`type` = %s + $where;", 'stream' ) ); @@ -525,12 +527,23 @@ public static function purge_schedule_setup() { public static function purge_scheduled_action() { global $wpdb; - $options = WP_Stream_Settings::get_options(); - $days = $options['general_records_ttl']; - $date = new DateTime( 'now', $timezone = new DateTimeZone( 'UTC' ) ); + if ( is_multisite() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $options = WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ); + } else { + $options = WP_Stream_Settings::get_options(); + } + + $days = $options['general_records_ttl']; + $date = new DateTime( 'now', $timezone = new DateTimeZone( 'UTC' ) ); $date->sub( DateInterval::createFromDateString( "$days days" ) ); + $where = $wpdb->prepare( " AND `stream`.`created` < %s", $date->format( 'Y-m-d H:i:s' ) ); + + if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $where .= $wpdb->prepare( " AND `blog_id` = %d", get_current_blog_id() ); + } + $wpdb->query( $wpdb->prepare( "DELETE `stream`, `context`, `meta` @@ -540,7 +553,7 @@ public static function purge_scheduled_action() { LEFT JOIN {$wpdb->streammeta} AS `meta` ON `meta`.`record_id` = `stream`.`ID` WHERE `stream`.`type` = %s - AND `stream`.`created` < %s;", + $where;", 'stream', $date->format( 'Y-m-d H:i:s' ) ) diff --git a/includes/network.php b/includes/network.php index d460702aa..840e3a26b 100644 --- a/includes/network.php +++ b/includes/network.php @@ -28,8 +28,7 @@ function filters() { add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_settings_form_description', array( $this, 'settings_form_description' ) ); - add_filter( 'wp_stream_settings_option_key', array( $this, 'get_option_key' ) ); - add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); + add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ), 10, 2 ); add_filter( 'wp_stream_options', array( $this, 'get_network_options' ), 10, 2 ); add_filter( 'wp_stream_serialized_labels', array( $this, 'get_settings_translations' ) ); add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); @@ -70,10 +69,7 @@ public static function get_network_blog() { */ function disable_admin_access( $disable_access ) { if ( ! is_network_admin() ) { - $settings = wp_parse_args( - (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ), - WP_Stream_Settings::get_defaults() - ); + $settings = WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ); if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { return true; @@ -175,30 +171,6 @@ function settings_form_description( $description ) { return $description; } - /** - * Changes the option key depending on which settings page is being viewed - * - * @param $fields - * - * @return mixed - */ - function get_option_key( $option_key ) { - $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); - if ( ! $current_page ) { - $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); - } - - if ( 'wp_stream_default_settings' === $current_page ) { - $option_key = WP_Stream_Settings::DEFAULTS_KEY; - } - - if ( 'wp_stream_network_settings' === $current_page ) { - $option_key = WP_Stream_Settings::NETWORK_KEY; - } - - return $option_key; - } - /** * Adds a network settings field to stream options in network admin * @@ -206,7 +178,7 @@ function get_option_key( $option_key ) { * * @return mixed */ - function get_fields( $fields ) { + function get_fields( $fields, $option_key ) { if ( ! function_exists( 'is_plugin_active_for_network' ) ) { require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); } @@ -215,8 +187,6 @@ function get_fields( $fields ) { return $fields; } - $option_key = WP_Stream_Settings::get_option_key(); - $stream_hidden_options = apply_filters( 'wp_stream_hidden_option_fields', array( @@ -276,12 +246,12 @@ function get_fields( $fields ) { ); // Remove settings based on context - if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { - $hidden_options = $network_stream_hidden_options; - } elseif ( WP_Stream_Settings::NETWORK_KEY === $option_key && is_network_admin() ) { + if ( WP_Stream_Settings::NETWORK_KEY === $option_key ) { $hidden_options = $network_hidden_options; - } elseif ( WP_Stream_Settings::DEFAULTS_KEY === $option_key && is_network_admin() ) { + } elseif ( WP_Stream_Settings::DEFAULTS_KEY === $option_key ) { $hidden_options = $defaults_hidden_options; + } elseif ( is_network_admin() ) { + $hidden_options = $network_stream_hidden_options; } else { $hidden_options = $stream_hidden_options; } @@ -304,7 +274,7 @@ function get_fields( $fields ) { } // Add and change settings, based on context - if ( WP_Stream_Settings::NETWORK_KEY === $option_key && is_network_admin() ) { + if ( WP_Stream_Settings::NETWORK_KEY === $option_key ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', 'title' => __( 'Enable Site Access', 'stream' ), @@ -451,7 +421,7 @@ function get_network_options( $options, $option_key ) { if ( is_network_admin() ) { $options = wp_parse_args( (array) get_site_option( $option_key, array() ), - WP_Stream_Settings::get_defaults() + WP_Stream_Settings::get_defaults( $option_key ) ); } diff --git a/includes/settings.php b/includes/settings.php index 647fb9d45..28602f4a9 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -29,6 +29,13 @@ class WP_Stream_Settings { */ public static $options = array(); + /** + * Option key for current screen + * + * @var array + */ + public static $screen_key = ''; + /** * Settings fields * @@ -43,7 +50,8 @@ class WP_Stream_Settings { */ public static function load() { - self::$options = self::get_options(); + self::$screen_key = self::get_option_key(); + self::$options = self::get_options(); // Register settings, and fields add_action( 'admin_init', array( __CLASS__, 'register_settings' ) ); @@ -192,136 +200,161 @@ public static function add_display_name_search_columns( $search_columns, $search return $search_columns; } + /** + * Returns the option key depending on which settings page is being viewed + * + * @return string Option key for this page + */ + public static function get_option_key() { + $option_key = self::KEY; + + $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); + if ( ! $current_page ) { + $current_page = wp_stream_filter_input( INPUT_GET, 'action' ); + } + + if ( 'wp_stream_default_settings' === $current_page ) { + $option_key = self::DEFAULTS_KEY; + } + + if ( 'wp_stream_network_settings' === $current_page ) { + $option_key = self::NETWORK_KEY; + } + + return apply_filters( 'wp_stream_settings_option_key', $option_key ); + } /** * Return settings fields * * @return array Multidimensional array of fields */ - public static function get_fields() { - if ( empty( self::$fields ) ) { - $fields = array( - 'general' => array( - 'title' => __( 'General', 'stream' ), - 'fields' => array( - array( - 'name' => 'role_access', - 'title' => __( 'Role Access', 'stream' ), - 'type' => 'multi_checkbox', - 'desc' => __( 'Users from the selected roles above will have permission to view Stream Records. However, only site Administrators can access Stream Settings.', 'stream' ), - 'choices' => self::get_roles(), - 'default' => array( 'administrator' ), - ), - array( - 'name' => 'private_feeds', - 'title' => __( 'Private Feeds', 'stream' ), - 'type' => 'checkbox', - 'desc' => sprintf( - __( 'Users from the selected roles above will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), - sprintf( - '', - admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), - esc_attr__( 'View Profile', 'stream' ) - ), - '' + public static function get_fields( $option_key = null ) { + if ( ! $option_key ) { + $option_key = self::$screen_key; + } + + $fields = array( + 'general' => array( + 'title' => __( 'General', 'stream' ), + 'fields' => array( + array( + 'name' => 'role_access', + 'title' => __( 'Role Access', 'stream' ), + 'type' => 'multi_checkbox', + 'desc' => __( 'Users from the selected roles above will have permission to view Stream Records. However, only site Administrators can access Stream Settings.', 'stream' ), + 'choices' => self::get_roles(), + 'default' => array( 'administrator' ), + ), + array( + 'name' => 'private_feeds', + 'title' => __( 'Private Feeds', 'stream' ), + 'type' => 'checkbox', + 'desc' => sprintf( + __( 'Users from the selected roles above will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), + sprintf( + '', + admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), + esc_attr__( 'View Profile', 'stream' ) ), - 'after_field' => __( 'Enabled' ), - 'default' => 0, + '' ), - array( - 'name' => 'records_ttl', - 'title' => __( 'Keep Records for', 'stream' ), - 'type' => 'number', - 'class' => 'small-text', - 'desc' => __( 'Maximum number of days to keep activity records. Leave blank to keep records forever.', 'stream' ), - 'default' => 90, - 'after_field' => __( 'days', 'stream' ), - ), - array( - 'name' => 'delete_all_records', - 'title' => __( 'Reset Stream Database', 'stream' ), - 'type' => 'link', - 'href' => add_query_arg( - array( - 'action' => 'wp_stream_reset', - 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), - ), - admin_url( 'admin-ajax.php' ) + 'after_field' => __( 'Enabled' ), + 'default' => 0, + ), + array( + 'name' => 'records_ttl', + 'title' => __( 'Keep Records for', 'stream' ), + 'type' => 'number', + 'class' => 'small-text', + 'desc' => __( 'Maximum number of days to keep activity records. Leave blank to keep records forever.', 'stream' ), + 'default' => 90, + 'after_field' => __( 'days', 'stream' ), + ), + array( + 'name' => 'delete_all_records', + 'title' => __( 'Reset Stream Database', 'stream' ), + 'type' => 'link', + 'href' => add_query_arg( + array( + 'action' => 'wp_stream_reset', + 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), ), - 'desc' => __( 'Warning: Clicking this will delete all activity records from the database.', 'stream' ), - 'default' => 0, + admin_url( 'admin-ajax.php' ) ), + 'desc' => __( 'Warning: Clicking this will delete all activity records from the database.', 'stream' ), + 'default' => 0, ), ), - 'exclude' => array( - 'title' => __( 'Exclude', 'stream' ), - 'fields' => array( - array( - 'name' => 'authors_and_roles', - 'title' => __( 'Authors & Roles', 'stream' ), - 'type' => 'select2_user_role', - 'desc' => __( 'No activity will be logged for these authors and/or roles.', 'stream' ), - 'choices' => self::get_roles(), - 'default' => array(), - ), - array( - 'name' => 'connectors', - 'title' => __( 'Connectors', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these connectors.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'connector', - 'default' => array(), - ), - array( - 'name' => 'contexts', - 'title' => __( 'Contexts', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these contexts.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'context', - 'default' => array(), - ), - array( - 'name' => 'actions', - 'title' => __( 'Actions', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these actions.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'action', - 'default' => array(), - ), - array( - 'name' => 'ip_addresses', - 'title' => __( 'IP Addresses', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these IP addresses.', 'stream' ), - 'class' => 'ip-addresses', - 'default' => array(), - 'nonce' => 'stream_get_ips', - ), - array( - 'name' => 'hide_previous_records', - 'title' => __( 'Visibility', 'stream' ), - 'type' => 'checkbox', - 'desc' => sprintf( - __( 'When checked, all past records that match the excluded rules above will be hidden from view.', 'stream' ) - ), - 'after_field' => __( 'Hide Previous Records', 'stream' ), - 'default' => 0, + ), + 'exclude' => array( + 'title' => __( 'Exclude', 'stream' ), + 'fields' => array( + array( + 'name' => 'authors_and_roles', + 'title' => __( 'Authors & Roles', 'stream' ), + 'type' => 'select2_user_role', + 'desc' => __( 'No activity will be logged for these authors and/or roles.', 'stream' ), + 'choices' => self::get_roles(), + 'default' => array(), + ), + array( + 'name' => 'connectors', + 'title' => __( 'Connectors', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these connectors.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'connector', + 'default' => array(), + ), + array( + 'name' => 'contexts', + 'title' => __( 'Contexts', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these contexts.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'context', + 'default' => array(), + ), + array( + 'name' => 'actions', + 'title' => __( 'Actions', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these actions.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'action', + 'default' => array(), + ), + array( + 'name' => 'ip_addresses', + 'title' => __( 'IP Addresses', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these IP addresses.', 'stream' ), + 'class' => 'ip-addresses', + 'default' => array(), + 'nonce' => 'stream_get_ips', + ), + array( + 'name' => 'hide_previous_records', + 'title' => __( 'Visibility', 'stream' ), + 'type' => 'checkbox', + 'desc' => sprintf( + __( 'When checked, all past records that match the excluded rules above will be hidden from view.', 'stream' ) ), + 'after_field' => __( 'Hide Previous Records', 'stream' ), + 'default' => 0, ), ), - ); - /** - * Filter allows for modification of options fields - * - * @param array array of fields - * @return array updated array of fields - */ - self::$fields = apply_filters( 'wp_stream_options_fields', $fields ); - } - return self::$fields; + ), + ); + + /** + * Filter allows for modification of options fields + * + * @param array array of fields + * @return array updated array of fields + */ + return apply_filters( 'wp_stream_options_fields', $fields, $option_key ); } /** @@ -329,10 +362,12 @@ public static function get_fields() { * * @return array Options */ - public static function get_options() { + public static function get_options( $option_key = null ) { + if ( ! $option_key ) { + $option_key = self::$screen_key; + } - $option_key = self::get_option_key(); - $defaults = self::get_defaults(); + $defaults = self::get_defaults( $option_key ); if ( self::DEFAULTS_KEY === $option_key ) { return $defaults; @@ -347,7 +382,7 @@ public static function get_options() { return apply_filters( 'wp_stream_options', wp_parse_args( - (array) get_option( self::KEY, array() ), + (array) get_option( $option_key, array() ), $defaults ), $option_key @@ -359,8 +394,12 @@ public static function get_options() { * * @return array Default option values */ - public static function get_defaults() { - $fields = self::get_fields(); + public static function get_defaults( $option_key = null ) { + if ( ! $option_key ) { + $option_key = self::$screen_key; + } + + $fields = self::get_fields( $option_key ); $defaults = array(); foreach ( $fields as $section_name => $section ) { @@ -387,15 +426,6 @@ public static function get_defaults() { } - /** - * Returns the correct option key based on the current screen. - * - * @return string Option key - */ - public static function get_option_key() { - return apply_filters( 'wp_stream_settings_option_key', WP_Stream_Settings::KEY ); - } - /** * Registers settings fields and sections * @@ -404,7 +434,7 @@ public static function get_option_key() { public static function register_settings() { $sections = self::get_fields(); - $option_key = self::get_option_key(); + $option_key = self::$screen_key; register_setting( $option_key, $option_key ); @@ -477,7 +507,7 @@ public static function render_field( $field ) { $title = isset( $field['title'] ) ? $field['title'] : null; $nonce = isset( $field['nonce'] ) ? $field['nonce'] : null; $current_value = self::$options[ $section . '_' . $name ]; - $option_key = self::get_option_key(); + $option_key = self::$screen_key; if ( is_callable( $current_value ) ) { $current_value = call_user_func( $current_value ); diff --git a/ui/admin.js b/ui/admin.js index ec899f48b..e522da591 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -271,7 +271,7 @@ jQuery(function($){ }); // Confirmation on some important actions - $('#wp_stream_general_delete_all_records').click(function(e){ + $('#wp_stream_general_delete_all_records, #wp_stream_network_general_delete_all_records').click(function(e){ if ( ! confirm( wp_stream.i18n.confirm_purge ) ) { e.preventDefault(); } From b2bbe2c0c9a7b5b7d9849082afb71dfd60a8b69b Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 12:58:37 +1000 Subject: [PATCH 094/123] Network admin check for scheduled ttl purge --- includes/admin.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/admin.php b/includes/admin.php index 7e5d420b1..1474fe114 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -527,6 +527,11 @@ public static function purge_schedule_setup() { public static function purge_scheduled_action() { global $wpdb; + // Don't purge if in Network Admin if Stream isn't network enabled + if ( is_network_admin() && is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + return; + } + if ( is_multisite() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $options = WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ); } else { From cfa01ba5170dfee86b03079ea0be090477ef73c5 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 13:04:21 +1000 Subject: [PATCH 095/123] Better quotes for query. Also, removed testing action. --- includes/admin.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 1474fe114..c2545a989 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -67,7 +67,6 @@ public static function load() { // Auto purge setup add_action( 'wp', array( __CLASS__, 'purge_schedule_setup' ) ); add_action( 'wp_stream_auto_purge', array( __CLASS__, 'purge_scheduled_action' ) ); - add_action( 'init', array( __CLASS__, 'purge_scheduled_action' ) ); // Admin notices add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); @@ -418,7 +417,7 @@ private static function erase_stream_records() { $where = ''; if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { - $where .= $wpdb->prepare( " AND `blog_id` = %d", get_current_blog_id() ); + $where .= $wpdb->prepare( ' AND `blog_id` = %d', get_current_blog_id() ); } $wpdb->query( @@ -543,10 +542,10 @@ public static function purge_scheduled_action() { $date->sub( DateInterval::createFromDateString( "$days days" ) ); - $where = $wpdb->prepare( " AND `stream`.`created` < %s", $date->format( 'Y-m-d H:i:s' ) ); + $where = $wpdb->prepare( ' AND `stream`.`created` < %s', $date->format( 'Y-m-d H:i:s' ) ); if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { - $where .= $wpdb->prepare( " AND `blog_id` = %d", get_current_blog_id() ); + $where .= $wpdb->prepare( ' AND `blog_id` = %d', get_current_blog_id() ); } $wpdb->query( From 0677f5304a84fc4f3cd18a8208ad701b0159df83 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 13:23:22 +1000 Subject: [PATCH 096/123] Oops - used a deprecated function. --- includes/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index c2545a989..fa34c14f5 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -493,9 +493,9 @@ public static function uninstall_plugin() { // Delete database options if ( is_multisite() ) { - $blogs = get_blog_list(); + $blogs = wp_get_sites(); foreach ( $blogs as $blog ) { - switch_to_blog( $blog->ID ); + switch_to_blog( $blog['blog_id'] ); delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); delete_option( WP_Stream_Settings::KEY ); } From 7e7b298678adcda968e1ac4281af20c30973d0a2 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Wed, 16 Apr 2014 22:47:05 +1000 Subject: [PATCH 097/123] Remove exclude Network Admin Settings This removes the ability for Super Admins to exclude Network Admin actions from their private feeds. --- includes/admin.php | 4 ++-- includes/feeds.php | 11 ----------- includes/network.php | 47 ++------------------------------------------ includes/query.php | 12 ++--------- ui/admin.js | 2 +- 5 files changed, 7 insertions(+), 69 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index fa34c14f5..327038740 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -445,7 +445,7 @@ public static function wp_ajax_defaults() { wp_redirect( add_query_arg( array( - 'page' => 'wp_stream_settings', + 'page' => is_network_admin() ? 'wp_stream_network_settings' : 'wp_stream_settings', 'message' => 'settings_reset', ), is_plugin_active_for_network( WP_STREAM_PLUGIN ) ? network_admin_url( self::ADMIN_PARENT_PAGE ) : admin_url( self::ADMIN_PARENT_PAGE ) @@ -460,7 +460,7 @@ public static function wp_ajax_defaults() { private static function reset_stream_settings() { global $wpdb; - $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs}", ARRAY_A ); + $blogs = wp_get_sites(); if ( $blogs ) { foreach ( $blogs as $blog ) { switch_to_blog( $blog['blog_id'] ); diff --git a/includes/feeds.php b/includes/feeds.php index 2b78c448e..0ed766993 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -160,17 +160,6 @@ public static function feed_template() { $blog_id = self::$is_network_feed ? null : get_current_blog_id(); - if ( self::$is_network_feed ) { - $network_settings = (array) get_site_option( WP_Stream_Settings::KEY, array() ); - if ( isset( $network_settings['general_private_feeds_network_admin'] ) && ! $network_settings['general_private_feeds_network_admin'] ) { - $blog_id = array(); - $blogs = wp_get_sites(); - foreach ( $blogs as $blog ) { - $blog_id[] = $blog['blog_id']; - } - } - } - $args = array( 'blog_id' => $blog_id, 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_option( 'posts_per_rss' ) ) ) ), diff --git a/includes/network.php b/includes/network.php index 840e3a26b..0d10c5447 100644 --- a/includes/network.php +++ b/includes/network.php @@ -91,6 +91,8 @@ function admin_menu_screens() { return; } + remove_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, 'wp_stream_settings' ); + WP_Stream_Admin::$screen_id['network_settings'] = add_submenu_page( WP_Stream_Admin::RECORDS_PAGE_SLUG, __( 'Stream Network Settings', 'stream' ), @@ -197,26 +199,6 @@ function get_fields( $fields, $option_key ) { ) ); - $network_stream_hidden_options = apply_filters( - 'wp_stream_network_stream_option_fields', - array( - 'general' => array( - 'delete_all_records', - 'records_ttl', - 'role_access', - 'private_feeds', - ), - 'exclude' => array( - 'authors_and_roles', - 'connectors', - 'contexts', - 'actions', - 'ip_addresses', - 'hide_previous_records', - ), - ) - ); - $network_hidden_options = apply_filters( 'wp_stream_network_option_fields', array( @@ -250,8 +232,6 @@ function get_fields( $fields, $option_key ) { $hidden_options = $network_hidden_options; } elseif ( WP_Stream_Settings::DEFAULTS_KEY === $option_key ) { $hidden_options = $defaults_hidden_options; - } elseif ( is_network_admin() ) { - $hidden_options = $network_stream_hidden_options; } else { $hidden_options = $stream_hidden_options; } @@ -304,29 +284,6 @@ function get_fields( $fields, $option_key ) { ); } - if ( WP_Stream_Settings::KEY === $option_key && is_network_admin() ) { - $private_feeds_network_admin_desc = sprintf( - __( 'Allows Super Admins to see activity from the Network Admin (blog_id = 0) inside their Private Feeds. A Private Feed key can be found in their %suser profile%s.', 'stream' ), - sprintf( - '', - admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), - esc_attr__( 'View Profile', 'stream' ) - ), - '' - ); - - $new_fields['general']['fields'][] = array( - 'name' => 'private_feeds_network_admin', - 'title' => __( 'Network Admin in Feeds', 'stream' ), - 'after_field' => __( 'Enabled' ), - 'default' => 1, - 'desc' => $private_feeds_network_admin_desc, - 'type' => 'checkbox', - ); - - $fields = array_merge_recursive( $new_fields, $fields ); - } - return $fields; } diff --git a/includes/query.php b/includes/query.php index d9abb313f..cc7081bc1 100644 --- a/includes/query.php +++ b/includes/query.php @@ -109,19 +109,11 @@ public function query( $args ) { } if ( $args['site_id'] ) { - if ( is_array( $args['site_id'] ) ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.site_id IN (%d)", implode( ',', $args['site_id'] ) ); - } else { - $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); - } + $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); } if ( $args['blog_id'] ) { - if ( is_array( $args['blog_id'] ) ) { - $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id IN (%d)", implode( ',', $args['blog_id'] ) ); - } else { - $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); - } + $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); } if ( $args['search'] ) { diff --git a/ui/admin.js b/ui/admin.js index e522da591..417364ea0 100644 --- a/ui/admin.js +++ b/ui/admin.js @@ -277,7 +277,7 @@ jQuery(function($){ } }); - $('#wp_stream_general_reset_site_settings').click(function(e){ + $('#wp_stream_general_reset_site_settings, #wp_stream_network_general_reset_site_settings').click(function(e){ if ( ! confirm( wp_stream.i18n.confirm_defaults ) ) { e.preventDefault(); } From 64d9dc08ca0b35bb909315ada63dcd2d1d65c833 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Wed, 16 Apr 2014 19:54:24 -0500 Subject: [PATCH 098/123] Version bump for testing --- stream.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stream.php b/stream.php index 5ebc1b8b1..abf6b7791 100644 --- a/stream.php +++ b/stream.php @@ -3,7 +3,7 @@ * Plugin Name: Stream * Plugin URI: http://wordpress.org/plugins/stream/ * Description: Stream tracks logged-in user activity so you can monitor every change made on your WordPress site in beautifully organized detail. All activity is organized by context, action and IP address for easy filtering. Developers can extend Stream with custom connectors to log any kind of action. - * Version: 1.3.2 + * Version: 1.4.0 * Author: X-Team * Author URI: http://x-team.com/wordpress/ * License: GPLv2+ @@ -36,7 +36,7 @@ class WP_Stream { * * @const string */ - const VERSION = '1.3.2'; + const VERSION = '1.4.0'; /** * Hold Stream instance From c68699ad0a41cfe098b262c12b3322bec9bd92c4 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 11:24:13 +1000 Subject: [PATCH 099/123] Cleaning up. --- includes/admin.php | 2 +- includes/network.php | 10 +- includes/settings.php | 247 ++++++++++++++++++++---------------------- 3 files changed, 125 insertions(+), 134 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 327038740..565579212 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -314,7 +314,7 @@ public static function plugin_action_links( $links, $file ) { */ public static function render_page() { - $option_key = WP_Stream_Settings::$screen_key; + $option_key = WP_Stream_Settings::$option_key; $form_action = apply_filters( 'wp_stream_settings_form_action', admin_url( 'options.php' ) ); $page_title = apply_filters( 'wp_stream_settings_form_title', get_admin_page_title() ); diff --git a/includes/network.php b/includes/network.php index 0d10c5447..5c9801e81 100644 --- a/includes/network.php +++ b/includes/network.php @@ -28,7 +28,7 @@ function filters() { add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_settings_form_description', array( $this, 'settings_form_description' ) ); - add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ), 10, 2 ); + add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); add_filter( 'wp_stream_options', array( $this, 'get_network_options' ), 10, 2 ); add_filter( 'wp_stream_serialized_labels', array( $this, 'get_settings_translations' ) ); add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); @@ -180,7 +180,7 @@ function settings_form_description( $description ) { * * @return mixed */ - function get_fields( $fields, $option_key ) { + function get_fields( $fields ) { if ( ! function_exists( 'is_plugin_active_for_network' ) ) { require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); } @@ -228,9 +228,9 @@ function get_fields( $fields, $option_key ) { ); // Remove settings based on context - if ( WP_Stream_Settings::NETWORK_KEY === $option_key ) { + if ( WP_Stream_Settings::NETWORK_KEY === WP_Stream_Settings::$option_key ) { $hidden_options = $network_hidden_options; - } elseif ( WP_Stream_Settings::DEFAULTS_KEY === $option_key ) { + } elseif ( WP_Stream_Settings::DEFAULTS_KEY === WP_Stream_Settings::$option_key ) { $hidden_options = $defaults_hidden_options; } else { $hidden_options = $stream_hidden_options; @@ -254,7 +254,7 @@ function get_fields( $fields, $option_key ) { } // Add and change settings, based on context - if ( WP_Stream_Settings::NETWORK_KEY === $option_key ) { + if ( WP_Stream_Settings::NETWORK_KEY === WP_Stream_Settings::$option_key ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', 'title' => __( 'Enable Site Access', 'stream' ), diff --git a/includes/settings.php b/includes/settings.php index 28602f4a9..e8cae3ba1 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -34,7 +34,7 @@ class WP_Stream_Settings { * * @var array */ - public static $screen_key = ''; + public static $option_key = ''; /** * Settings fields @@ -50,7 +50,7 @@ class WP_Stream_Settings { */ public static function load() { - self::$screen_key = self::get_option_key(); + self::$option_key = self::get_option_key(); self::$options = self::get_options(); // Register settings, and fields @@ -229,124 +229,122 @@ public static function get_option_key() { * * @return array Multidimensional array of fields */ - public static function get_fields( $option_key = null ) { - if ( ! $option_key ) { - $option_key = self::$screen_key; - } - - $fields = array( - 'general' => array( - 'title' => __( 'General', 'stream' ), - 'fields' => array( - array( - 'name' => 'role_access', - 'title' => __( 'Role Access', 'stream' ), - 'type' => 'multi_checkbox', - 'desc' => __( 'Users from the selected roles above will have permission to view Stream Records. However, only site Administrators can access Stream Settings.', 'stream' ), - 'choices' => self::get_roles(), - 'default' => array( 'administrator' ), - ), - array( - 'name' => 'private_feeds', - 'title' => __( 'Private Feeds', 'stream' ), - 'type' => 'checkbox', - 'desc' => sprintf( - __( 'Users from the selected roles above will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), - sprintf( - '', - admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), - esc_attr__( 'View Profile', 'stream' ) + public static function get_fields() { + if ( empty( self::$fields ) ) { + $fields = array( + 'general' => array( + 'title' => __( 'General', 'stream' ), + 'fields' => array( + array( + 'name' => 'role_access', + 'title' => __( 'Role Access', 'stream' ), + 'type' => 'multi_checkbox', + 'desc' => __( 'Users from the selected roles above will have permission to view Stream Records. However, only site Administrators can access Stream Settings.', 'stream' ), + 'choices' => self::get_roles(), + 'default' => array( 'administrator' ), + ), + array( + 'name' => 'private_feeds', + 'title' => __( 'Private Feeds', 'stream' ), + 'type' => 'checkbox', + 'desc' => sprintf( + __( 'Users from the selected roles above will be given a private key found in their %suser profile%s to access feeds of Stream Records securely.', 'stream' ), + sprintf( + '', + admin_url( sprintf( 'profile.php#wp-stream-highlight:%s', WP_Stream_Feeds::USER_FEED_KEY ) ), + esc_attr__( 'View Profile', 'stream' ) + ), + '' ), - '' + 'after_field' => __( 'Enabled' ), + 'default' => 0, ), - 'after_field' => __( 'Enabled' ), - 'default' => 0, - ), - array( - 'name' => 'records_ttl', - 'title' => __( 'Keep Records for', 'stream' ), - 'type' => 'number', - 'class' => 'small-text', - 'desc' => __( 'Maximum number of days to keep activity records. Leave blank to keep records forever.', 'stream' ), - 'default' => 90, - 'after_field' => __( 'days', 'stream' ), - ), - array( - 'name' => 'delete_all_records', - 'title' => __( 'Reset Stream Database', 'stream' ), - 'type' => 'link', - 'href' => add_query_arg( - array( - 'action' => 'wp_stream_reset', - 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), + array( + 'name' => 'records_ttl', + 'title' => __( 'Keep Records for', 'stream' ), + 'type' => 'number', + 'class' => 'small-text', + 'desc' => __( 'Maximum number of days to keep activity records. Leave blank to keep records forever.', 'stream' ), + 'default' => 90, + 'after_field' => __( 'days', 'stream' ), + ), + array( + 'name' => 'delete_all_records', + 'title' => __( 'Reset Stream Database', 'stream' ), + 'type' => 'link', + 'href' => add_query_arg( + array( + 'action' => 'wp_stream_reset', + 'wp_stream_nonce' => wp_create_nonce( 'stream_nonce' ), + ), + admin_url( 'admin-ajax.php' ) ), - admin_url( 'admin-ajax.php' ) + 'desc' => __( 'Warning: Clicking this will delete all activity records from the database.', 'stream' ), + 'default' => 0, ), - 'desc' => __( 'Warning: Clicking this will delete all activity records from the database.', 'stream' ), - 'default' => 0, ), ), - ), - 'exclude' => array( - 'title' => __( 'Exclude', 'stream' ), - 'fields' => array( - array( - 'name' => 'authors_and_roles', - 'title' => __( 'Authors & Roles', 'stream' ), - 'type' => 'select2_user_role', - 'desc' => __( 'No activity will be logged for these authors and/or roles.', 'stream' ), - 'choices' => self::get_roles(), - 'default' => array(), - ), - array( - 'name' => 'connectors', - 'title' => __( 'Connectors', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these connectors.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'connector', - 'default' => array(), - ), - array( - 'name' => 'contexts', - 'title' => __( 'Contexts', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these contexts.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'context', - 'default' => array(), - ), - array( - 'name' => 'actions', - 'title' => __( 'Actions', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these actions.', 'stream' ), - 'choices' => array( __CLASS__, 'get_terms_labels' ), - 'param' => 'action', - 'default' => array(), - ), - array( - 'name' => 'ip_addresses', - 'title' => __( 'IP Addresses', 'stream' ), - 'type' => 'select2', - 'desc' => __( 'No activity will be logged for these IP addresses.', 'stream' ), - 'class' => 'ip-addresses', - 'default' => array(), - 'nonce' => 'stream_get_ips', - ), - array( - 'name' => 'hide_previous_records', - 'title' => __( 'Visibility', 'stream' ), - 'type' => 'checkbox', - 'desc' => sprintf( - __( 'When checked, all past records that match the excluded rules above will be hidden from view.', 'stream' ) + 'exclude' => array( + 'title' => __( 'Exclude', 'stream' ), + 'fields' => array( + array( + 'name' => 'authors_and_roles', + 'title' => __( 'Authors & Roles', 'stream' ), + 'type' => 'select2_user_role', + 'desc' => __( 'No activity will be logged for these authors and/or roles.', 'stream' ), + 'choices' => self::get_roles(), + 'default' => array(), + ), + array( + 'name' => 'connectors', + 'title' => __( 'Connectors', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these connectors.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'connector', + 'default' => array(), + ), + array( + 'name' => 'contexts', + 'title' => __( 'Contexts', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these contexts.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'context', + 'default' => array(), + ), + array( + 'name' => 'actions', + 'title' => __( 'Actions', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these actions.', 'stream' ), + 'choices' => array( __CLASS__, 'get_terms_labels' ), + 'param' => 'action', + 'default' => array(), + ), + array( + 'name' => 'ip_addresses', + 'title' => __( 'IP Addresses', 'stream' ), + 'type' => 'select2', + 'desc' => __( 'No activity will be logged for these IP addresses.', 'stream' ), + 'class' => 'ip-addresses', + 'default' => array(), + 'nonce' => 'stream_get_ips', + ), + array( + 'name' => 'hide_previous_records', + 'title' => __( 'Visibility', 'stream' ), + 'type' => 'checkbox', + 'desc' => sprintf( + __( 'When checked, all past records that match the excluded rules above will be hidden from view.', 'stream' ) + ), + 'after_field' => __( 'Hide Previous Records', 'stream' ), + 'default' => 0, ), - 'after_field' => __( 'Hide Previous Records', 'stream' ), - 'default' => 0, ), ), - ), - ); + ); + } /** * Filter allows for modification of options fields @@ -354,7 +352,7 @@ public static function get_fields( $option_key = null ) { * @param array array of fields * @return array updated array of fields */ - return apply_filters( 'wp_stream_options_fields', $fields, $option_key ); + return apply_filters( 'wp_stream_options_fields', $fields ); } /** @@ -362,10 +360,8 @@ public static function get_fields( $option_key = null ) { * * @return array Options */ - public static function get_options( $option_key = null ) { - if ( ! $option_key ) { - $option_key = self::$screen_key; - } + public static function get_options() { + $option_key = self::$option_key; $defaults = self::get_defaults( $option_key ); @@ -394,12 +390,8 @@ public static function get_options( $option_key = null ) { * * @return array Default option values */ - public static function get_defaults( $option_key = null ) { - if ( ! $option_key ) { - $option_key = self::$screen_key; - } - - $fields = self::get_fields( $option_key ); + public static function get_defaults() { + $fields = self::get_fields(); $defaults = array(); foreach ( $fields as $section_name => $section ) { @@ -434,16 +426,15 @@ public static function get_defaults( $option_key = null ) { public static function register_settings() { $sections = self::get_fields(); - $option_key = self::$screen_key; - register_setting( $option_key, $option_key ); + register_setting( self::$option_key, self::$option_key ); foreach ( $sections as $section_name => $section ) { add_settings_section( $section_name, null, '__return_false', - $option_key + self::$option_key ); foreach ( $section['fields'] as $field_idx => $field ) { @@ -454,11 +445,11 @@ public static function register_settings() { $field['name'], $field['title'], ( isset( $field['callback'] ) ? $field['callback'] : array( __CLASS__, 'output_field' ) ), - $option_key, + self::$option_key, $section_name, $field + array( 'section' => $section_name, - 'label_for' => sprintf( '%s_%s_%s', $option_key, $section_name, $field['name'] ), // xss ok + 'label_for' => sprintf( '%s_%s_%s', self::$option_key, $section_name, $field['name'] ), // xss ok ) ); } @@ -507,7 +498,7 @@ public static function render_field( $field ) { $title = isset( $field['title'] ) ? $field['title'] : null; $nonce = isset( $field['nonce'] ) ? $field['nonce'] : null; $current_value = self::$options[ $section . '_' . $name ]; - $option_key = self::$screen_key; + $option_key = self::$option_key; if ( is_callable( $current_value ) ) { $current_value = call_user_func( $current_value ); From 33c243301f10ee4c6d5f5e158dfd28ca4820df95 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Wed, 16 Apr 2014 20:59:23 -0500 Subject: [PATCH 100/123] Fixing sniff for misaligned equal sign --- includes/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/settings.php b/includes/settings.php index e8cae3ba1..e63dbe750 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -425,7 +425,7 @@ public static function get_defaults() { */ public static function register_settings() { - $sections = self::get_fields(); + $sections = self::get_fields(); register_setting( self::$option_key, self::$option_key ); From fa4aa3ee00ac1b8274f89019d50e1d8d88b10f46 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 13:19:08 +1000 Subject: [PATCH 101/123] Simplified the get_fields() function. --- includes/network.php | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/includes/network.php b/includes/network.php index 5c9801e81..794d1eb91 100644 --- a/includes/network.php +++ b/includes/network.php @@ -28,7 +28,7 @@ function filters() { add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_settings_form_description', array( $this, 'settings_form_description' ) ); - add_filter( 'wp_stream_options_fields', array( $this, 'get_fields' ) ); + add_filter( 'wp_stream_options_fields', array( $this, 'get_network_admin_fields' ) ); add_filter( 'wp_stream_options', array( $this, 'get_network_options' ), 10, 2 ); add_filter( 'wp_stream_serialized_labels', array( $this, 'get_settings_translations' ) ); add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); @@ -159,9 +159,6 @@ function settings_form_description( $description ) { $current_page = wp_stream_filter_input( INPUT_GET, 'page' ); switch ( $current_page ) { - case 'wp_stream_settings' : - $description = __( 'These settings only apply to the Network Admin Stream.', 'stream' ); - break; case 'wp_stream_network_settings' : $description = __( 'These settings apply to all sites on the network.', 'stream' ); break; @@ -174,13 +171,13 @@ function settings_form_description( $description ) { } /** - * Adds a network settings field to stream options in network admin + * Adjusts the settings fields displayed in various network admin screens * * @param $fields * * @return mixed */ - function get_fields( $fields ) { + function get_network_admin_fields( $fields ) { if ( ! function_exists( 'is_plugin_active_for_network' ) ) { require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); } @@ -217,21 +214,9 @@ function get_fields( $fields ) { ) ); - $defaults_hidden_options = apply_filters( - 'wp_stream_defaults_option_fields', - array( - 'general' => array( - 'delete_all_records', - 'records_ttl', - ), - ) - ); - // Remove settings based on context if ( WP_Stream_Settings::NETWORK_KEY === WP_Stream_Settings::$option_key ) { $hidden_options = $network_hidden_options; - } elseif ( WP_Stream_Settings::DEFAULTS_KEY === WP_Stream_Settings::$option_key ) { - $hidden_options = $defaults_hidden_options; } else { $hidden_options = $stream_hidden_options; } @@ -247,13 +232,7 @@ function get_fields( $fields ) { } } - foreach ( $fields as $section_key => $section ) { - if ( empty( $section['fields'] ) ) { - unset( $fields[ $section_key ] ); - } - } - - // Add and change settings, based on context + // Add settings based on context if ( WP_Stream_Settings::NETWORK_KEY === WP_Stream_Settings::$option_key ) { $new_fields['general']['fields'][] = array( 'name' => 'enable_site_access', @@ -284,6 +263,13 @@ function get_fields( $fields ) { ); } + // Remove empty settings sections + foreach ( $fields as $section_key => $section ) { + if ( empty( $section['fields'] ) ) { + unset( $fields[ $section_key ] ); + } + } + return $fields; } @@ -320,7 +306,6 @@ function get_settings_translations( $labels ) { */ function network_options_action() { $allowed_referers = array( - 'wp_stream_settings', 'wp_stream_network_settings', 'wp_stream_default_settings', ); From c103eee266b136a97ac5c96cb6976b5f5a6cee95 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 14:40:38 +1000 Subject: [PATCH 102/123] Restore update routine. This somehow got lost somewhere. --- includes/db-updates.php | 79 +++++++++++++++++++++++++++++++++++++++++ includes/install.php | 5 +-- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index 34c4a9a48..5235593ea 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -1,5 +1,84 @@ query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); + + if ( is_multisite() ) { + $blogs = wp_get_sites(); + + foreach ( $blogs as $blog ) { + switch_to_blog( $blog['blog_id'] ); + + // No need to merge the primary site + if ( $wpdb->prefix === $prefix ) { + continue; + } + + $sql = "SELECT * FROM {$wpdb->prefix}stream"; + + $blog_stream = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream as $key => $stream_entry ) { + + $prev_entry_id = $stream_entry['ID']; + + unset( $stream_entry['ID'] ); + $stream_entry['blog_id'] = $blog['blog_id']; + + $wpdb->insert( $wpdb->base_prefix . 'stream', $stream_entry ); + $stream_entry_id = $wpdb->insert_id; + + $sql = "SELECT * FROM {$wpdb->prefix}stream_context WHERE record_id = $prev_entry_id"; + + $blog_stream_context = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream_context as $key => $stream_context ) { + unset( $stream_context['meta_id'] ); + $stream_context['record_id'] = $stream_entry_id; + + $wpdb->insert( $wpdb->base_prefix . 'stream_context', $stream_context ); + } + + $sql = "SELECT * FROM {$wpdb->prefix}stream_meta WHERE record_id = $prev_entry_id"; + + $blog_stream_meta = $wpdb->get_results( $sql, ARRAY_A ); + + foreach ( $blog_stream_meta as $key => $stream_meta ) { + unset( $stream_meta['meta_id'] ); + $stream_meta['record_id'] = $stream_entry_id; + + $wpdb->insert( $wpdb->base_prefix . 'stream_meta', $stream_meta ); + } + + } + $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}stream, {$wpdb->prefix}stream_context, {$wpdb->prefix}stream_meta" ); + } + restore_current_blog(); + } + + do_action( 'wp_stream_after_db_update_' . $db_version, $current_version, $wpdb->last_error ); + + if ( $wpdb->last_error ) { + return __( 'Database Update Error', 'stream' ); + } + + return $current_version; +} + /** * Update Database to version 1.3.2 * diff --git a/includes/install.php b/includes/install.php index 59a91e472..e4f8fa582 100755 --- a/includes/install.php +++ b/includes/install.php @@ -88,7 +88,7 @@ function __construct() { * @var string $prefix database prefix * @var string $table_prefix updated database prefix */ - $prefix = $wpdb->prefix; + $prefix = $wpdb->base_prefix; self::$table_prefix = apply_filters( 'wp_stream_db_tables_prefix', $prefix ); self::check(); @@ -117,7 +117,7 @@ public static function get_db_version() { global $wpdb; $version = get_site_option( self::KEY ); - if ( ! $version && version_compare( self::$current, '1.3.2', '<=' ) ) { + if ( ! $version && version_compare( self::$current, '1.4.0', '<=' ) ) { $old_key = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%stream%_db'" ); if ( ! empty( $old_key ) && is_array( $old_key ) ) { $version = get_option( $old_key[0] ); @@ -214,6 +214,7 @@ private static function db_update_versions() { '1.3.0'/** @version 1.3.0 Backward settings compatibility for old version plugins */, '1.3.1'/** @version 1.3.1 Update records of Installer to Theme Editor connector */, '1.3.2'/** @version 1.3.2 Add the author_role column */, + '1.4.0'/** @version 1.4.0 Prepare tables for multisite support */, ); } From 91a43fc08da63acd1b7088393257945f602bfcbc Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 15:08:39 +1000 Subject: [PATCH 103/123] Fix uninstall bug Previously, when uninstalling Stream from a single site, all sites in the multisite install would be uninstalled. --- includes/admin.php | 48 ++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 9939a310b..bcf3127e5 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -534,28 +534,38 @@ public static function uninstall_plugin() { // Deactivate the plugin deactivate_plugins( plugin_basename( WP_STREAM_DIR ) . '/stream.php' ); - // Delete all tables - foreach ( WP_Stream_DB::get_instance()->get_table_names() as $table ) { - $wpdb->query( "DROP TABLE $table" ); - } + // Plugin is being uninstalled from only one of the multisite blogs + if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { + $blog_id = get_current_blog_id(); + + $wpdb->query( "DELETE FROM {$wpdb->base_prefix}stream WHERE blog_id = $blog_id" ); - // Delete database options - if ( is_multisite() ) { - $blogs = wp_get_sites(); - foreach ( $blogs as $blog ) { - switch_to_blog( $blog['blog_id'] ); - delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); - delete_option( WP_Stream_Settings::KEY ); + delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + delete_option( WP_Stream_Settings::KEY ); + } else { + // Delete all tables + foreach ( WP_Stream_DB::get_instance()->get_table_names() as $table ) { + $wpdb->query( "DROP TABLE $table" ); } - restore_current_blog(); - } - // Delete database option - delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); - delete_site_option( WP_Stream_Settings::KEY ); - delete_site_option( WP_Stream_Settings::DEFAULTS_KEY ); - delete_site_option( WP_Stream_Settings::NETWORK_KEY ); - delete_site_option( 'dashboard_stream_activity_options' ); + // Delete database options + if ( is_multisite() ) { + $blogs = wp_get_sites(); + foreach ( $blogs as $blog ) { + switch_to_blog( $blog['blog_id'] ); + delete_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + delete_option( WP_Stream_Settings::KEY ); + } + restore_current_blog(); + } + + // Delete database option + delete_site_option( plugin_basename( WP_STREAM_DIR ) . '_db' ); + delete_site_option( WP_Stream_Settings::KEY ); + delete_site_option( WP_Stream_Settings::DEFAULTS_KEY ); + delete_site_option( WP_Stream_Settings::NETWORK_KEY ); + delete_site_option( 'dashboard_stream_activity_options' ); + } // Redirect to plugin page wp_redirect( add_query_arg( array( 'deactivate' => true ), is_network_admin() ? network_admin_url( 'plugins.php' ) : admin_url( 'plugins.php' ) ) ); From c46114ee0369c1381eb64a81f707ebf7ac428e5a Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 15:09:09 +1000 Subject: [PATCH 104/123] Fix primary blog records disappearing in update --- includes/db-updates.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index 5235593ea..1f618508d 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -23,8 +23,15 @@ function wp_stream_update_140( $db_version, $current_version ) { foreach ( $blogs as $blog ) { switch_to_blog( $blog['blog_id'] ); - // No need to merge the primary site + // No need to merge the primary site, but update the blog_id if ( $wpdb->prefix === $prefix ) { + $wpdb->update( + $prefix . 'stream', + array( 'blog_id' => $blog['blog_id'] ), + array( 'blog_id' => '0' ), + array( '%d' ), + array( '%d' ) + ); continue; } @@ -63,7 +70,6 @@ function wp_stream_update_140( $db_version, $current_version ) { $wpdb->insert( $wpdb->base_prefix . 'stream_meta', $stream_meta ); } - } $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}stream, {$wpdb->prefix}stream_context, {$wpdb->prefix}stream_meta" ); } From 84431b4c59f37d9052b706d7b55493a13d4d282f Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 18:24:59 +1000 Subject: [PATCH 105/123] Move deactivate after is_plugin_active check. --- includes/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index bcf3127e5..e49a7bfc4 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -531,9 +531,6 @@ public static function uninstall_plugin() { // Prevent stream action from being fired on plugin remove_action( 'deactivate_plugin', array( 'WP_Stream_Connector_Installer', 'callback' ), null ); - // Deactivate the plugin - deactivate_plugins( plugin_basename( WP_STREAM_DIR ) . '/stream.php' ); - // Plugin is being uninstalled from only one of the multisite blogs if ( is_multisite() && ! is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $blog_id = get_current_blog_id(); @@ -567,6 +564,9 @@ public static function uninstall_plugin() { delete_site_option( 'dashboard_stream_activity_options' ); } + // Deactivate the plugin + deactivate_plugins( plugin_basename( WP_STREAM_DIR ) . '/stream.php' ); + // Redirect to plugin page wp_redirect( add_query_arg( array( 'deactivate' => true ), is_network_admin() ? network_admin_url( 'plugins.php' ) : admin_url( 'plugins.php' ) ) ); exit; From fea9e2fcf4b3235222905f1a360a8a94412e769c Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 18:36:42 +1000 Subject: [PATCH 106/123] Fix network settings bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously the network settings weren’t being returned properly by WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ). --- includes/admin.php | 2 +- includes/network.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index e49a7bfc4..9bb9f82ce 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -591,7 +591,7 @@ public static function purge_scheduled_action() { } if ( is_multisite() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { - $options = WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ); + $options = (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ); } else { $options = WP_Stream_Settings::get_options(); } diff --git a/includes/network.php b/includes/network.php index 794d1eb91..6feeadde7 100644 --- a/includes/network.php +++ b/includes/network.php @@ -69,9 +69,9 @@ public static function get_network_blog() { */ function disable_admin_access( $disable_access ) { if ( ! is_network_admin() ) { - $settings = WP_Stream_Settings::get_options( WP_Stream_Settings::NETWORK_KEY ); + $settings = (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ); - if ( isset( $settings['general_enable_site_access'] ) && false == $settings['general_enable_site_access'] ) { + if ( isset( $settings['general_enable_site_access'] ) && false === $settings['general_enable_site_access'] ) { return true; } } From fc4ab67a9828b1b1435d24e91dba996139e48897 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 18:41:15 +1000 Subject: [PATCH 107/123] Fix bug preventing Stream access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This occurred if Stream was network enabled, then site access was turned off, then network disabled. After that, if an individual site enabled Stream, they couldn’t access it. --- includes/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/network.php b/includes/network.php index 6feeadde7..b5d963262 100644 --- a/includes/network.php +++ b/includes/network.php @@ -68,7 +68,7 @@ public static function get_network_blog() { * @return boolean */ function disable_admin_access( $disable_access ) { - if ( ! is_network_admin() ) { + if ( ! is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $settings = (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ); if ( isset( $settings['general_enable_site_access'] ) && false === $settings['general_enable_site_access'] ) { From 95dd2a197f3153897bb255d09adf0c408f3a9a5b Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 19:47:22 +1000 Subject: [PATCH 108/123] Check if exists before adding blog_id --- includes/db-updates.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index 1f618508d..b51d8a326 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -15,7 +15,11 @@ function wp_stream_update_140( $db_version, $current_version ) { do_action( 'wp_stream_before_db_update_' . $db_version, $current_version ); - $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); + $wpdb->get_results( "SELECT * FROM information_schema.COLUMNS WHERE TABLE_NAME = '{$prefix}stream' AND COLUMN_NAME = 'blog_id'" ); + + if ( 0 === $wpdb->num_rows ) { + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); + } if ( is_multisite() ) { $blogs = wp_get_sites(); From fc36bf1ed990d96ff81c803df19151e0c7661885 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Thu, 17 Apr 2014 21:16:56 +1000 Subject: [PATCH 109/123] Don't show Stream if there's a DB update that needs a-doin' --- includes/admin.php | 19 +++++++++++++++---- includes/install.php | 11 +++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index 9bb9f82ce..23cd17d27 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -136,8 +136,10 @@ public static function register_menu() { do_action( 'wp_stream_admin_menu_screens' ); - // Register the list table early, so it associates the column headers with 'Screen settings' - add_action( 'load-' . self::$screen_id['main'], array( __CLASS__, 'register_list_table' ) ); + if ( ! WP_Stream_Install::$update_required ) { + // Register the list table early, so it associates the column headers with 'Screen settings' + add_action( 'load-' . self::$screen_id['main'], array( __CLASS__, 'register_list_table' ) ); + } } /** @@ -367,6 +369,12 @@ public static function render_page() { $sections = WP_Stream_Settings::get_fields(); $active_tab = wp_stream_filter_input( INPUT_GET, 'tab' ); + + if ( WP_Stream_Install::$update_required ) { + printf( '

    %s

    ', $page_title ); + return; + } + ?>
    @@ -420,8 +428,6 @@ public static function register_list_table() { } public static function stream_page() { - self::$list_table->prepare_items(); - $page_title = __( 'Stream Records', 'stream' ); echo '
    '; @@ -433,6 +439,11 @@ public static function stream_page() { printf( '

    %s

    ', __( 'Stream Records', 'stream' ) ); // xss ok } + if ( WP_Stream_Install::$update_required ) { + return; + } + + self::$list_table->prepare_items(); self::$list_table->display(); echo '
    '; } diff --git a/includes/install.php b/includes/install.php index e4f8fa582..ec655f7c1 100755 --- a/includes/install.php +++ b/includes/install.php @@ -49,6 +49,14 @@ class WP_Stream_Install { */ public static $update_versions; + /** + * Holds status of whether it's safe to run Stream or not + * + * @access public + * @var bool + */ + public static $update_required = false; + /** * Initialized object of class * @@ -109,6 +117,9 @@ private static function check() { if ( empty( self::$db_version ) ) { $current = self::install( self::$current ); } elseif ( self::$db_version !== self::$current ) { + if ( ! isset( $_REQUEST['wp_stream_update'] ) ) { + self::$update_required = true; + } add_action( 'admin_notices', array( __CLASS__, 'update_notice_hook' ) ); } } From 4be02d2d51b0b6e9c714a1c724430ce2cf49a2e8 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 17 Apr 2014 17:11:22 -0500 Subject: [PATCH 110/123] Add Stream to the admin bar menu under My Sites > Network Admin --- includes/network.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/includes/network.php b/includes/network.php index 0d10c5447..d84e38705 100644 --- a/includes/network.php +++ b/includes/network.php @@ -16,6 +16,7 @@ function __construct() { function actions() { add_action( 'init', array( $this, 'ajax_network_admin' ), 1 ); + add_action( 'admin_bar_menu', array( $this, 'network_admin_bar_menu' ), 99, 1 ); add_action( 'network_admin_menu', array( 'WP_Stream_Admin', 'register_menu' ) ); add_action( 'network_admin_notices', array( 'WP_Stream_Admin', 'admin_notices' ) ); add_action( 'wpmuadminedit', array( $this, 'network_options_action' ) ); @@ -48,6 +49,25 @@ function ajax_network_admin() { } } + /** + * Adds Stream to the admin bar under the "My Sites > Network Admin" menu + */ + function network_admin_bar_menu( $admin_bar ) { + $href = add_query_arg( + array( + 'page' => WP_Stream_Admin::RECORDS_PAGE_SLUG, + ), + network_admin_url( WP_Stream_Admin::ADMIN_PARENT_PAGE ) + ); + + $admin_bar->add_menu( array( + 'id' => 'network-admin-stream', + 'parent' => 'network-admin', + 'title' => esc_html__( 'Stream', 'stream' ), + 'href' => esc_url( $href ), + )); + } + /** * Builds a stdClass object used when displaying actions done in network administration * @return stdClass From c682f8e6545c6993c8558cdf9c7453c2454ebb67 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Thu, 17 Apr 2014 17:34:53 -0500 Subject: [PATCH 111/123] Code formatting on array --- includes/network.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/network.php b/includes/network.php index ff46e54c8..e2051b89a 100644 --- a/includes/network.php +++ b/includes/network.php @@ -60,12 +60,14 @@ function network_admin_bar_menu( $admin_bar ) { network_admin_url( WP_Stream_Admin::ADMIN_PARENT_PAGE ) ); - $admin_bar->add_menu( array( - 'id' => 'network-admin-stream', - 'parent' => 'network-admin', - 'title' => esc_html__( 'Stream', 'stream' ), - 'href' => esc_url( $href ), - )); + $admin_bar->add_menu( + array( + 'id' => 'network-admin-stream', + 'parent' => 'network-admin', + 'title' => esc_html__( 'Stream', 'stream' ), + 'href' => esc_url( $href ), + ) + ); } /** From d02c954bd7e9547bf302fe688e0fd735e0be3b6d Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 18 Apr 2014 09:24:28 +1000 Subject: [PATCH 112/123] Make some network functions static --- includes/network.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/network.php b/includes/network.php index e2051b89a..c178151a6 100644 --- a/includes/network.php +++ b/includes/network.php @@ -26,7 +26,7 @@ function actions() { } function filters() { - add_filter( 'wp_stream_disable_admin_access', array( $this, 'disable_admin_access' ) ); + add_filter( 'wp_stream_disable_admin_access', array( __CLASS__, 'disable_admin_access' ) ); add_filter( 'wp_stream_settings_form_action', array( $this, 'settings_form_action' ) ); add_filter( 'wp_stream_settings_form_description', array( $this, 'settings_form_description' ) ); add_filter( 'wp_stream_options_fields', array( $this, 'get_network_admin_fields' ) ); @@ -35,7 +35,7 @@ function filters() { add_filter( 'wp_stream_list_table_filters', array( $this, 'list_table_filters' ) ); add_filter( 'stream_toggle_filters', array( $this, 'toggle_filters' ) ); add_filter( 'wp_stream_list_table_screen_id', array( $this, 'list_table_screen_id' ) ); - add_filter( 'wp_stream_query_args', array( $this, 'set_network_option_value' ) ); + add_filter( 'wp_stream_query_args', array( __CLASS__, 'set_network_option_value' ) ); add_filter( 'wp_stream_list_table_columns', array( $this, 'network_admin_columns' ) ); } @@ -89,7 +89,7 @@ public static function get_network_blog() { * * @return boolean */ - function disable_admin_access( $disable_access ) { + public static function disable_admin_access( $disable_access ) { if ( ! is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $settings = (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ); @@ -469,7 +469,7 @@ function list_table_screen_id( $screen_id ) { * * @return mixed */ - static function set_network_option_value( $args ) { + public static function set_network_option_value( $args ) { if ( isset( $args['blog_id'] ) && 'network' === $args['blog_id'] ) { $args['blog_id'] = 0; } From 34f2095861396bb61197ee4d7a69c3b935561db1 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 18 Apr 2014 10:41:36 +1000 Subject: [PATCH 113/123] Fix for blog_id = '0' argument The Network Admin has the id of zero. We should be able to ask for results from this id. --- includes/query.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/query.php b/includes/query.php index 25a18d349..228f75a48 100755 --- a/includes/query.php +++ b/includes/query.php @@ -109,11 +109,11 @@ public function query( $args ) { $where .= $wpdb->prepare( " AND $wpdb->stream.ip = %s", wp_stream_filter_var( $args['ip'], FILTER_VALIDATE_IP ) ); } - if ( $args['site_id'] ) { + if ( is_numeric( $args['site_id'] ) ) { $where .= $wpdb->prepare( " AND $wpdb->stream.site_id = %d", $args['site_id'] ); } - if ( $args['blog_id'] ) { + if ( is_numeric( $args['blog_id'] ) ) { $where .= $wpdb->prepare( " AND $wpdb->stream.blog_id = %d", $args['blog_id'] ); } From bde79bb68dcde66dacfe29689163c1935aba6513 Mon Sep 17 00:00:00 2001 From: Luke Carbis Date: Fri, 18 Apr 2014 12:12:02 +1000 Subject: [PATCH 114/123] Add is_plugin_active_for_network function check --- includes/network.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/network.php b/includes/network.php index c178151a6..62c2b9cb7 100644 --- a/includes/network.php +++ b/includes/network.php @@ -90,6 +90,9 @@ public static function get_network_blog() { * @return boolean */ public static function disable_admin_access( $disable_access ) { + if ( ! function_exists( 'is_plugin_active_for_network' ) ) { + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + } if ( ! is_network_admin() && is_plugin_active_for_network( WP_STREAM_PLUGIN ) ) { $settings = (array) get_site_option( WP_Stream_Settings::NETWORK_KEY, array() ); From 4b6311344b50c129d977b31343b725e0d50ad98c Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 02:27:21 -0500 Subject: [PATCH 115/123] Code formatting --- includes/db-updates.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index 41bc57042..246cb0f3f 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -51,7 +51,6 @@ function wp_stream_update_140( $db_version, $current_version ) { $blog_stream = $wpdb->get_results( $sql, ARRAY_A ); foreach ( $blog_stream as $key => $stream_entry ) { - $prev_entry_id = $stream_entry['ID']; unset( $stream_entry['ID'] ); @@ -82,8 +81,10 @@ function wp_stream_update_140( $db_version, $current_version ) { $wpdb->insert( $wpdb->base_prefix . 'stream_meta', $stream_meta ); } } + $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}stream, {$wpdb->prefix}stream_context, {$wpdb->prefix}stream_meta" ); } + restore_current_blog(); } From 68f0648a0722d345a9db82b3c9e1b94e35fe7cd7 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 02:42:26 -0500 Subject: [PATCH 116/123] Ensure Network Admin can see DB update notices --- includes/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/install.php b/includes/install.php index 721bd4465..07b5731fb 100755 --- a/includes/install.php +++ b/includes/install.php @@ -120,7 +120,7 @@ private static function check() { if ( ! isset( $_REQUEST['wp_stream_update'] ) ) { self::$update_required = true; } - add_action( 'admin_notices', array( __CLASS__, 'update_notice_hook' ) ); + add_action( 'all_admin_notices', array( __CLASS__, 'update_notice_hook' ) ); } } From 26e943ff788c2f4bc821200f15b55a5936704088 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 10:26:17 -0500 Subject: [PATCH 117/123] Use default site_id of 1 if not on multisite If Stream is running on a single site install that switches to multisite later, this will ensure records remain in the main site's Stream --- includes/query.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/query.php b/includes/query.php index da0f1a01b..6986bbe6f 100755 --- a/includes/query.php +++ b/includes/query.php @@ -22,13 +22,13 @@ public static function get_instance() { public function query( $args ) { global $wpdb; - $site_id = is_multisite() ? get_current_site()->id : null; + $site_id = is_multisite() ? get_current_site()->id : 1; $defaults = array( // Pagination params - 'records_per_page' => 10, + 'records_per_page' => get_site_option( 'posts_per_page' ), 'paged' => 1, - // Search params + // Search param 'search' => null, // Stream core fields filtering 'type' => 'stream', @@ -36,7 +36,7 @@ public function query( $args ) { 'ip' => null, 'site_id' => is_network_admin() ? null : $site_id, 'blog_id' => is_network_admin() ? null : get_current_blog_id(), - // Author param + // Author params 'author' => null, 'author_role' => null, // Date-based filters From 408b0b97512676172cb82ff113e45ccb4a9c75ec Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 10:28:50 -0500 Subject: [PATCH 118/123] Use get_site_option in feeds for MS compat --- includes/feeds.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index ef711c25d..4b2ff5879 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -80,7 +80,7 @@ public static function user_feed_key( $user ) { $key = get_user_meta( $user->ID, self::USER_FEED_KEY, true ); $query_var = is_network_admin() ? self::FEED_NETWORK_QUERY_VAR : self::FEED_QUERY_VAR; - $pretty_permalinks = get_option( 'permalink_structure' ); + $pretty_permalinks = get_site_option( 'permalink_structure' ); if ( empty( $pretty_permalinks ) ) { $link = add_query_arg( @@ -162,7 +162,7 @@ public static function feed_template() { $args = array( 'blog_id' => $blog_id, - 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_option( 'posts_per_rss' ) ) ) ), + 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_site_option( 'posts_per_rss' ) ) ) ), 'search' => wp_stream_filter_input( INPUT_GET, 'search' ), 'object_id' => wp_stream_filter_input( INPUT_GET, 'object_id', FILTER_SANITIZE_NUMBER_INT ), 'ip' => wp_stream_filter_input( INPUT_GET, 'ip', FILTER_VALIDATE_IP ), @@ -197,9 +197,9 @@ public static function feed_template() { } } else { - header( 'Content-Type: ' . feed_content_type( 'rss-http' ) . '; charset=' . get_option( 'blog_charset' ), true ); + header( 'Content-Type: ' . feed_content_type( 'rss-http' ) . '; charset=' . get_site_option( 'blog_charset' ), true ); - echo ''; + echo ''; ?> Date: Fri, 18 Apr 2014 10:32:40 -0500 Subject: [PATCH 119/123] Escape blog_charset output, provide text domain in translatable strings --- includes/feeds.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index 4b2ff5879..948e98915 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -116,9 +116,9 @@ public static function user_feed_key( $user ) {

    - + | - +

    @@ -199,7 +199,7 @@ public static function feed_template() { header( 'Content-Type: ' . feed_content_type( 'rss-http' ) . '; charset=' . get_site_option( 'blog_charset' ), true ); - echo ''; + printf( '', esc_attr( get_site_option( 'blog_charset' ) ) ); ?> Date: Fri, 18 Apr 2014 10:41:18 -0500 Subject: [PATCH 120/123] Don't get option from network-wide --- includes/feeds.php | 8 ++++---- includes/query.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/feeds.php b/includes/feeds.php index 948e98915..77e4a3c82 100644 --- a/includes/feeds.php +++ b/includes/feeds.php @@ -80,7 +80,7 @@ public static function user_feed_key( $user ) { $key = get_user_meta( $user->ID, self::USER_FEED_KEY, true ); $query_var = is_network_admin() ? self::FEED_NETWORK_QUERY_VAR : self::FEED_QUERY_VAR; - $pretty_permalinks = get_site_option( 'permalink_structure' ); + $pretty_permalinks = get_option( 'permalink_structure' ); if ( empty( $pretty_permalinks ) ) { $link = add_query_arg( @@ -162,7 +162,7 @@ public static function feed_template() { $args = array( 'blog_id' => $blog_id, - 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_site_option( 'posts_per_rss' ) ) ) ), + 'records_per_page' => wp_stream_filter_input( INPUT_GET, 'records_per_page', FILTER_SANITIZE_NUMBER_INT, array( 'options' => array( 'default' => get_option( 'posts_per_rss' ) ) ) ), 'search' => wp_stream_filter_input( INPUT_GET, 'search' ), 'object_id' => wp_stream_filter_input( INPUT_GET, 'object_id', FILTER_SANITIZE_NUMBER_INT ), 'ip' => wp_stream_filter_input( INPUT_GET, 'ip', FILTER_VALIDATE_IP ), @@ -197,9 +197,9 @@ public static function feed_template() { } } else { - header( 'Content-Type: ' . feed_content_type( 'rss-http' ) . '; charset=' . get_site_option( 'blog_charset' ), true ); + header( 'Content-Type: ' . feed_content_type( 'rss-http' ) . '; charset=' . get_option( 'blog_charset' ), true ); - printf( '', esc_attr( get_site_option( 'blog_charset' ) ) ); + printf( '', esc_attr( get_option( 'blog_charset' ) ) ); ?> get_site_option( 'posts_per_page' ), + 'records_per_page' => get_option( 'posts_per_page' ), 'paged' => 1, // Search param 'search' => null, From 4eb2fcde1aea4c137c96560f947f1d05f7a87013 Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 10:45:15 -0500 Subject: [PATCH 121/123] Make author_role column value NULL by default when updating the DB --- includes/db-updates.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index 246cb0f3f..ccf122faa 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -24,7 +24,7 @@ function wp_stream_update_140( $db_version, $current_version ) { // If the blog_id doesn't exist, then create it and update records retroactively if ( empty( $rows ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NULL DEFAULT '0' AFTER site_id" ); } // If multisite, merge the site stream tables into one From 2b5d20b5d817a735a722e1ef228134918867c61c Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Fri, 18 Apr 2014 10:46:37 -0500 Subject: [PATCH 122/123] Fix last commit, edited wrong statement --- includes/db-updates.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/db-updates.php b/includes/db-updates.php index ccf122faa..fec11823f 100644 --- a/includes/db-updates.php +++ b/includes/db-updates.php @@ -24,7 +24,7 @@ function wp_stream_update_140( $db_version, $current_version ) { // If the blog_id doesn't exist, then create it and update records retroactively if ( empty( $rows ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NULL DEFAULT '0' AFTER site_id" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD blog_id bigint(20) unsigned NOT NULL DEFAULT '0' AFTER site_id" ); } // If multisite, merge the site stream tables into one @@ -97,7 +97,7 @@ function wp_stream_update_140( $db_version, $current_version ) { // If the author_role doesn't exist, then create it and update records retroactively if ( empty( $rows ) ) { - $wpdb->query( "ALTER TABLE {$prefix}stream ADD author_role varchar(50) NOT NULL AFTER author" ); + $wpdb->query( "ALTER TABLE {$prefix}stream ADD author_role varchar(50) NULL AFTER author" ); $records = wp_stream_query( array( 'records_per_page' => -1 ) ); From 2e5a56d419210d7f7593a057008e0f11df2982fc Mon Sep 17 00:00:00 2001 From: Frankie Jarrett Date: Tue, 22 Apr 2014 15:15:47 -0500 Subject: [PATCH 123/123] Set proper query default args for site_id --- includes/query.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/query.php b/includes/query.php index fe2a83445..caed6ff24 100755 --- a/includes/query.php +++ b/includes/query.php @@ -22,8 +22,6 @@ public static function get_instance() { public function query( $args ) { global $wpdb; - $site_id = is_multisite() ? get_current_site()->id : 1; - $defaults = array( // Pagination params 'records_per_page' => get_option( 'posts_per_page' ), @@ -34,7 +32,7 @@ public function query( $args ) { 'type' => 'stream', 'object_id' => null, 'ip' => null, - 'site_id' => is_network_admin() ? null : $site_id, + 'site_id' => is_multisite() ? get_current_site()->id : 1, 'blog_id' => is_network_admin() ? null : get_current_blog_id(), // Author params 'author' => null, @@ -276,7 +274,7 @@ public function query( $args ) { */ $order = esc_sql( $args['order'] ); $orderby = esc_sql( $args['orderby'] ); - $orderable = array( 'ID', 'site_id', 'object_id', 'author', 'author_role', 'summary', 'visibility', 'parent', 'type', 'created' ); + $orderable = array( 'ID', 'site_id', 'blog_id', 'object_id', 'author', 'author_role', 'summary', 'visibility', 'parent', 'type', 'created' ); if ( in_array( $orderby, $orderable ) ) { $orderby = $wpdb->stream . '.' . $orderby;