+ ?>
+
name ); ?>
-
+
- term_columns as $key => $name ): ?>
+ term_columns as $key => $name ) : ?>
|
@@ -475,17 +489,18 @@ function print_term( $term ) {
print_post( $post, $term );
+ foreach ( $posts as $post ) {
+ $this->print_post( $post, $term );
+ }
?>
-
+
-
- term_columns as $key => $name ) {
+ term_columns as $key => $name ) {
echo '| ';
if ( method_exists( $this, 'term_column_' . $key ) ) {
$method = 'term_column_' . $key;
- echo $this->$method( $post, $parent_term );
+ echo wp_kses_post( $this->$method( $post, $parent_term ) );
} else {
- echo $this->term_column_default( $post, $key, $parent_term );
+ echo wp_kses_post( $this->term_column_default( $post, $key, $parent_term ) );
}
echo ' | ';
- } ?>
+ }
+ ?>
post_status );
return $status_name->label;
@@ -545,12 +563,12 @@ function term_column_default( $post, $column_name, $parent_term ) {
return $output;
break;
case 'post_modified':
+ // translators: %s is a human-readable time difference
return sprintf( esc_html__( '%s ago', 'edit-flow' ), human_time_diff( get_the_time( 'U', $post->ID ), current_time( 'timestamp' ) ) );
break;
default:
break;
}
-
}
/**
@@ -558,29 +576,35 @@ function term_column_default( $post, $column_name, $parent_term ) {
*
* @since 0.7
*/
- function term_column_title( $post, $parent_term ) {
+ public function term_column_title( $post, $parent_term ) {
$post_title = _draft_or_post_title( $post->ID );
$post_type_object = get_post_type_object( $post->post_type );
$can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID );
- if ( $can_edit_post )
+ if ( $can_edit_post ) {
$output = '
' . esc_html( $post_title ) . '';
- else
+ } else {
$output = '
' . esc_html( $post_title ) . '';
+ }
// Edit or Trash or View
$output .= '
';
$item_actions = array();
- if ( $can_edit_post )
+ if ( $can_edit_post ) {
$item_actions['edit'] = '
' . __( 'Edit', 'edit-flow' ) . '';
- if ( EMPTY_TRASH_DAYS > 0 && current_user_can( $post_type_object->cap->delete_post, $post->ID ) )
+ }
+ if ( EMPTY_TRASH_DAYS > 0 && current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
$item_actions['trash'] = '
' . __( 'Trash', 'edit-flow' ) . '';
+ }
// Display a View or a Preview link depending on whether the post has been published or not
- if ( in_array( $post->post_status, array( 'publish' ) ) )
+ if ( in_array( $post->post_status, array( 'publish' ) ) ) {
+ // translators: %s is the post title
$item_actions['view'] = '
' . __( 'View', 'edit-flow' ) . '';
- else if ( $can_edit_post )
+ } else if ( $can_edit_post ) {
+ // translators: %s is the post title
$item_actions['previewpost'] = '
' . __( 'Preview', 'edit-flow' ) . '';
+ }
$item_actions = apply_filters( 'ef_story_budget_item_actions', $item_actions, $post->ID );
if ( count( $item_actions ) ) {
@@ -599,26 +623,28 @@ function term_column_title( $post, $parent_term ) {
/**
* Print any messages that should appear based on the action performed
*/
- function print_messages() {
- ?>
+ public function print_messages() {
+ ?>
-
';
// Following mostly stolen from edit.php
if ( isset( $_GET['trashed'] ) && (int) $_GET['trashed'] ) {
- printf( _n( 'Item moved to the trash.', '%d items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
- $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
- echo ' ' . __( 'Undo', 'edit-flow' ) . '
';
- unset($_GET['trashed']);
+ // translators: %d is the number of posts trashed
+ printf( esc_html( _n( 'Item moved to the trash.', '%d items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) ) );
+ $ids = isset( $_GET['ids'] ) ? $_GET['ids'] : 0;
+ echo ' ' . esc_html__( 'Undo', 'edit-flow' ) . '
';
+ unset( $_GET['trashed'] );
}
- if ( isset($_GET['untrashed'] ) && (int) $_GET['untrashed'] ) {
- printf( _n( 'Item restored from the Trash.', '%d items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
- unset($_GET['undeleted']);
+ if ( isset( $_GET['untrashed'] ) && (int) $_GET['untrashed'] ) {
+ // translators: %d is the number of posts restored from the trash
+ printf( esc_html( _n( 'Item restored from the Trash.', '%d items restored from the Trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) ) );
+ unset( $_GET['undeleted'] );
}
echo '
';
@@ -628,16 +654,16 @@ function print_messages() {
/**
* Print the table navigation and filter controls, using the current user's filters if any are set.
*/
- function table_navigation() {
- ?>
+ public function table_navigation() {
+ ?>
@@ -647,8 +673,8 @@ function table_navigation() {
story_budget_filters() as $select_id => $select_name ) {
- echo '
';
+ foreach ( $this->story_budget_filters() as $select_id => $select_name ) {
+ echo '
';
}
?>
@@ -661,23 +687,23 @@ function table_navigation() {
- $this->filter_get_param( 'post_status' ),
- 'cat' => $this->filter_get_param( 'cat' ),
- 'author' => $this->filter_get_param( 'author' ),
- 'start_date' => $this->filter_get_param( 'start_date' ),
- 'number_days' => $this->filter_get_param( 'number_days' )
+ 'post_status' => $this->filter_get_param( 'post_status' ),
+ 'cat' => $this->filter_get_param( 'cat' ),
+ 'author' => $this->filter_get_param( 'author' ),
+ 'start_date' => $this->filter_get_param( 'start_date' ),
+ 'number_days' => $this->filter_get_param( 'number_days' ),
);
$current_user_filters = array();
@@ -685,18 +711,20 @@ function update_user_filters() {
// If any of the $_GET vars are missing, then use the current user filter
foreach ( $user_filters as $key => $value ) {
- if ( is_null( $value ) && !empty( $current_user_filters[$key] ) ) {
- $user_filters[$key] = $current_user_filters[$key];
+ if ( is_null( $value ) && ! empty( $current_user_filters[ $key ] ) ) {
+ $user_filters[ $key ] = $current_user_filters[ $key ];
}
}
- if ( !$user_filters['start_date'] )
- $user_filters['start_date'] = date( 'Y-m-d' );
+ if ( ! $user_filters['start_date'] ) {
+ $user_filters['start_date'] = gmdate( 'Y-m-d' );
+ }
- if ( !$user_filters['number_days'] )
+ if ( ! $user_filters['number_days'] ) {
$user_filters['number_days'] = 10;
+ }
- $user_filters = apply_filters('ef_story_budget_filter_values', $user_filters, $current_user_filters);
+ $user_filters = apply_filters( 'ef_story_budget_filter_values', $user_filters, $current_user_filters );
$this->update_user_meta( $current_user->ID, self::usermeta_key_prefix . 'filters', $user_filters );
return $user_filters;
@@ -708,15 +736,16 @@ function update_user_filters() {
*
* @return array The filters for the current user, or the default filters if the current user has none.
*/
- function get_user_filters() {
+ public function get_user_filters() {
$current_user = wp_get_current_user();
$user_filters = array();
$user_filters = $this->get_user_meta( $current_user->ID, self::usermeta_key_prefix . 'filters', true );
// If usermeta didn't have filters already, insert defaults into DB
- if ( empty( $user_filters ) )
+ if ( empty( $user_filters ) ) {
$user_filters = $this->update_user_filters();
+ }
return $user_filters;
}
@@ -724,72 +753,72 @@ function get_user_filters() {
*
* @param string $param The parameter to look for in $_GET
* @return null if the parameter is not set in $_GET, empty string if the parameter is empty in $_GET,
- * or a sanitized version of the parameter from $_GET if set and not empty
+ * or a sanitized version of the parameter from $_GET if set and not empty
*/
- function filter_get_param( $param ) {
+ public function filter_get_param( $param ) {
// Sure, this could be done in one line. But we're cooler than that: let's make it more readable!
- if ( !isset( $_GET[$param] ) ) {
+ if ( ! isset( $_GET[ $param ] ) ) {
return null;
- } else if ( empty( $_GET[$param] ) ) {
+ } else if ( empty( $_GET[ $param ] ) ) {
return '';
}
- return sanitize_key( $_GET[$param] );
+ return sanitize_key( $_GET[ $param ] );
}
- function story_budget_filters() {
+ public function story_budget_filters() {
$select_filter_names = array();
$select_filter_names['post_status'] = 'post_status';
$select_filter_names['cat'] = 'cat';
$select_filter_names['author'] = 'author';
- return apply_filters('ef_story_budget_filter_names', $select_filter_names);
+ return apply_filters( 'ef_story_budget_filter_names', $select_filter_names );
}
- function story_budget_filter_options( $select_id, $select_name, $filters ) {
- switch( $select_id ) {
+ public function story_budget_filter_options( $select_id, $select_name, $filters ) {
+ switch ( $select_id ) {
case 'post_status':
- $post_stati = $this->get_budget_post_stati();
- ?>
+ $post_stati = $this->get_budget_post_stati();
+ ?>
- __( 'View all categories', 'edit-flow' ),
'hide_empty' => 0,
'hierarchical' => 1,
'show_count' => 0,
'orderby' => 'name',
- 'selected' => $this->user_filters['cat']
- );
+ 'selected' => $this->user_filters['cat'],
+ );
wp_dropdown_categories( $category_dropdown_args );
}
- break;
+ break;
case 'author':
$users_dropdown_args = array(
- 'show_option_all' => __( 'View all users', 'edit-flow' ),
- 'name' => 'author',
- 'selected' => $this->user_filters['author'],
- 'who' => 'authors',
- );
+ 'show_option_all' => __( 'View all users', 'edit-flow' ),
+ 'name' => 'author',
+ 'selected' => $this->user_filters['author'],
+ 'who' => 'authors',
+ );
$users_dropdown_args = apply_filters( 'ef_story_budget_users_dropdown_args', $users_dropdown_args );
wp_dropdown_users( $users_dropdown_args );
- break;
+ break;
default:
- do_action( 'ef_story_budget_filter_display', $select_id, $select_name, $filters);
- break;
+ do_action( 'ef_story_budget_filter_display', $select_id, $select_name, $filters );
+ break;
}
}
@@ -808,13 +837,12 @@ public function get_budget_post_stati() {
$final_statuses = [];
- foreach( $post_stati as $status ) {
- if ( !empty( $custom_status_slug_keys[ $status->name ] ) ) {
+ foreach ( $post_stati as $status ) {
+ if ( ! empty( $custom_status_slug_keys[ $status->name ] ) ) {
$final_statuses[] = $status;
}
}
return apply_filters( 'ef_budget_post_stati', $final_statuses );
}
-
}