@@ -140,5 +140,5 @@ |
||
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | add_action( 'widgets_init', function() { |
| 143 | - register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' ); |
|
| 143 | + register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' ); |
|
| 144 | 144 | }); |
| 145 | 145 | \ No newline at end of file |
@@ -26,8 +26,9 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function widget( $args, $instance ) { |
| 28 | 28 | // Fetch the (network)button by it's name |
| 29 | - if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $instance[ 'button' ] ) ) |
|
| 30 | - return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] ); |
|
| 29 | + if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $instance[ 'button' ] ) ) { |
|
| 30 | + return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] ); |
|
| 31 | + } |
|
| 31 | 32 | |
| 32 | 33 | echo $args[ 'before_widget' ]; |
| 33 | 34 | echo $args[ 'before_title' ] . apply_filters( 'widget_title', $instance[ 'title' ] ) . $args[ 'after_title' ]; |
@@ -40,8 +41,9 @@ discard block |
||
| 40 | 41 | \PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'color' ) |
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | - if ( strlen( $instance[ 'infotext' ] ) ) |
|
| 44 | - echo wpautop( $instance[ 'infotext' ] ); |
|
| 44 | + if ( strlen( $instance[ 'infotext' ] ) ) { |
|
| 45 | + echo wpautop( $instance[ 'infotext' ] ); |
|
| 46 | + } |
|
| 45 | 47 | |
| 46 | 48 | echo $args[ 'after_widget' ]; |
| 47 | 49 | } |
@@ -52,8 +54,9 @@ discard block |
||
| 52 | 54 | } |
| 53 | 55 | |
| 54 | 56 | $buttons = \PodloveSubscribeButton\Model\Button::all(); |
| 55 | - if ( is_multisite() ) |
|
| 56 | - $network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all(); |
|
| 57 | + if ( is_multisite() ) { |
|
| 58 | + $network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all(); |
|
| 59 | + } |
|
| 57 | 60 | |
| 58 | 61 | $buttons_as_options = function( $buttons ) { |
| 59 | 62 | foreach ( $buttons as $subscribebutton ) { |
@@ -86,8 +89,10 @@ discard block |
||
| 86 | 89 | <optgroup label="<?php _e( 'Network', 'podlove-subscribe-button' ); ?>"> |
| 87 | 90 | <?php $buttons_as_options( $network_buttons ); ?> |
| 88 | 91 | </optgroup> |
| 89 | - <?php else : |
|
| 92 | + <?php else { |
|
| 93 | + : |
|
| 90 | 94 | $buttons_as_options( $buttons ); |
| 95 | +} |
|
| 91 | 96 | endif; ?> |
| 92 | 97 | </select> |
| 93 | 98 | |
@@ -45,8 +45,9 @@ discard block |
||
| 45 | 45 | * Process form: save/update a format |
| 46 | 46 | */ |
| 47 | 47 | public static function save() { |
| 48 | - if ( null == filter_input( INPUT_GET, 'button' ) ) |
|
| 49 | - return; |
|
| 48 | + if ( null == filter_input( INPUT_GET, 'button' ) ) { |
|
| 49 | + return; |
|
| 50 | + } |
|
| 50 | 51 | |
| 51 | 52 | $post = filter_input_array( INPUT_POST ); |
| 52 | 53 | |
@@ -81,8 +82,9 @@ discard block |
||
| 81 | 82 | * Process form: delete a format |
| 82 | 83 | */ |
| 83 | 84 | public static function delete() { |
| 84 | - if ( null == filter_input( INPUT_GET, 'button' ) ) |
|
| 85 | - return; |
|
| 85 | + if ( null == filter_input( INPUT_GET, 'button' ) ) { |
|
| 86 | + return; |
|
| 87 | + } |
|
| 86 | 88 | |
| 87 | 89 | $button = ( filter_input( INPUT_GET, 'network' ) === '1' ? \PodloveSubscribeButton\Model\NetworkButton::find_by_id( filter_input( INPUT_GET, 'button' ) ) : \PodloveSubscribeButton\Model\Button::find_by_id( filter_input( INPUT_GET, 'button' ) ) ); |
| 88 | 90 | $button->delete(); |
@@ -104,8 +106,9 @@ discard block |
||
| 104 | 106 | } |
| 105 | 107 | |
| 106 | 108 | public static function process_form() { |
| 107 | - if ( null === filter_input( INPUT_GET, 'button' ) ) |
|
| 108 | - return; |
|
| 109 | + if ( null === filter_input( INPUT_GET, 'button' ) ) { |
|
| 110 | + return; |
|
| 111 | + } |
|
| 109 | 112 | |
| 110 | 113 | $action = ( null !== filter_input( INPUT_GET, 'action' ) ? filter_input( INPUT_GET, 'action' ) : null ); |
| 111 | 114 | |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | namespace PodloveSubscribeButton; |
| 3 | 3 | |
| 4 | 4 | if ( ! class_exists( 'WP_List_Table' ) ) { |
| 5 | - require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); |
|
| 5 | + require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); |
|
| 6 | 6 | } |
| 7 | 7 | |
| 8 | 8 | class Button_List_Table extends \WP_List_Table { |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | // Set parent defaults |
| 14 | 14 | parent::__construct( array( |
| 15 | - 'singular' => 'feed', // singular name of the listed records |
|
| 16 | - 'plural' => 'feeds', // plural name of the listed records |
|
| 17 | - 'ajax' => false // does this table support ajax? |
|
| 15 | + 'singular' => 'feed', // singular name of the listed records |
|
| 16 | + 'plural' => 'feeds', // plural name of the listed records |
|
| 17 | + 'ajax' => false // does this table support ajax? |
|
| 18 | 18 | ) ); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | ); |
| 27 | 27 | |
| 28 | 28 | return sprintf( '%1$s %2$s', |
| 29 | - /*$1%s*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>', |
|
| 30 | - /*$3%s*/ $this->row_actions( $actions ) |
|
| 29 | + /*$1%s*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>', |
|
| 30 | + /*$3%s*/ $this->row_actions( $actions ) |
|
| 31 | 31 | ); |
| 32 | 32 | } |
| 33 | 33 | |
@@ -83,9 +83,9 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | // register pagination options & calculations |
| 85 | 85 | $this->set_pagination_args( array( |
| 86 | - 'total_items' => $total_items, |
|
| 87 | - 'per_page' => $per_page, |
|
| 88 | - 'total_pages' => ceil( $total_items / $per_page ) |
|
| 86 | + 'total_items' => $total_items, |
|
| 87 | + 'per_page' => $per_page, |
|
| 88 | + 'total_pages' => ceil( $total_items / $per_page ) |
|
| 89 | 89 | ) ); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -32,8 +32,9 @@ |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | function column_button_preview( $button ) { |
| 35 | - if ( ! $button->feeds ) |
|
| 36 | - return; |
|
| 35 | + if ( ! $button->feeds ) { |
|
| 36 | + return; |
|
| 37 | + } |
|
| 37 | 38 | |
| 38 | 39 | $is_network = is_network_admin(); |
| 39 | 40 | |
@@ -55,8 +55,9 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | function run_database_migrations() { |
| 58 | - if ( get_option( 'podlove_subscribe_button_plugin_database_version' ) >= DATABASE_VERSION ) |
|
| 59 | - return; |
|
| 58 | + if ( get_option( 'podlove_subscribe_button_plugin_database_version' ) >= DATABASE_VERSION ) { |
|
| 59 | + return; |
|
| 60 | + } |
|
| 60 | 61 | |
| 61 | 62 | if ( is_multisite() ) { |
| 62 | 63 | set_time_limit( 0 ); // may take a while, depending on network size |
@@ -74,7 +75,7 @@ discard block |
||
| 74 | 75 | function migrate_for_current_blog() { |
| 75 | 76 | $database_version = get_option( 'podlove_subscribe_button_plugin_database_version' ); |
| 76 | 77 | |
| 77 | - for ( $i = $database_version + 1; $i <= DATABASE_VERSION; $i++ ) { |
|
| 78 | + for ( $i = $database_version + 1; $i <= DATABASE_VERSION; $i++ ) { |
|
| 78 | 79 | \PodloveSubscribeButton\run_migrations_for_version( $i ); |
| 79 | 80 | update_option( 'podlove_subscribe_button_plugin_database_version', $i ); |
| 80 | 81 | } |
@@ -8,8 +8,9 @@ |
||
| 8 | 8 | $plugin = basename( \PodloveSubscribeButton\PLUGIN_DIR ) . '/' . \PodloveSubscribeButton\PLUGIN_FILE_NAME; |
| 9 | 9 | $blogids = $wpdb->get_col( "SELECT blog_id FROM " . $wpdb->blogs ); |
| 10 | 10 | |
| 11 | - if ( ! is_array( $blogids ) ) |
|
| 12 | - return; |
|
| 11 | + if ( ! is_array( $blogids ) ) { |
|
| 12 | + return; |
|
| 13 | + } |
|
| 13 | 14 | |
| 14 | 15 | foreach ( $blogids as $blog_id ) { |
| 15 | 16 | switch_to_blog( $blog_id ); |
@@ -151,8 +151,9 @@ discard block |
||
| 151 | 151 | public static function build_models() { |
| 152 | 152 | // Build Databases |
| 153 | 153 | \PodloveSubscribeButton\Model\Button::build(); |
| 154 | - if ( is_multisite() ) |
|
| 155 | - \PodloveSubscribeButton\Model\NetworkButton::build(); |
|
| 154 | + if ( is_multisite() ) { |
|
| 155 | + \PodloveSubscribeButton\Model\NetworkButton::build(); |
|
| 156 | + } |
|
| 156 | 157 | |
| 157 | 158 | // Set Button "default" values |
| 158 | 159 | $default_values = array( |
@@ -178,8 +179,9 @@ discard block |
||
| 178 | 179 | } |
| 179 | 180 | |
| 180 | 181 | // Fetch the (network)button by it's name |
| 181 | - if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $args[ 'button' ] ) ) |
|
| 182 | - return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] ); |
|
| 182 | + if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $args[ 'button' ] ) ) { |
|
| 183 | + return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] ); |
|
| 184 | + } |
|
| 183 | 185 | |
| 184 | 186 | // Get button styling and options |
| 185 | 187 | $autowidth = self::interpret_width_attribute( self::get_array_value_with_fallback( $args, 'width' ) ); |
@@ -211,8 +213,9 @@ discard block |
||
| 211 | 213 | } |
| 212 | 214 | |
| 213 | 215 | public static function get_array_value_with_fallback( $args, $key ) { |
| 214 | - if ( isset( $args[ $key ] ) ) |
|
| 215 | - return $args[ $key ]; |
|
| 216 | + if ( isset( $args[ $key ] ) ) { |
|
| 217 | + return $args[ $key ]; |
|
| 218 | + } |
|
| 216 | 219 | |
| 217 | 220 | return false; |
| 218 | 221 | } |
@@ -236,10 +239,12 @@ discard block |
||
| 236 | 239 | * @return string |
| 237 | 240 | */ |
| 238 | 241 | private static function interpret_width_attribute( $width_attribute = null ) { |
| 239 | - if ( $width_attribute == 'auto' ) |
|
| 240 | - return 'on'; |
|
| 241 | - if ( $width_attribute && $width_attribute !== 'auto' ) |
|
| 242 | - return 'off'; |
|
| 242 | + if ( $width_attribute == 'auto' ) { |
|
| 243 | + return 'on'; |
|
| 244 | + } |
|
| 245 | + if ( $width_attribute && $width_attribute !== 'auto' ) { |
|
| 246 | + return 'off'; |
|
| 247 | + } |
|
| 243 | 248 | |
| 244 | 249 | return get_option( 'podlove_subscribe_button_default_autowidth', 'on' ); |
| 245 | 250 | } |
@@ -389,14 +389,14 @@ discard block |
||
| 389 | 389 | $this->set_defaults(); |
| 390 | 390 | |
| 391 | 391 | $sql = 'INSERT INTO ' |
| 392 | - . static::table_name() |
|
| 393 | - . ' ( ' |
|
| 394 | - . implode( ',', static::property_names() ) |
|
| 395 | - . ' ) ' |
|
| 396 | - . 'VALUES' |
|
| 397 | - . ' ( ' |
|
| 398 | - . implode( ',', array_map( array( $this, 'property_name_to_sql_value' ), static::property_names() ) ) |
|
| 399 | - . ' );' |
|
| 392 | + . static::table_name() |
|
| 393 | + . ' ( ' |
|
| 394 | + . implode( ',', static::property_names() ) |
|
| 395 | + . ' ) ' |
|
| 396 | + . 'VALUES' |
|
| 397 | + . ' ( ' |
|
| 398 | + . implode( ',', array_map( array( $this, 'property_name_to_sql_value' ), static::property_names() ) ) |
|
| 399 | + . ' );' |
|
| 400 | 400 | ; |
| 401 | 401 | $success = $wpdb->query( $sql ); |
| 402 | 402 | if ( $success ) { |
@@ -404,9 +404,9 @@ discard block |
||
| 404 | 404 | } |
| 405 | 405 | } else { |
| 406 | 406 | $sql = 'UPDATE ' . static::table_name() |
| 407 | - . ' SET ' |
|
| 408 | - . implode( ',', array_map( array( $this, 'property_name_to_sql_update_statement' ), static::property_names() ) ) |
|
| 409 | - . ' WHERE id = ' . $this->id |
|
| 407 | + . ' SET ' |
|
| 408 | + . implode( ',', array_map( array( $this, 'property_name_to_sql_update_statement' ), static::property_names() ) ) |
|
| 409 | + . ' WHERE id = ' . $this->id |
|
| 410 | 410 | ; |
| 411 | 411 | |
| 412 | 412 | $success = $wpdb->query( $sql ); |
@@ -454,13 +454,13 @@ discard block |
||
| 454 | 454 | global $wpdb; |
| 455 | 455 | |
| 456 | 456 | $sql = 'DELETE FROM ' |
| 457 | - . static::table_name() |
|
| 458 | - . ' WHERE id = ' . $this->id; |
|
| 457 | + . static::table_name() |
|
| 458 | + . ' WHERE id = ' . $this->id; |
|
| 459 | 459 | |
| 460 | 460 | $rows_affected = $wpdb->query( $sql ); |
| 461 | 461 | |
| 462 | - do_action( 'podlove_model_delete', $this ); |
|
| 463 | - do_action( 'podlove_model_change', $this ); |
|
| 462 | + do_action( 'podlove_model_delete', $this ); |
|
| 463 | + do_action( 'podlove_model_change', $this ); |
|
| 464 | 464 | |
| 465 | 465 | return $rows_affected !== false; |
| 466 | 466 | } |
@@ -499,10 +499,10 @@ discard block |
||
| 499 | 499 | $property_sql[ ] = "`{$property[ 'name' ]}` {$property[ 'type' ]}"; |
| 500 | 500 | |
| 501 | 501 | $sql = 'CREATE TABLE IF NOT EXISTS ' |
| 502 | - . static::table_name() |
|
| 503 | - . ' (' |
|
| 504 | - . implode( ',', $property_sql ) |
|
| 505 | - . ' ) CHARACTER SET utf8;' |
|
| 502 | + . static::table_name() |
|
| 503 | + . ' (' |
|
| 504 | + . implode( ',', $property_sql ) |
|
| 505 | + . ' ) CHARACTER SET utf8;' |
|
| 506 | 506 | ; |
| 507 | 507 | |
| 508 | 508 | $wpdb->query( $sql ); |
@@ -45,11 +45,13 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | private static function unserialize_property( $property ) { |
| 48 | - if ( ! isset( $property ) ) |
|
| 49 | - return; |
|
| 48 | + if ( ! isset( $property ) ) { |
|
| 49 | + return; |
|
| 50 | + } |
|
| 50 | 51 | |
| 51 | - if ( $unserialized_string = is_serialized( $property ) ) |
|
| 52 | - return unserialize( $property ); |
|
| 52 | + if ( $unserialized_string = is_serialized( $property ) ) { |
|
| 53 | + return unserialize( $property ); |
|
| 54 | + } |
|
| 53 | 55 | |
| 54 | 56 | return $property; |
| 55 | 57 | } |
@@ -319,8 +321,9 @@ discard block |
||
| 319 | 321 | */ |
| 320 | 322 | public function update_attributes( $attributes ) { |
| 321 | 323 | |
| 322 | - if ( ! is_array( $attributes ) ) |
|
| 323 | - return false; |
|
| 324 | + if ( ! is_array( $attributes ) ) { |
|
| 325 | + return false; |
|
| 326 | + } |
|
| 324 | 327 | |
| 325 | 328 | $request = filter_input_array( INPUT_POST ); // Do this for security reasons |
| 326 | 329 | |
@@ -429,12 +432,14 @@ discard block |
||
| 429 | 432 | |
| 430 | 433 | $defaults = $this->default_values(); |
| 431 | 434 | |
| 432 | - if ( ! is_array( $defaults ) || empty( $defaults ) ) |
|
| 433 | - return; |
|
| 435 | + if ( ! is_array( $defaults ) || empty( $defaults ) ) { |
|
| 436 | + return; |
|
| 437 | + } |
|
| 434 | 438 | |
| 435 | 439 | foreach ( $defaults as $property => $value ) { |
| 436 | - if ( $this->$property === null ) |
|
| 437 | - $this->$property = $value; |
|
| 440 | + if ( $this->$property === null ) { |
|
| 441 | + $this->$property = $value; |
|
| 442 | + } |
|
| 438 | 443 | } |
| 439 | 444 | |
| 440 | 445 | } |
@@ -495,8 +500,9 @@ discard block |
||
| 495 | 500 | global $wpdb; |
| 496 | 501 | |
| 497 | 502 | $property_sql = array(); |
| 498 | - foreach ( static::properties() as $property ) |
|
| 499 | - $property_sql[ ] = "`{$property[ 'name' ]}` {$property[ 'type' ]}"; |
|
| 503 | + foreach ( static::properties() as $property ) { |
|
| 504 | + $property_sql[ ] = "`{$property[ 'name' ]}` {$property[ 'type' ]}"; |
|
| 505 | + } |
|
| 500 | 506 | |
| 501 | 507 | $sql = 'CREATE TABLE IF NOT EXISTS ' |
| 502 | 508 | . static::table_name() |
@@ -115,8 +115,9 @@ discard block |
||
| 115 | 115 | 'variant' => 'high' |
| 116 | 116 | ); |
| 117 | 117 | |
| 118 | - if ( isset( $feed[ 'itunesfeedid' ] ) && $feed[ 'itunesfeedid' ] > 0 ) |
|
| 119 | - $new_feed[ 'directory-url-itunes' ] = "https://itunes.apple.com/podcast/id" . $feed[ 'itunesfeedid' ]; |
|
| 118 | + if ( isset( $feed[ 'itunesfeedid' ] ) && $feed[ 'itunesfeedid' ] > 0 ) { |
|
| 119 | + $new_feed[ 'directory-url-itunes' ] = "https://itunes.apple.com/podcast/id" . $feed[ 'itunesfeedid' ]; |
|
| 120 | + } |
|
| 120 | 121 | |
| 121 | 122 | $feeds[ ] = $new_feed; |
| 122 | 123 | } |
@@ -177,11 +178,13 @@ discard block |
||
| 177 | 178 | * @return string |
| 178 | 179 | */ |
| 179 | 180 | private static function interpret_autowidth_attribute( $autowidth ) { |
| 180 | - if ( $autowidth == 'default' && get_option( 'podlove_subscribe_button_default_autowidth' ) !== 'on' ) |
|
| 181 | - return ''; |
|
| 181 | + if ( $autowidth == 'default' && get_option( 'podlove_subscribe_button_default_autowidth' ) !== 'on' ) { |
|
| 182 | + return ''; |
|
| 183 | + } |
|
| 182 | 184 | |
| 183 | - if ( $autowidth !== 'default' && $autowidth !== 'on' ) |
|
| 184 | - return ''; |
|
| 185 | + if ( $autowidth !== 'default' && $autowidth !== 'on' ) { |
|
| 186 | + return ''; |
|
| 187 | + } |
|
| 185 | 188 | |
| 186 | 189 | return ' auto'; |
| 187 | 190 | } |