Clean up spaces, tabs, indentation, and bracket formatting

This commit is contained in:
Brian Miyaji
2021-11-10 15:41:40 +09:00
parent e58beb1201
commit 3dff686a00
285 changed files with 29638 additions and 24147 deletions

View File

@@ -2,44 +2,68 @@
class SP_Widget_Event_List extends WP_Widget {
function __construct() {
$widget_ops = array('classname' => 'widget_sportspress widget_sp_event_list', 'description' => __( 'A list of events.', 'sportspress' ) );
parent::__construct('sportspress-event-list', __( 'Event List', 'sportspress' ), $widget_ops);
$widget_ops = array(
'classname' => 'widget_sportspress widget_sp_event_list',
'description' => __( 'A list of events.', 'sportspress' ),
);
parent::__construct( 'sportspress-event-list', __( 'Event List', 'sportspress' ), $widget_ops );
}
function widget( $args, $instance ) {
extract($args);
$id = empty($instance['id']) ? null : $instance['id'];
extract( $args );
$id = empty( $instance['id'] ) ? null : $instance['id'];
if ( $id && 'yes' == get_option( 'sportspress_widget_unique', 'no' ) && get_the_ID() === $id ) {
$format = get_post_meta( $id, 'sp_format', true );
if ( 'list' == $format ) return;
if ( 'list' == $format ) {
return;
}
}
$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
$caption = empty($instance['caption']) ? null : $instance['caption'];
$status = empty($instance['status']) ? 'default' : $instance['status'];
$date = empty($instance['date']) ? 'default' : $instance['date'];
$date_from = empty($instance['date_from']) ? 'default' : $instance['date_from'];
$date_to = empty($instance['date_to']) ? 'default' : $instance['date_to'];
$date_past = empty($instance['date_past']) ? 'default' : $instance['date_past'];
$date_future = empty($instance['date_future']) ? 'default' : $instance['date_future'];
$date_relative = empty($instance['date_relative']) ? 'default' : $instance['date_relative'];
$day = empty($instance['day']) ? 'default' : $instance['day'];
$number = empty($instance['number']) ? null : $instance['number'];
$columns = empty($instance['columns']) ? null : $instance['columns'];
$order = empty($instance['order']) ? 'default' : $instance['order'];
$show_all_events_link = empty($instance['show_all_events_link']) ? false : $instance['show_all_events_link'];
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
$caption = empty( $instance['caption'] ) ? null : $instance['caption'];
$status = empty( $instance['status'] ) ? 'default' : $instance['status'];
$date = empty( $instance['date'] ) ? 'default' : $instance['date'];
$date_from = empty( $instance['date_from'] ) ? 'default' : $instance['date_from'];
$date_to = empty( $instance['date_to'] ) ? 'default' : $instance['date_to'];
$date_past = empty( $instance['date_past'] ) ? 'default' : $instance['date_past'];
$date_future = empty( $instance['date_future'] ) ? 'default' : $instance['date_future'];
$date_relative = empty( $instance['date_relative'] ) ? 'default' : $instance['date_relative'];
$day = empty( $instance['day'] ) ? 'default' : $instance['day'];
$number = empty( $instance['number'] ) ? null : $instance['number'];
$columns = empty( $instance['columns'] ) ? null : $instance['columns'];
$order = empty( $instance['order'] ) ? 'default' : $instance['order'];
$show_all_events_link = empty( $instance['show_all_events_link'] ) ? false : $instance['show_all_events_link'];
do_action( 'sportspress_before_widget', $args, $instance, 'event-list' );
echo $before_widget;
if ( $title )
if ( $title ) {
echo $before_title . $title . $after_title;
}
// Action to hook into
do_action( 'sportspress_before_widget_template', $args, $instance, 'event-list' );
sp_get_template( 'event-list.php', array( 'id' => $id, 'title' => $caption, 'status' => $status, 'date' => $date, 'date_from' => $date_from, 'date_to' => $date_to, 'date_past' => $date_past, 'date_future' => $date_future, 'date_relative' => $date_relative, 'day' => $day, 'number' => $number, 'columns' => $columns, 'order' => $order, 'show_all_events_link' => $show_all_events_link ) );
sp_get_template(
'event-list.php',
array(
'id' => $id,
'title' => $caption,
'status' => $status,
'date' => $date,
'date_from' => $date_from,
'date_to' => $date_to,
'date_past' => $date_past,
'date_future' => $date_future,
'date_relative' => $date_relative,
'day' => $day,
'number' => $number,
'columns' => $columns,
'order' => $order,
'show_all_events_link' => $show_all_events_link,
)
);
// Action to hook into
do_action( 'sportspress_after_widget_template', $args, $instance, 'event-list' );
@@ -49,21 +73,21 @@ class SP_Widget_Event_List extends WP_Widget {
}
function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['id'] = intval($new_instance['id']);
$instance['caption'] = strip_tags($new_instance['caption']);
$instance['status'] = $new_instance['status'];
$instance['date'] = $new_instance['date'];
$instance['date_from'] = $new_instance['date_from'];
$instance['date_to'] = $new_instance['date_to'];
$instance['date_past'] = $new_instance['date_past'];
$instance['date_future'] = $new_instance['date_future'];
$instance['date_relative'] = $new_instance['date_relative'];
$instance['day'] = $new_instance['day'];
$instance['number'] = intval($new_instance['number']);
$instance['columns'] = (array)$new_instance['columns'];
$instance['order'] = strip_tags($new_instance['order']);
$instance = $old_instance;
$instance['title'] = strip_tags( $new_instance['title'] );
$instance['id'] = intval( $new_instance['id'] );
$instance['caption'] = strip_tags( $new_instance['caption'] );
$instance['status'] = $new_instance['status'];
$instance['date'] = $new_instance['date'];
$instance['date_from'] = $new_instance['date_from'];
$instance['date_to'] = $new_instance['date_to'];
$instance['date_past'] = $new_instance['date_past'];
$instance['date_future'] = $new_instance['date_future'];
$instance['date_relative'] = $new_instance['date_relative'];
$instance['day'] = $new_instance['day'];
$instance['number'] = intval( $new_instance['number'] );
$instance['columns'] = (array) $new_instance['columns'];
$instance['order'] = strip_tags( $new_instance['order'] );
$instance['show_all_events_link'] = $new_instance['show_all_events_link'];
// Filter to hook into
@@ -73,21 +97,40 @@ class SP_Widget_Event_List extends WP_Widget {
}
function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'id' => null, 'caption' => '', 'status' => 'default', 'date' => 'default', 'date_from' => date_i18n( 'Y-m-d' ), 'date_to' => date_i18n( 'Y-m-d' ), 'date_past' => 7, 'date_future' => 7, 'date_relative' => false, 'day' => '', 'number' => 5, 'columns' => null, 'order' => 'default', 'show_all_events_link' => true ) );
$title = strip_tags($instance['title']);
$id = intval($instance['id']);
$caption = strip_tags($instance['caption']);
$status = $instance['status'];
$date = $instance['date'];
$date_from = $instance['date_from'];
$date_to = $instance['date_to'];
$date_past = $instance['date_past'];
$date_future = $instance['date_future'];
$date_relative = $instance['date_relative'];
$day = $instance['day'];
$number = intval($instance['number']);
$columns = $instance['columns'];
$order = strip_tags($instance['order']);
$instance = wp_parse_args(
(array) $instance,
array(
'title' => '',
'id' => null,
'caption' => '',
'status' => 'default',
'date' => 'default',
'date_from' => date_i18n( 'Y-m-d' ),
'date_to' => date_i18n( 'Y-m-d' ),
'date_past' => 7,
'date_future' => 7,
'date_relative' => false,
'day' => '',
'number' => 5,
'columns' => null,
'order' => 'default',
'show_all_events_link' => true,
)
);
$title = strip_tags( $instance['title'] );
$id = intval( $instance['id'] );
$caption = strip_tags( $instance['caption'] );
$status = $instance['status'];
$date = $instance['date'];
$date_from = $instance['date_from'];
$date_to = $instance['date_to'];
$date_past = $instance['date_past'];
$date_future = $instance['date_future'];
$date_relative = $instance['date_relative'];
$day = $instance['day'];
$number = intval( $instance['number'] );
$columns = $instance['columns'];
$order = strip_tags( $instance['order'] );
$show_all_events_link = $instance['show_all_events_link'];
$time_format = get_option( 'sportspress_event_list_time_format', 'combined' );
@@ -95,63 +138,75 @@ class SP_Widget_Event_List extends WP_Widget {
// Action to hook into
do_action( 'sportspress_before_widget_template_form', $this, $instance, 'event-list' );
?>
<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'sportspress' ); ?></label>
<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'sportspress' ); ?></label>
<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
<p><label for="<?php echo $this->get_field_id('caption'); ?>"><?php _e( 'Heading:', 'sportspress' ); ?></label>
<input class="widefat" id="<?php echo $this->get_field_id('caption'); ?>" name="<?php echo $this->get_field_name('caption'); ?>" type="text" value="<?php echo esc_attr($caption); ?>" /></p>
<p><label for="<?php echo $this->get_field_id( 'caption' ); ?>"><?php _e( 'Heading:', 'sportspress' ); ?></label>
<input class="widefat" id="<?php echo $this->get_field_id( 'caption' ); ?>" name="<?php echo $this->get_field_name( 'caption' ); ?>" type="text" value="<?php echo esc_attr( $caption ); ?>" /></p>
<p><label for="<?php echo $this->get_field_id('id'); ?>"><?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?></label>
<p><label for="<?php echo $this->get_field_id( 'id' ); ?>"><?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?></label>
<?php
$args = array(
'post_type' => 'sp_calendar',
'post_type' => 'sp_calendar',
'show_option_all' => __( 'All', 'sportspress' ),
'name' => $this->get_field_name('id'),
'id' => $this->get_field_id('id'),
'selected' => $id,
'values' => 'ID',
'class' => 'sp-event-calendar-select widefat',
'name' => $this->get_field_name( 'id' ),
'id' => $this->get_field_id( 'id' ),
'selected' => $id,
'values' => 'ID',
'class' => 'sp-event-calendar-select widefat',
);
if ( ! sp_dropdown_pages( $args ) ):
if ( ! sp_dropdown_pages( $args ) ) :
sp_post_adder( 'sp_calendar', __( 'Add New', 'sportspress' ) );
endif;
?>
</p>
<p><label for="<?php echo $this->get_field_id('status'); ?>"><?php _e( 'Status:', 'sportspress' ); ?></label>
<p><label for="<?php echo $this->get_field_id( 'status' ); ?>"><?php _e( 'Status:', 'sportspress' ); ?></label>
<?php
$args = array(
'show_option_default' => __( 'Default', 'sportspress' ),
'name' => $this->get_field_name('status'),
'id' => $this->get_field_id('status'),
'selected' => $status,
'class' => 'sp-event-status-select widefat',
'name' => $this->get_field_name( 'status' ),
'id' => $this->get_field_id( 'status' ),
'selected' => $status,
'class' => 'sp-event-status-select widefat',
);
sp_dropdown_statuses( $args );
?>
</p>
<div class="sp-date-selector">
<p><label for="<?php echo $this->get_field_id('date'); ?>"><?php _e( 'Date:', 'sportspress' ); ?></label>
<p><label for="<?php echo $this->get_field_id( 'date' ); ?>"><?php _e( 'Date:', 'sportspress' ); ?></label>
<?php
$args = array(
'show_option_default' => __( 'Default', 'sportspress' ),
'name' => $this->get_field_name('date'),
'id' => $this->get_field_id('date'),
'selected' => $date,
'class' => 'sp-event-date-select widefat',
'name' => $this->get_field_name( 'date' ),
'id' => $this->get_field_id( 'date' ),
'selected' => $date,
'class' => 'sp-event-date-select widefat',
);
sp_dropdown_dates( $args );
?>
</p>
<div class="sp-date-range<?php if ( 'range' !== $date ): ?> hidden<?php endif; ?>">
<p class="sp-date-range-absolute<?php if ( $date_relative ): ?> hidden<?php endif; ?>">
<div class="sp-date-range
<?php
if ( 'range' !== $date ) :
?>
hidden<?php endif; ?>">
<p class="sp-date-range-absolute
<?php
if ( $date_relative ) :
?>
hidden<?php endif; ?>">
<input type="text" name="<?php echo $this->get_field_name( 'date_from' ); ?>" value="<?php echo $date_from; ?>" placeholder="yyyy-mm-dd" size="10">
:
<input type="text" name="<?php echo $this->get_field_name( 'date_to' ); ?>" value="<?php echo $date_to; ?>" placeholder="yyyy-mm-dd" size="10">
</p>
<p class="sp-date-range-relative<?php if ( ! $date_relative ): ?> hidden<?php endif; ?>">
<p class="sp-date-range-relative
<?php
if ( ! $date_relative ) :
?>
hidden<?php endif; ?>">
<?php _e( 'Past', 'sportspress' ); ?>
<input type="number" min="0" step="1" class="tiny-text" name="<?php echo $this->get_field_name( 'date_past' ); ?>" value="<?php echo $date_past; ?>">
&rarr;
@@ -169,14 +224,14 @@ class SP_Widget_Event_List extends WP_Widget {
</div>
</div>
<p><label for="<?php echo $this->get_field_id('day'); ?>"><?php _e( 'Match Day:', 'sportspress' ); ?></label>
<input id="<?php echo $this->get_field_id('day'); ?>" name="<?php echo $this->get_field_name('day'); ?>" type="text" placeholder="<?php _e( 'All', 'sportspress' ); ?>" value="<?php echo esc_attr($day); ?>" size="10"></p>
<p><label for="<?php echo $this->get_field_id( 'day' ); ?>"><?php _e( 'Match Day:', 'sportspress' ); ?></label>
<input id="<?php echo $this->get_field_id( 'day' ); ?>" name="<?php echo $this->get_field_name( 'day' ); ?>" type="text" placeholder="<?php _e( 'All', 'sportspress' ); ?>" value="<?php echo esc_attr( $day ); ?>" size="10"></p>
<p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e( 'Number of events to show:', 'sportspress' ); ?></label>
<input id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="text" value="<?php echo esc_attr($number); ?>" size="3"></p>
<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of events to show:', 'sportspress' ); ?></label>
<input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo esc_attr( $number ); ?>" size="3"></p>
<p><label for="<?php echo $this->get_field_id('order'); ?>"><?php _e( 'Sort Order:', 'sportspress' ); ?></label>
<select name="<?php echo $this->get_field_name('order'); ?>" id="<?php echo $this->get_field_id('order'); ?>" class="sp-select-order widefat">
<p><label for="<?php echo $this->get_field_id( 'order' ); ?>"><?php _e( 'Sort Order:', 'sportspress' ); ?></label>
<select name="<?php echo $this->get_field_name( 'order' ); ?>" id="<?php echo $this->get_field_id( 'order' ); ?>" class="sp-select-order widefat">
<option value="default" <?php selected( 'default', $order ); ?>><?php _e( 'Default', 'sportspress' ); ?></option>
<option value="ASC" <?php selected( 'ASC', $order ); ?>><?php _e( 'Ascending', 'sportspress' ); ?></option>
<option value="DESC" <?php selected( 'DESC', $order ); ?>><?php _e( 'Descending', 'sportspress' ); ?></option>
@@ -185,7 +240,7 @@ class SP_Widget_Event_List extends WP_Widget {
<p class="sp-prefs">
<?php _e( 'Columns:', 'sportspress' ); ?><br>
<?php
$the_columns = array();
$the_columns = array();
$the_columns['event'] = __( 'Event', 'sportspress' );
if ( 'combined' === $time_format ) {
@@ -203,20 +258,28 @@ class SP_Widget_Event_List extends WP_Widget {
}
}
$the_columns['venue'] = __( 'Venue', 'sportspress' );
$the_columns['venue'] = __( 'Venue', 'sportspress' );
$the_columns['article'] = __( 'Article', 'sportspress' );
$the_columns['day'] = __( 'Match Day', 'sportspress' );
$the_columns['day'] = __( 'Match Day', 'sportspress' );
$field_name = $this->get_field_name('columns') . '[]';
$field_id = $this->get_field_id('columns');
$field_name = $this->get_field_name( 'columns' ) . '[]';
$field_id = $this->get_field_id( 'columns' );
?>
<?php foreach ( $the_columns as $key => $label ): ?>
<label class="button"><input name="<?php echo $field_name; ?>" type="checkbox" id="<?php echo $field_id . '-' . $key; ?>" value="<?php echo $key; ?>" <?php if ( $columns === null || in_array( $key, $columns ) ): ?>checked="checked"<?php endif; ?>><?php echo $label; ?></label>
<?php foreach ( $the_columns as $key => $label ) : ?>
<label class="button"><input name="<?php echo $field_name; ?>" type="checkbox" id="<?php echo $field_id . '-' . $key; ?>" value="<?php echo $key; ?>"
<?php
if ( $columns === null || in_array( $key, $columns ) ) :
?>
checked="checked"<?php endif; ?>><?php echo $label; ?></label>
<?php endforeach; ?>
</p>
<p class="sp-event-calendar-show-all-toggle<?php if ( ! $id ): ?> hidden<?php endif; ?>"><input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id('show_all_events_link'); ?>" name="<?php echo $this->get_field_name('show_all_events_link'); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?>>
<label for="<?php echo $this->get_field_id('show_all_events_link'); ?>"><?php _e( 'Display link to view all events', 'sportspress' ); ?></label></p>
<p class="sp-event-calendar-show-all-toggle
<?php
if ( ! $id ) :
?>
hidden<?php endif; ?>"><input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id( 'show_all_events_link' ); ?>" name="<?php echo $this->get_field_name( 'show_all_events_link' ); ?>" value="1" <?php checked( $show_all_events_link, 1 ); ?>>
<label for="<?php echo $this->get_field_id( 'show_all_events_link' ); ?>"><?php _e( 'Display link to view all events', 'sportspress' ); ?></label></p>
<?php
// Action to hook into