podlove / podlove-subscribe-button-wp-plugin

podlove.php

Braces +17 added lines, -11 removed lines

@@ -39,8 +39,9 @@ 
 require('helper.php');
 
 add_action( 'admin_menu', array( 'PodloveSubscribeButton', 'admin_menu') );
-if ( is_multisite() )
+if ( is_multisite() ) {
 	add_action( 'network_admin_menu', array( 'PodloveSubscribeButton', 'admin_network_menu') );
+}
 
 add_action( 'admin_init', array( 'PodloveSubscribeButton\Settings\Buttons', 'process_form' ) );
 register_activation_hook( __FILE__, array( 'PodloveSubscribeButton', 'build_models' ) );
@@ -121,8 +122,9 @@ 
 	public static function build_models() {
 		// Build Databases
 		\PodloveSubscribeButton\Model\Button::build();
-		if ( is_multisite() )
-			\PodloveSubscribeButton\Model\NetworkButton::build();
+		if ( is_multisite() ) {
+					\PodloveSubscribeButton\Model\NetworkButton::build();
+		}
 
 		// Set Button "default" values
 		$default_values = array(
@@ -148,8 +150,9 @@ 
 		}
 
 		// Fetch the (network)button by it's name
-		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($args['button']) )
-			return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($args['button']) ) {
+					return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		}
 
 		// Get button styling and options
 		$autowidth = self::interpret_width_attribute( self::get_array_value_with_fallback($args, 'width') );
@@ -181,8 +184,9 @@ 
 	}
 
 	public static function get_array_value_with_fallback($args, $key) {
-		if ( isset($args[$key]) )
-			return $args[$key];
+		if ( isset($args[$key]) ) {
+					return $args[$key];
+		}
 
 		return false;
 	}
@@ -206,10 +210,12 @@ 
 	 * @return string
 	 */
 	private static function interpret_width_attribute( $width_attribute = null ) {
-		if ( $width_attribute == 'auto' )
-			return 'on';
-		if ( $width_attribute && $width_attribute !== 'auto' )
-			return 'off';
+		if ( $width_attribute == 'auto' ) {
+					return 'on';
+		}
+		if ( $width_attribute && $width_attribute !== 'auto' ) {
+					return 'off';
+		}
 
 		return get_option('podlove_subscribe_button_default_autowidth', 'on');
 	}

Spacing +46 added lines, -46 removed lines

@@ -22,32 +22,32 @@ 
 }
 
 // Constants
-require('constants.php');
-require('settings/buttons.php');
+require( 'constants.php' );
+require( 'settings/buttons.php' );
 // Models
-require('model/base.php');
-require('model/button.php');
-require('model/network_button.php');
+require( 'model/base.php' );
+require( 'model/button.php' );
+require( 'model/network_button.php' );
 // Table
-require('settings/buttons_list_table.php');
+require( 'settings/buttons_list_table.php' );
 // Media Types
-require('media_types.php');
+require( 'media_types.php' );
 // Widget
-require('widget.php');
+require( 'widget.php' );
 // Version control
-require('version.php');
+require( 'version.php' );
 // Helper functions
-require('helper.php');
+require( 'helper.php' );
 
-add_action( 'admin_menu', array( 'PodloveSubscribeButton', 'admin_menu') );
+add_action( 'admin_menu', array( 'PodloveSubscribeButton', 'admin_menu' ) );
 if ( is_multisite() )
-	add_action( 'network_admin_menu', array( 'PodloveSubscribeButton', 'admin_network_menu') );
+	add_action( 'network_admin_menu', array( 'PodloveSubscribeButton', 'admin_network_menu' ) );
 
 add_action( 'admin_init', array( 'PodloveSubscribeButton\Settings\Buttons', 'process_form' ) );
 register_activation_hook( __FILE__, array( 'PodloveSubscribeButton', 'build_models' ) );
 
 // Register Settings
-add_action( 'admin_init', function () {
+add_action( 'admin_init', function() {
 	$settings = array( 'size', 'autowidth', 'style', 'format', 'color' );
 
 	foreach ( $settings as $setting ) {
@@ -64,8 +64,8 @@ 
 
 add_shortcode( 'podlove-subscribe-button', array( 'PodloveSubscribeButton', 'shortcode' ) );
 
-add_action( 'plugins_loaded', function () {
-	load_plugin_textdomain( 'podlove-subscribe-button', false, dirname(plugin_basename( __FILE__)) . '/languages/');
+add_action( 'plugins_loaded', function() {
+	load_plugin_textdomain( 'podlove-subscribe-button', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 } );
 
 PodloveSubscribeButton::run();
@@ -81,7 +81,7 @@ 
 
 		$pages = array( 'settings_page_podlove-subscribe-button', 'widgets.php' );
 
-		if ( ! in_array( $hook, $pages )  ) {
+		if ( ! in_array( $hook, $pages ) ) {
 			return;
 		}
 
@@ -107,7 +107,7 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
@@ -118,7 +118,7 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
@@ -137,56 +137,56 @@ 
 				'format' => 'rectangle'
 			);
 
-		foreach ($default_values as $option => $default_value) {
-			if ( ! get_option('podlove_subscribe_button_default_' . $option ) ) {
-				update_option('podlove_subscribe_button_default_' . $option, $default_value);
+		foreach ( $default_values as $option => $default_value ) {
+			if ( ! get_option( 'podlove_subscribe_button_default_' . $option ) ) {
+				update_option( 'podlove_subscribe_button_default_' . $option, $default_value );
 			}
 		}
 	}
 
 	public static function shortcode( $args ) {
-		if ( ! $args || ! isset($args['button']) ) {
-			return __('You need to create a Button first and provide its ID.', 'podlove-subscribe-button');
+		if ( ! $args || ! isset( $args[ 'button' ] ) ) {
+			return __( 'You need to create a Button first and provide its ID.', 'podlove-subscribe-button' );
 		} else {
-			$buttonid = $args['button'];
+			$buttonid = $args[ 'button' ];
 		}
 
 		// Fetch the (network)button by it's name
-		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($args['button']) )
-			return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $args[ 'button' ] ) )
+			return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] );
 
 		// Get button styling and options
-		$autowidth = self::interpret_width_attribute( self::get_array_value_with_fallback($args, 'width') );
-		$size = self::get_attribute( 'size', self::get_array_value_with_fallback($args, 'size') );
-		$style = self::get_attribute( 'style', self::get_array_value_with_fallback($args, 'style') );
-		$format = self::get_attribute( 'format', self::get_array_value_with_fallback($args, 'format') );
-		$color = self::get_attribute( 'color', self::get_array_value_with_fallback($args, 'color') );
-
-		if ( isset($args['language']) ) {
-			$language = $args['language'];
+		$autowidth = self::interpret_width_attribute( self::get_array_value_with_fallback( $args, 'width' ) );
+		$size = self::get_attribute( 'size', self::get_array_value_with_fallback( $args, 'size' ) );
+		$style = self::get_attribute( 'style', self::get_array_value_with_fallback( $args, 'style' ) );
+		$format = self::get_attribute( 'format', self::get_array_value_with_fallback( $args, 'format' ) );
+		$color = self::get_attribute( 'color', self::get_array_value_with_fallback( $args, 'color' ) );
+
+		if ( isset( $args[ 'language' ] ) ) {
+			$language = $args[ 'language' ];
 		} else {
 			$language = 'en';
 		}
 
-		if ( isset($args['color']) ) {
-			$color = $args['color'];
+		if ( isset( $args[ 'color' ] ) ) {
+			$color = $args[ 'color' ];
 		} else {
-			$color = get_option('podlove_subscribe_button_default_color', '#599677');
+			$color = get_option( 'podlove_subscribe_button_default_color', '#599677' );
 		}
 
-		if ( isset($args['hide']) && $args['hide'] == 'true' ) {
+		if ( isset( $args[ 'hide' ] ) && $args[ 'hide' ] == 'true' ) {
 			$hide = true;
 		} else {
 			$hide = false;
 		}
 
 		// Render button
-		return $button->render($size, $autowidth, $style, $format, $color, $hide, $buttonid, $language);
+		return $button->render( $size, $autowidth, $style, $format, $color, $hide, $buttonid, $language );
 	}
 
-	public static function get_array_value_with_fallback($args, $key) {
-		if ( isset($args[$key]) )
-			return $args[$key];
+	public static function get_array_value_with_fallback( $args, $key ) {
+		if ( isset( $args[ $key ] ) )
+			return $args[ $key ];
 
 		return false;
 	}
@@ -196,11 +196,11 @@ 
 	 * @param  string $attribute_value
 	 * @return string
 	 */
-	private static function get_attribute($attribute=null, $attribute_value=null) {
-		if ( isset($attribute_value) && ctype_alnum($attribute_value) && key_exists( $attribute_value, \PodloveSubscribeButton\Model\Button::$$attribute ) ) {
+	private static function get_attribute( $attribute = null, $attribute_value = null ) {
+		if ( isset( $attribute_value ) && ctype_alnum( $attribute_value ) && key_exists( $attribute_value, \PodloveSubscribeButton\Model\Button::$$attribute ) ) {
 			return $attribute_value;
 		} else {
-			return get_option('podlove_subscribe_button_default_' . $attribute, \PodloveSubscribeButton\Model\Button::$properties[$attribute]);
+			return get_option( 'podlove_subscribe_button_default_' . $attribute, \PodloveSubscribeButton\Model\Button::$properties[ $attribute ] );
 		}
 	}
 
@@ -215,7 +215,7 @@ 
 		if ( $width_attribute && $width_attribute !== 'auto' )
 			return 'off';
 
-		return get_option('podlove_subscribe_button_default_autowidth', 'on');
+		return get_option( 'podlove_subscribe_button_default_autowidth', 'on' );
 	}
 
 	public static function sanitize_settings( $input = null ) {

widget.php

Indentation +11 added lines, -11 removed lines

@@ -48,14 +48,14 @@ 
 
 	public function form( $instance ) {
 
-        $title     = isset( $instance[ 'title' ] )     ? $instance[ 'title' ]     : '';
-        $button = isset( $instance[ 'button' ] )    ? $instance[ 'button' ]    : '';
-        $size      = isset( $instance[ 'size' ] )      ? $instance[ 'size' ]      : 'big';
-        $style     = isset( $instance[ 'style' ] )     ? $instance[ 'style' ]     : 'filled';
-        $format    = isset( $instance[ 'format' ] )    ? $instance[ 'format' ]    : 'cover';
-        $autowidth = isset( $instance[ 'autowidth' ] ) ? $instance[ 'autowidth' ] : true;
-        $infotext  = isset( $instance[ 'infotext' ] )  ? $instance[ 'infotext' ]  : '';
-        $color     = isset( $instance[ 'color' ] )     ? $instance[ 'color' ]     : '#75ad91';
+		$title     = isset( $instance[ 'title' ] )     ? $instance[ 'title' ]     : '';
+		$button = isset( $instance[ 'button' ] )    ? $instance[ 'button' ]    : '';
+		$size      = isset( $instance[ 'size' ] )      ? $instance[ 'size' ]      : 'big';
+		$style     = isset( $instance[ 'style' ] )     ? $instance[ 'style' ]     : 'filled';
+		$format    = isset( $instance[ 'format' ] )    ? $instance[ 'format' ]    : 'cover';
+		$autowidth = isset( $instance[ 'autowidth' ] ) ? $instance[ 'autowidth' ] : true;
+		$infotext  = isset( $instance[ 'infotext' ] )  ? $instance[ 'infotext' ]  : '';
+		$color     = isset( $instance[ 'color' ] )     ? $instance[ 'color' ]     : '#75ad91';
 
 		$buttons = \PodloveSubscribeButton\Model\Button::all();
 		if ( is_multisite() )
@@ -85,14 +85,14 @@ 
 						foreach ($buttons as $subscribebutton) {
 							echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
 						}
-                        ?>
+						?>
                     </optgroup>
                     <optgroup label="<?php _e('Network', 'podlove'); ?>">
 						<?php
 						foreach ($network_buttons as $subscribebutton) {
 							echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
 						}
-                        ?>
+						?>
                     </optgroup>
 				<?php else :
 					foreach ($buttons as $subscribebutton) {
@@ -150,5 +150,5 @@ 
 	}
 }
 add_action( 'widgets_init', function(){
-     register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
+	 register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
 });

Spacing +40 added lines, -40 removed lines

@@ -10,14 +10,14 @@ 
 		parent::__construct(
 					'podlove_subscribe_button_wp_plugin_widget',
 					( self::is_podlove_publisher_active() ? 'Podlove Subscribe Button (WordPress plugin)' : 'Podlove Subscribe Button' ),
-					array( 'description' => __( 'Adds a Podlove Subscribe Button to your Sidebar', 'podlove-subscribe-button' ), )
+					array( 'description' => __( 'Adds a Podlove Subscribe Button to your Sidebar', 'podlove-subscribe-button' ),)
 				);
 	}
 
-	public static $widget_settings = array('infotext', 'title', 'size', 'style', 'format', 'autowidth', 'button', 'color');
+	public static $widget_settings = array( 'infotext', 'title', 'size', 'style', 'format', 'autowidth', 'button', 'color' );
 
 	public static function is_podlove_publisher_active() {
-		if ( is_plugin_active("podlove-podcasting-plugin-for-wordpress/podlove.php") ) {
+		if ( is_plugin_active( "podlove-podcasting-plugin-for-wordpress/podlove.php" ) ) {
 			return true;
 		}
 
@@ -26,36 +26,36 @@ 
 
 	public function widget( $args, $instance ) {
 		// Fetch the (network)button by it's name
-		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($instance['button']) )
-			return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name( $instance[ 'button' ] ) )
+			return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] );
 
-		echo $args['before_widget'];
-		echo $args['before_title'] . apply_filters( 'widget_title', $instance['title'] ). $args['after_title'];
+		echo $args[ 'before_widget' ];
+		echo $args[ 'before_title' ] . apply_filters( 'widget_title', $instance[ 'title' ] ) . $args[ 'after_title' ];
 
 		echo $button->render(
-				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'size'),
-				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'autowidth'),
-				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'style'),
-				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'format'),
-				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'color')
+				\PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'size' ),
+				\PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'autowidth' ),
+				\PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'style' ),
+				\PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'format' ),
+				\PodloveSubscribeButton::get_array_value_with_fallback( $instance, 'color' )
 			);
 
-		if ( strlen($instance['infotext']) )
-			echo wpautop($instance['infotext']);
+		if ( strlen( $instance[ 'infotext' ] ) )
+			echo wpautop( $instance[ 'infotext' ] );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	public function form( $instance ) {
 
-        $title     = isset( $instance[ 'title' ] )     ? $instance[ 'title' ]     : '';
-        $button = isset( $instance[ 'button' ] )    ? $instance[ 'button' ]    : '';
-        $size      = isset( $instance[ 'size' ] )      ? $instance[ 'size' ]      : 'big';
-        $style     = isset( $instance[ 'style' ] )     ? $instance[ 'style' ]     : 'filled';
-        $format    = isset( $instance[ 'format' ] )    ? $instance[ 'format' ]    : 'cover';
+        $title     = isset( $instance[ 'title' ] ) ? $instance[ 'title' ] : '';
+        $button = isset( $instance[ 'button' ] ) ? $instance[ 'button' ] : '';
+        $size      = isset( $instance[ 'size' ] ) ? $instance[ 'size' ] : 'big';
+        $style     = isset( $instance[ 'style' ] ) ? $instance[ 'style' ] : 'filled';
+        $format    = isset( $instance[ 'format' ] ) ? $instance[ 'format' ] : 'cover';
         $autowidth = isset( $instance[ 'autowidth' ] ) ? $instance[ 'autowidth' ] : true;
-        $infotext  = isset( $instance[ 'infotext' ] )  ? $instance[ 'infotext' ]  : '';
-        $color     = isset( $instance[ 'color' ] )     ? $instance[ 'color' ]     : '#75ad91';
+        $infotext  = isset( $instance[ 'infotext' ] ) ? $instance[ 'infotext' ] : '';
+        $color     = isset( $instance[ 'color' ] ) ? $instance[ 'color' ] : '#75ad91';
 
 		$buttons = \PodloveSubscribeButton\Model\Button::all();
 		if ( is_multisite() )
@@ -63,10 +63,10 @@ 
 		?>
         <p>
             <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title', 'podlove-subscribe-button' ); ?></label>
-            <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr($title); ?>" />
+            <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>" />
 
             <label for="<?php echo $this->get_field_id( 'color' ); ?>"><?php _e( 'Color', 'podlove-subscribe-button' ); ?></label>
-            <input class="podlove_subscribe_button_color" id="<?php echo $this->get_field_id( 'color' ); ?>" name="<?php echo $this->get_field_name( 'color' ); ?>" value="<?php echo esc_attr($color); ?>" />
+            <input class="podlove_subscribe_button_color" id="<?php echo $this->get_field_id( 'color' ); ?>" name="<?php echo $this->get_field_name( 'color' ); ?>" value="<?php echo esc_attr( $color ); ?>" />
             <style type="text/css">
                 .sp-replacer {
                     display: flex;
@@ -79,24 +79,24 @@ 
             <label for="<?php echo $this->get_field_id( 'button' ); ?>"><?php _e( 'Button', 'podlove-subscribe-button' ); ?></label>
             <select class="widefat" id="<?php echo $this->get_field_id( 'button' ); ?>"
                     name="<?php echo $this->get_field_name( 'button' ); ?>">
-				<?php if ( isset($network_buttons) && count($network_buttons) > 0 ) : ?>
-                    <optgroup label="<?php _e('Local', 'podlove'); ?>">
+				<?php if ( isset( $network_buttons ) && count( $network_buttons ) > 0 ) : ?>
+                    <optgroup label="<?php _e( 'Local', 'podlove' ); ?>">
 						<?php
-						foreach ($buttons as $subscribebutton) {
-							echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
+						foreach ( $buttons as $subscribebutton ) {
+							echo "<option value='" . sanitize_title( $subscribebutton->name ) . "' " . selected( sanitize_title( $subscribebutton->name ), $button ) . " >" . sanitize_title( $subscribebutton->title ) . " (" . sanitize_title( $subscribebutton->name ) . ")</option>";
 						}
                         ?>
                     </optgroup>
-                    <optgroup label="<?php _e('Network', 'podlove'); ?>">
+                    <optgroup label="<?php _e( 'Network', 'podlove' ); ?>">
 						<?php
-						foreach ($network_buttons as $subscribebutton) {
-							echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
+						foreach ( $network_buttons as $subscribebutton ) {
+							echo "<option value='" . sanitize_title( $subscribebutton->name ) . "' " . selected( sanitize_title( $subscribebutton->name ), $button ) . " >" . sanitize_title( $subscribebutton->title ) . " (" . sanitize_title( $subscribebutton->name ) . ")</option>";
 						}
                         ?>
                     </optgroup>
 				<?php else :
-					foreach ($buttons as $subscribebutton) {
-						echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
+					foreach ( $buttons as $subscribebutton ) {
+						echo "<option value='" . sanitize_title( $subscribebutton->name ) . "' " . selected( sanitize_title( $subscribebutton->name ), $button ) . " >" . sanitize_title( $subscribebutton->title ) . " (" . sanitize_title( $subscribebutton->name ) . ")</option>";
 					}
 				endif; ?>
             </select>
@@ -121,12 +121,12 @@ 
 				)
 			);
 
-			foreach ($customize_options as $slug => $properties) : ?>
-				<label for="<?php echo $this->get_field_id( $slug ); ?>"><?php echo $properties['name']; ?></label>
+			foreach ( $customize_options as $slug => $properties ) : ?>
+				<label for="<?php echo $this->get_field_id( $slug ); ?>"><?php echo $properties[ 'name' ]; ?></label>
 				<select class="widefat" id="<?php echo $this->get_field_id( $slug ); ?>" name="<?php echo $this->get_field_name( $slug ); ?>">
-					<option value="default" <?php echo ( $$slug == 'default' ? 'selected="selected"' : '' ); ?>><?php printf( __( 'Default %s', 'podlove-subscribe-button' ), $properties['name'] ) ?></option>
+					<option value="default" <?php echo ( $$slug == 'default' ? 'selected="selected"' : '' ); ?>><?php printf( __( 'Default %s', 'podlove-subscribe-button' ), $properties[ 'name' ] ) ?></option>
 					<optgroup>
-						<?php foreach ( $properties['options'] as $property => $name ) : ?>
+						<?php foreach ( $properties[ 'options' ] as $property => $name ) : ?>
 						<option value="<?php echo $property; ?>" <?php echo ( $$slug == $property ? 'selected="selected"' : '' ); ?>><?php echo $name; ?></option>
 						<?php endforeach; ?>
 					</optgroup>
@@ -142,13 +142,13 @@ 
 	public function update( $new_instance, $old_instance ) {
 		$instance = array();
 
-		foreach (self::$widget_settings as $setting) {
-			$instance[$setting]  = ( ! empty( $new_instance[$setting] ) ) ? strip_tags( $new_instance[$setting] ) : '';
+		foreach ( self::$widget_settings as $setting ) {
+			$instance[ $setting ] = ( ! empty( $new_instance[ $setting ] ) ) ? strip_tags( $new_instance[ $setting ] ) : '';
 		}
 
 		return $instance;
 	}
 }
-add_action( 'widgets_init', function(){
+add_action( 'widgets_init', function() {
      register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
 });

Braces +13 added lines, -8 removed lines

@@ -26,8 +26,9 @@ 
 
 	public function widget( $args, $instance ) {
 		// Fetch the (network)button by it's name
-		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($instance['button']) )
-			return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		if ( ! $button = \PodloveSubscribeButton\Model\Button::get_button_by_name($instance['button']) ) {
+					return sprintf( __('Oops. There is no button with the ID "%s".', 'podlove-subscribe-button'), $args['button'] );
+		}
 
 		echo $args['before_widget'];
 		echo $args['before_title'] . apply_filters( 'widget_title', $instance['title'] ). $args['after_title'];
@@ -40,8 +41,9 @@ 
 				\PodloveSubscribeButton::get_array_value_with_fallback($instance, 'color')
 			);
 
-		if ( strlen($instance['infotext']) )
-			echo wpautop($instance['infotext']);
+		if ( strlen($instance['infotext']) ) {
+					echo wpautop($instance['infotext']);
+		}
 
 		echo $args['after_widget'];
 	}
@@ -58,8 +60,9 @@ 
         $color     = isset( $instance[ 'color' ] )     ? $instance[ 'color' ]     : '#75ad91';
 
 		$buttons = \PodloveSubscribeButton\Model\Button::all();
-		if ( is_multisite() )
-			$network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all();
+		if ( is_multisite() ) {
+					$network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all();
+		}
 		?>
         <p>
             <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title', 'podlove-subscribe-button' ); ?></label>
@@ -94,9 +97,11 @@ 
 						}
                         ?>
                     </optgroup>
-				<?php else :
+				<?php else {
+	:
 					foreach ($buttons as $subscribebutton) {
 						echo "<option value='" . sanitize_title($subscribebutton->name) . "' " . selected( sanitize_title($subscribebutton->name), $button ) . " >" . sanitize_title($subscribebutton->title) . " (" . sanitize_title($subscribebutton->name) . ")</option>";
+}
 					}
 				endif; ?>
             </select>
@@ -149,6 +154,6 @@ 
 		return $instance;
 	}
 }
-add_action( 'widgets_init', function(){
+add_action( 'widgets_init', function() {
      register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
 });

model/button.php

Spacing +33 added lines, -33 removed lines

@@ -43,12 +43,12 @@ 
 	 * @param  string $name
 	 * @return object||FALSE
 	 */
-	public static function get_button_by_name($name) {
-		if ( $button = \PodloveSubscribeButton\Model\Button::find_one_by_property('name', $name) ) {
+	public static function get_button_by_name( $name ) {
+		if ( $button = \PodloveSubscribeButton\Model\Button::find_one_by_property( 'name', $name ) ) {
 			return $button;
 		}
 
-		if ( $network_button = \PodloveSubscribeButton\Model\NetworkButton::find_one_by_property('name', $name) ) {
+		if ( $network_button = \PodloveSubscribeButton\Model\NetworkButton::find_one_by_property( 'name', $name ) ) {
 			$network_button->id = $network_button->id . 'N';
 			return $network_button;
 		}
@@ -61,9 +61,9 @@ 
 	 * @param  array
 	 * @return array
 	 */
-	public static function get_global_setting_with_fallback( $settings=array() ) {
-		foreach (self::$properties as $property => $default) {
-			$settings[$property] = ( get_option('podlove_subscribe_button_default_' . $property) ? get_option('podlove_subscribe_button_default_' . $property) : $default );
+	public static function get_global_setting_with_fallback( $settings = array() ) {
+		foreach ( self::$properties as $property => $default ) {
+			$settings[ $property ] = ( get_option( 'podlove_subscribe_button_default_' . $property ) ? get_option( 'podlove_subscribe_button_default_' . $property ) : $default );
 		}
 
 		return $settings;
@@ -79,9 +79,9 @@ 
 	 * @param  boolean $hide
 	 * @return string
 	 */
-	public function render( $size='big', $autowidth='on', $style='filled', $format='rectangle', $color='#599677', $hide = false, $buttonid = false, $language='en' ) {
+	public function render( $size = 'big', $autowidth = 'on', $style = 'filled', $format = 'rectangle', $color = '#599677', $hide = false, $buttonid = false, $language = 'en' ) {
 		$button_styling = array_merge(
-				$this->get_button_styling($size, $autowidth, $style, $format, $color),
+				$this->get_button_styling( $size, $autowidth, $style, $format, $color ),
 				array(
 						'hide' => $hide,
 						'language' => $language
@@ -90,11 +90,11 @@ 
 
 		return $this->provide_button_html(
 			array(
-				'title' => sanitize_text_field($this->title),
-				'subtitle' => sanitize_text_field($this->subtitle),
-				'description' => sanitize_textarea_field($this->description),
-				'cover' => sanitize_text_field($this->cover),
-				'feeds' => $this->get_feeds_as_array($this->feeds)
+				'title' => sanitize_text_field( $this->title ),
+				'subtitle' => sanitize_text_field( $this->subtitle ),
+				'description' => sanitize_textarea_field( $this->description ),
+				'cover' => sanitize_text_field( $this->cover ),
+				'feeds' => $this->get_feeds_as_array( $this->feeds )
 			), $button_styling );
 	}
 
@@ -102,25 +102,25 @@ 
 	 * Provides the feed as an array in the required format
 	 * @return array
 	 */
-	private function get_feeds_as_array( $feeds=array() ) {
+	private function get_feeds_as_array( $feeds = array() ) {
 		$returnedFeeds = array();
 
-		if (! $feeds)
+		if ( ! $feeds )
 			return $returnedFeeds;
 
-		foreach ($feeds as $feed) {
-			if ( isset(\PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension']) ) {
+		foreach ( $feeds as $feed ) {
+			if ( isset( \PodloveSubscribeButton\MediaTypes::$audio[ $feed[ 'format' ] ][ 'extension' ] ) ) {
 				$new_feed = array(
 						'type' => 'audio',
-						'format' => \PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension'],
-						'url' => $feed['url'],
+						'format' => \PodloveSubscribeButton\MediaTypes::$audio[ $feed[ 'format' ] ][ 'extension' ],
+						'url' => $feed[ 'url' ],
 						'variant' => 'high'
 					);
 
-				if ( isset($feed['itunesfeedid']) && $feed['itunesfeedid'] > 0 )
-					$new_feed['directory-url-itunes'] = "https://itunes.apple.com/podcast/id" . $feed['itunesfeedid'];
+				if ( isset( $feed[ 'itunesfeedid' ] ) && $feed[ 'itunesfeedid' ] > 0 )
+					$new_feed[ 'directory-url-itunes' ] = "https://itunes.apple.com/podcast/id" . $feed[ 'itunesfeedid' ];
 
-				$returnedFeeds[] = $new_feed;
+				$returnedFeeds[ ] = $new_feed;
 			}
 		}
 
@@ -134,15 +134,15 @@ 
 	 * @param  string $data_attributes
 	 * @return string
 	 */
-	private function provide_button_html($podcast_data, $button_styling, $data_attributes="") {
+	private function provide_button_html( $podcast_data, $button_styling, $data_attributes = "" ) {
 		// Create data attributes for Button
-		foreach ($button_styling as $attribute => $value) {
+		foreach ( $button_styling as $attribute => $value ) {
 			$data_attributes .= 'data-' . $attribute . '="' . $value . '" ';
 		}
 
 		return"
 			<script>
-				podcastData".$this->id . " = ".json_encode($podcast_data)."
+				podcastData".$this->id . " = " . json_encode( $podcast_data ) . "
 			</script>
 			<script
 				class=\"podlove-subscribe-button\"
@@ -160,15 +160,15 @@ 
 	 * @param  string $color
 	 * @return array
 	 */
-	public function get_button_styling($size, $autowidth, $style, $format, $color) {
+	public function get_button_styling( $size, $autowidth, $style, $format, $color ) {
 
 		return array(
 				// $attribute => $value
-				'size' => ( $size == 'default' ? get_option('podlove_subscribe_button_default_size', $size) : $size )
-			 	. self::interpret_autowidth_attribute($autowidth),
-				'style' => ( $style == 'default' ? get_option('podlove_subscribe_button_default_style', $style) : $style ),
-				'format' => ( $format == 'default' ? get_option('podlove_subscribe_button_default_format', $format) : $format ),
-				'color' => ( isset($color) ? $color : get_option('podlove_subscribe_button_default_color', $color) ),
+				'size' => ( $size == 'default' ? get_option( 'podlove_subscribe_button_default_size', $size ) : $size )
+			 	. self::interpret_autowidth_attribute( $autowidth ),
+				'style' => ( $style == 'default' ? get_option( 'podlove_subscribe_button_default_style', $style ) : $style ),
+				'format' => ( $format == 'default' ? get_option( 'podlove_subscribe_button_default_format', $format ) : $format ),
+				'color' => ( isset( $color ) ? $color : get_option( 'podlove_subscribe_button_default_color', $color ) ),
 				'json-data' => 'podcastData' . $this->id
 			);
 	}
@@ -178,8 +178,8 @@ 
 	 * @param  string $autowidth
 	 * @return string
 	 */
-	private static function interpret_autowidth_attribute($autowidth) {
-		if ( $autowidth == 'default' && get_option('podlove_subscribe_button_default_autowidth') !== 'on' )
+	private static function interpret_autowidth_attribute( $autowidth ) {
+		if ( $autowidth == 'default' && get_option( 'podlove_subscribe_button_default_autowidth' ) !== 'on' )
 			return '';
 
 		if ( $autowidth !== 'default' && $autowidth !== 'on' )

Braces +12 added lines, -8 removed lines

@@ -105,8 +105,9 @@ 
 	private function get_feeds_as_array( $feeds=array() ) {
 		$returnedFeeds = array();
 
-		if (! $feeds)
-			return $returnedFeeds;
+		if (! $feeds) {
+					return $returnedFeeds;
+		}
 
 		foreach ($feeds as $feed) {
 			if ( isset(\PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension']) ) {
@@ -117,8 +118,9 @@ 
 						'variant' => 'high'
 					);
 
-				if ( isset($feed['itunesfeedid']) && $feed['itunesfeedid'] > 0 )
-					$new_feed['directory-url-itunes'] = "https://itunes.apple.com/podcast/id" . $feed['itunesfeedid'];
+				if ( isset($feed['itunesfeedid']) && $feed['itunesfeedid'] > 0 ) {
+									$new_feed['directory-url-itunes'] = "https://itunes.apple.com/podcast/id" . $feed['itunesfeedid'];
+				}
 
 				$returnedFeeds[] = $new_feed;
 			}
@@ -179,11 +181,13 @@ 
 	 * @return string
 	 */
 	private static function interpret_autowidth_attribute($autowidth) {
-		if ( $autowidth == 'default' && get_option('podlove_subscribe_button_default_autowidth') !== 'on' )
-			return '';
+		if ( $autowidth == 'default' && get_option('podlove_subscribe_button_default_autowidth') !== 'on' ) {
+					return '';
+		}
 
-		if ( $autowidth !== 'default' && $autowidth !== 'on' )
-			return '';
+		if ( $autowidth !== 'default' && $autowidth !== 'on' ) {
+					return '';
+		}
 
 		return ' auto';
 	}

settings/buttons_list_table.php

Indentation +9 added lines, -9 removed lines

@@ -2,7 +2,7 @@ 
 namespace PodloveSubscribeButton;
 
 if( ! class_exists( 'WP_List_Table' ) ){
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 class Button_List_Table extends \WP_List_Table {
@@ -12,9 +12,9 @@ 
 
 		// Set parent defaults
 		parent::__construct( array(
-		    'singular'  => 'feed',   // singular name of the listed records
-		    'plural'    => 'feeds',  // plural name of the listed records
-		    'ajax'      => false  // does this table support ajax?
+			'singular'  => 'feed',   // singular name of the listed records
+			'plural'    => 'feeds',  // plural name of the listed records
+			'ajax'      => false  // does this table support ajax?
 		) );
 	}
 
@@ -26,8 +26,8 @@ 
 		);
 
 		return sprintf('%1$s %2$s',
-		    /*$1%s*/ sanitize_title($button->title) . '<br><code>[podlove-subscribe-button button="' . sanitize_text_field($button->name) . '"]</code>',
-		    /*$3%s*/ $this->row_actions( $actions )
+			/*$1%s*/ sanitize_title($button->title) . '<br><code>[podlove-subscribe-button button="' . sanitize_text_field($button->name) . '"]</code>',
+			/*$3%s*/ $this->row_actions( $actions )
 		);
 	}
 
@@ -89,9 +89,9 @@ 
 
 		// register pagination options & calculations
 		$this->set_pagination_args( array(
-		    'total_items' => $total_items,
-		    'per_page'    => $per_page,
-		    'total_pages' => ceil( $total_items / $per_page )
+			'total_items' => $total_items,
+			'per_page'    => $per_page,
+			'total_pages' => ceil( $total_items / $per_page )
 		) );
 	}
 

Spacing +8 added lines, -8 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 namespace PodloveSubscribeButton;
 
-if( ! class_exists( 'WP_List_Table' ) ){
+if ( ! class_exists( 'WP_List_Table' ) ) {
     require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 class Button_List_Table extends \WP_List_Table {
 
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
 		parent::__construct( array(
-		    'singular'  => 'feed',   // singular name of the listed records
-		    'plural'    => 'feeds',  // plural name of the listed records
+		    'singular'  => 'feed', // singular name of the listed records
+		    'plural'    => 'feeds', // plural name of the listed records
 		    'ajax'      => false  // does this table support ajax?
 		) );
 	}
@@ -25,8 +25,8 @@ 
 			'delete' => Settings\Buttons::get_action_link( $button, __( 'Delete', 'podlove-subscribe-button' ), 'confirm_delete' )
 		);
 
-		return sprintf('%1$s %2$s',
-		    /*$1%s*/ sanitize_title($button->title) . '<br><code>[podlove-subscribe-button button="' . sanitize_text_field($button->name) . '"]</code>',
+		return sprintf( '%1$s %2$s',
+		    /*$1%s*/ sanitize_title( $button->title ) . '<br><code>[podlove-subscribe-button button="' . sanitize_text_field( $button->name ) . '"]</code>',
 		    /*$3%s*/ $this->row_actions( $actions )
 		);
 	}
@@ -57,7 +57,7 @@ 
 		return $button->id;
 	}
 
-	function get_columns(){
+	function get_columns() {
 		return array(
 			'name'    => __( 'Title & Shortcode', 'podlove-subscribe-button' ),
 			'button_preview'    => __( 'Preview', 'podlove-subscribe-button' ),
@@ -83,7 +83,7 @@ 
 		// get total items
 		$total_items = count( $data );
 		// extrage page for current page only
-		$data = array_slice( $data, ( ( $current_page - 1 ) * $per_page ) , $per_page );
+		$data = array_slice( $data, ( ( $current_page - 1 ) * $per_page ), $per_page );
 		// add items to table
 		$this->items = $data;
 

Braces +3 added lines, -3 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 namespace PodloveSubscribeButton;
 
-if( ! class_exists( 'WP_List_Table' ) ){
+if( ! class_exists( 'WP_List_Table' ) ) {
     require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 class Button_List_Table extends \WP_List_Table {
 
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
@@ -57,7 +57,7 @@ 
 		return $button->id;
 	}
 
-	function get_columns(){
+	function get_columns() {
 		return array(
 			'name'    => __( 'Title & Shortcode', 'podlove-subscribe-button' ),
 			'button_preview'    => __( 'Preview', 'podlove-subscribe-button' ),

settings/buttons.php

Indentation +11 added lines, -11 removed lines

@@ -48,9 +48,9 @@ 
 		if ( null == filter_input(INPUT_GET, 'button') )
 			return;
 
-        if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
-            return;
-        }
+		if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
+			return;
+		}
 
 		$post = filter_input_array(INPUT_POST);
 
@@ -111,15 +111,15 @@ 
 		if ( null === filter_input(INPUT_GET, 'button') )
 			return;
 
-        $action = ( null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : null );
+		$action = ( null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : null );
 
-        if (!in_array($action, ['save', 'create', 'delete'])) {
-            return;
-        }
+		if (!in_array($action, ['save', 'create', 'delete'])) {
+			return;
+		}
 
-        if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
-            return;
-        }            
+		if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
+			return;
+		}            
 
 		if ( $action === 'save' ) {
 			self::save();
@@ -344,7 +344,7 @@ 
 			filter_input(INPUT_GET, 'page'),
 			$action,
 			$button->id,
-            wp_create_nonce(),
+			wp_create_nonce(),
 			$type == 'button' ? ' class="button"' : ''
 		);
 	}

Spacing +77 added lines, -77 removed lines

@@ -6,16 +6,16 @@ 
 
 	public static function page() {
 
-		$action = null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : null;
+		$action = null !== filter_input( INPUT_GET, 'action' ) ? filter_input( INPUT_GET, 'action' ) : null;
 		$is_network = is_network_admin();
 
-		if ( $action == 'confirm_delete' && null !== filter_input(INPUT_GET, 'button') ) {
-			$button = ( $is_network === true ? \PodloveSubscribeButton\Model\NetworkButton::find_by_id( (int) filter_input(INPUT_GET, 'button') ) : \PodloveSubscribeButton\Model\Button::find_by_id( (int) filter_input(INPUT_GET, 'button') ) );
+		if ( $action == 'confirm_delete' && null !== filter_input( INPUT_GET, 'button' ) ) {
+			$button = ( $is_network === true ? \PodloveSubscribeButton\Model\NetworkButton::find_by_id( (int) filter_input( INPUT_GET, 'button' ) ) : \PodloveSubscribeButton\Model\Button::find_by_id( (int) filter_input( INPUT_GET, 'button' ) ) );
 			?>
 			<div class="updated">
 				<p>
 					<strong>
-						<?php printf( __( 'You selected to delete the button "%s". Please confirm this action.', 'podlove-subscribe-button' ), sanitize_title($button->title) ) ?>
+						<?php printf( __( 'You selected to delete the button "%s". Please confirm this action.', 'podlove-subscribe-button' ), sanitize_title( $button->title ) ) ?>
 					</strong>
 				</p>
 				<p>
@@ -27,11 +27,11 @@ 
 		}
 		?>
 		<div class="wrap">
-			<h2><?php echo __( 'Podlove Subscribe Button', 'podlove-subscribe-button' ); ?> <a href="?page=<?php echo filter_input(INPUT_GET, 'page'); ?>&amp;action=new&amp;network=<?php echo $is_network; ?>" class="add-new-h2"><?php _e( 'Add New', 'podlove-subscribe-button' ); ?></a></h2>
+			<h2><?php echo __( 'Podlove Subscribe Button', 'podlove-subscribe-button' ); ?> <a href="?page=<?php echo filter_input( INPUT_GET, 'page' ); ?>&amp;action=new&amp;network=<?php echo $is_network; ?>" class="add-new-h2"><?php _e( 'Add New', 'podlove-subscribe-button' ); ?></a></h2>
 			<?php
 
 			switch ( $action ) {
-				case 'new':   self::new_template();  break;
+				case 'new':   self::new_template(); break;
 				case 'edit':  self::edit_template(); break;
 				case 'index': self::view_template(); break;
 				default:      self::view_template(); break;
@@ -45,22 +45,22 @@ 
 	 * Process form: save/update a format
 	 */
 	public static function save() {
-		if ( null == filter_input(INPUT_GET, 'button') )
+		if ( null == filter_input( INPUT_GET, 'button' ) )
 			return;
 
-        if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
+        if ( ! wp_verify_nonce( $_REQUEST[ '_psb_nonce' ] ) ) {
             return;
         }
 
-		$post = filter_input_array(INPUT_POST);
+		$post = filter_input_array( INPUT_POST );
 
-		$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') ) );
-		$button->update_attributes( $post['podlove_button'] );
+		$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' ) ) );
+		$button->update_attributes( $post[ 'podlove_button' ] );
 
-		if ( isset($post['submit_and_stay']) ) {
-			self::redirect( 'edit', $button->id, array( 'network' => filter_input(INPUT_GET, 'network') ), ( filter_input(INPUT_GET, 'network') === '1' ? true : false ) );
+		if ( isset( $post[ 'submit_and_stay' ] ) ) {
+			self::redirect( 'edit', $button->id, array( 'network' => filter_input( INPUT_GET, 'network' ) ), ( filter_input( INPUT_GET, 'network' ) === '1' ? true : false ) );
 		} else {
-			self::redirect( 'index', $button->id, array(), ( filter_input(INPUT_GET, 'network') === '1' ? true : false ) );
+			self::redirect( 'index', $button->id, array(), ( filter_input( INPUT_GET, 'network' ) === '1' ? true : false ) );
 		}
 	}
 	/**
@@ -69,15 +69,15 @@ 
 	public static function create() {
 		global $wpdb;
 
-		$post = filter_input_array(INPUT_POST);
+		$post = filter_input_array( INPUT_POST );
 
-		$button = ( filter_input(INPUT_GET, 'network') === '1' ? new \PodloveSubscribeButton\Model\NetworkButton : new \PodloveSubscribeButton\Model\Button );
-		$button->update_attributes( $post['podlove_button'] );
+		$button = ( filter_input( INPUT_GET, 'network' ) === '1' ? new \PodloveSubscribeButton\Model\NetworkButton : new \PodloveSubscribeButton\Model\Button );
+		$button->update_attributes( $post[ 'podlove_button' ] );
 
-		if ( isset($post['submit_and_stay']) ) {
-			self::redirect( 'edit', $button->id, array( 'network' => filter_input(INPUT_GET, 'network') ), ( filter_input(INPUT_GET, 'network') === '1' ? true : false ) );
+		if ( isset( $post[ 'submit_and_stay' ] ) ) {
+			self::redirect( 'edit', $button->id, array( 'network' => filter_input( INPUT_GET, 'network' ) ), ( filter_input( INPUT_GET, 'network' ) === '1' ? true : false ) );
 		} else {
-			self::redirect( 'index', $button->id, array(), ( filter_input(INPUT_GET, 'network') === '1' ? true : false ) );
+			self::redirect( 'index', $button->id, array(), ( filter_input( INPUT_GET, 'network' ) === '1' ? true : false ) );
 		}
 	}
 
@@ -85,39 +85,39 @@ 
 	 * Process form: delete a format
 	 */
 	public static function delete() {
-		if ( null ==  filter_input(INPUT_GET, 'button') )
+		if ( null == filter_input( INPUT_GET, 'button' ) )
 			return;
 
-		$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') ) );
+		$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' ) ) );
 		$button->delete();
 
-		self::redirect( 'index', null, array(), ( filter_input(INPUT_GET, 'network') === '1' ? true : false ) );
+		self::redirect( 'index', null, array(), ( filter_input( INPUT_GET, 'network' ) === '1' ? true : false ) );
 	}
 
 	/**
 	 * Helper method: redirect to a certain page.
 	 */
 	public static function redirect( $action, $button_id = null, $params = array(), $network = false ) {
-		$page    = ( $network ? '/network/settings' : 'options-general' ) . '.php?page=' . filter_input(INPUT_GET, 'page');
+		$page    = ( $network ? '/network/settings' : 'options-general' ) . '.php?page=' . filter_input( INPUT_GET, 'page' );
 		$show    = ( $button_id ) ? '&button=' . $button_id : '';
 		$action  = '&action=' . $action;
 
-		array_walk( $params, function(&$value, $key) { $value = "&$key=$value"; } );
+		array_walk( $params, function( &$value, $key ) { $value = "&$key=$value"; } );
 
 		wp_redirect( admin_url( $page . $show . $action . implode( '', $params ) ) );
 	}
 
 	public static function process_form() {
-		if ( null === filter_input(INPUT_GET, 'button') )
+		if ( null === filter_input( INPUT_GET, 'button' ) )
 			return;
 
-        $action = ( null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : null );
+        $action = ( null !== filter_input( INPUT_GET, 'action' ) ? filter_input( INPUT_GET, 'action' ) : null );
 
-        if (!in_array($action, ['save', 'create', 'delete'])) {
+        if ( ! in_array( $action, [ 'save', 'create', 'delete' ] ) ) {
             return;
         }
 
-        if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
+        if ( ! wp_verify_nonce( $_REQUEST[ '_psb_nonce' ] ) ) {
             return;
         }            
 
@@ -131,34 +131,34 @@ 
 	}
 
 	public static function new_template() {
-		if ( filter_input(INPUT_GET, 'network') == '1' ) {
+		if ( filter_input( INPUT_GET, 'network' ) == '1' ) {
 			$button = new \PodloveSubscribeButton\Model\NetworkButton;
 		} else {
 			$button = new \PodloveSubscribeButton\Model\Button;
 		}
 
-		echo '<h3>' . __( 'New Subscribe button', 'podlove-subscribe-button' ) . '</h3>'.
+		echo '<h3>' . __( 'New Subscribe button', 'podlove-subscribe-button' ) . '</h3>' .
 				__( 'Please fill in your Podcast metadata to create a Podlove Subscription button', 'podlove-subscribe-button' );
 		self::form_template( $button, 'create' );
 	}
 
 	public static function edit_template() {
-		if ( filter_input(INPUT_GET, 'network') == '1' ) {
-			$button = \PodloveSubscribeButton\Model\NetworkButton::find_by_id( filter_input(INPUT_GET, 'button') );
+		if ( filter_input( INPUT_GET, 'network' ) == '1' ) {
+			$button = \PodloveSubscribeButton\Model\NetworkButton::find_by_id( filter_input( INPUT_GET, 'button' ) );
 		} else {
-			$button = \PodloveSubscribeButton\Model\Button::find_by_id( filter_input(INPUT_GET, 'button') );
+			$button = \PodloveSubscribeButton\Model\Button::find_by_id( filter_input( INPUT_GET, 'button' ) );
 		}
 
-		echo '<h3>' . sprintf( __( 'Edit Subscribe button: %s', 'podlove-subscribe-button' ), sanitize_text_field($button->title) ) . '</h3>';
+		echo '<h3>' . sprintf( __( 'Edit Subscribe button: %s', 'podlove-subscribe-button' ), sanitize_text_field( $button->title ) ) . '</h3>';
 		self::form_template( $button, 'save' );
 	}
 
 	public static function view_template() {
 		$is_network = is_network_admin();
 		?>
-		<p><?php _e('This plugin allows easy inclusion of the Podlove Subscribe Button. Put it in your sidebar with a simple widget or include the button in pages and/or posts with a simple shortcode.', 'podlove-subscribe-button' ); ?></p>
-		<p><?php _e('Start by adding a button for each of your podcasts here. You can then add the button to your sidebar by adding the <a href="widgets.php">Podlove Subscribe Button widget</a>.', 'podlove-subscribe-button' ); ?></p>
-		<p><?php _e('If you want to display the button inside a page or article, you can also use the <code>[podlove-subscribe-button]</code> shortcode anywhere.', 'podlove-subscribe-button' ); ?></p>
+		<p><?php _e( 'This plugin allows easy inclusion of the Podlove Subscribe Button. Put it in your sidebar with a simple widget or include the button in pages and/or posts with a simple shortcode.', 'podlove-subscribe-button' ); ?></p>
+		<p><?php _e( 'Start by adding a button for each of your podcasts here. You can then add the button to your sidebar by adding the <a href="widgets.php">Podlove Subscribe Button widget</a>.', 'podlove-subscribe-button' ); ?></p>
+		<p><?php _e( 'If you want to display the button inside a page or article, you can also use the <code>[podlove-subscribe-button]</code> shortcode anywhere.', 'podlove-subscribe-button' ); ?></p>
 		<?php
 		$table = new \PodloveSubscribeButton\Button_List_Table;
 		$table->prepare_items();
@@ -169,49 +169,49 @@ 
 
 		if ( ! $is_network ) :
 		?>
-		<h3><?php _e('Default Settings', 'podlove-subscribe-button' ); ?></h3>
+		<h3><?php _e( 'Default Settings', 'podlove-subscribe-button' ); ?></h3>
 		<form method="post" action="options.php">
 			<?php settings_fields( 'podlove-subscribe-button' ); ?>
 			<?php do_settings_sections( 'podlove-subscribe-button' ); ?>
 			<table class="form-table">
 				<tr valign="top">
-				<th scope="row"><label for="podlove_subscribe_button_default_size"><?php _e('Size', 'podlove-subscribe-button' ); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_size"><?php _e( 'Size', 'podlove-subscribe-button' ); ?></label></th>
 				<td>
 					<select name="podlove_subscribe_button_default_size" id="podlove_subscribe_button_default_size">
-						<?php foreach (\PodloveSubscribeButton\Model\Button::$size as $value => $description) : ?>
-							<option value="<?php echo $value; ?>" <?php echo ( $settings['size'] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
+						<?php foreach ( \PodloveSubscribeButton\Model\Button::$size as $value => $description ) : ?>
+							<option value="<?php echo $value; ?>" <?php echo ( $settings[ 'size' ] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				</tr>
 				<tr valign="top">
-				<th scope="row"><label for="podlove_subscribe_button_default_autowidth"><?php _e('Autowidth', 'podlove-subscribe-button' ); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_autowidth"><?php _e( 'Autowidth', 'podlove-subscribe-button' ); ?></label></th>
 				<td>
-					<input type="checkbox" name="podlove_subscribe_button_default_autowidth" id="podlove_subscribe_button_default_autowidth" <?php echo ( $settings['autowidth'] == 'on' ? 'checked' : '' ) ?> />
+					<input type="checkbox" name="podlove_subscribe_button_default_autowidth" id="podlove_subscribe_button_default_autowidth" <?php echo ( $settings[ 'autowidth' ] == 'on' ? 'checked' : '' ) ?> />
 				</td>
 				</tr>
 				<tr valign="top">
-				<th scope="row"><label for="podlove_subscribe_button_default_color"><?php _e('Color', 'podlove-subscribe-button' ); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_color"><?php _e( 'Color', 'podlove-subscribe-button' ); ?></label></th>
 				<td>
-					<input id="podlove_subscribe_button_default_color" name="podlove_subscribe_button_default_color" class="podlove_subscribe_button_color" value="<?php echo $settings['color'] ?>" />
+					<input id="podlove_subscribe_button_default_color" name="podlove_subscribe_button_default_color" class="podlove_subscribe_button_color" value="<?php echo $settings[ 'color' ] ?>" />
 				</td>
 				</tr>
 				<tr valign="top">
-				<th scope="row"><label for="podlove_subscribe_button_default_style"><?php _e('Style', 'podlove-subscribe-button' ); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_style"><?php _e( 'Style', 'podlove-subscribe-button' ); ?></label></th>
 				<td>
 					<select name="podlove_subscribe_button_default_style" id="podlove_subscribe_button_default_style">
-						<?php foreach (\PodloveSubscribeButton\Model\Button::$style as $value => $description) : ?>
-							<option value="<?php echo $value; ?>" <?php echo ( $settings['style'] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
+						<?php foreach ( \PodloveSubscribeButton\Model\Button::$style as $value => $description ) : ?>
+							<option value="<?php echo $value; ?>" <?php echo ( $settings[ 'style' ] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				</tr>
 				<tr valign="top">
-				<th scope="row"><label for="podlove_subscribe_button_default_format"><?php _e('Format', 'podlove-subscribe-button' ); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_format"><?php _e( 'Format', 'podlove-subscribe-button' ); ?></label></th>
 				<td>
 					<select name="podlove_subscribe_button_default_format" id="podlove_subscribe_button_default_format">
-						<?php foreach (\PodloveSubscribeButton\Model\Button::$format as $value => $description) : ?>
-							<option value="<?php echo $value; ?>" <?php echo ( $settings['format'] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
+						<?php foreach ( \PodloveSubscribeButton\Model\Button::$format as $value => $description ) : ?>
+							<option value="<?php echo $value; ?>" <?php echo ( $settings[ 'format' ] == $value ? "selected" : '' ); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -236,45 +236,45 @@ 
 					<tbody>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_name"><?php _e('Button ID', 'podlove-subscribe-button' ); ?></label>
+							<label for="podlove_button_name"><?php _e( 'Button ID', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
-							<input type="text" class="regular-text" id="podlove_button_name" name="podlove_button[name]" value="<?php echo esc_attr($button->name); ?>" />
-							<br /><span class="description"><?php _e('The ID will be used as in internal identifier for shortcodes.', 'podlove-subscribe-button' ); ?></span>
+							<input type="text" class="regular-text" id="podlove_button_name" name="podlove_button[name]" value="<?php echo esc_attr( $button->name ); ?>" />
+							<br /><span class="description"><?php _e( 'The ID will be used as in internal identifier for shortcodes.', 'podlove-subscribe-button' ); ?></span>
 						</td>
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_title"><?php _e('Podcast Title', 'podlove-subscribe-button' ); ?></label>
+							<label for="podlove_button_title"><?php _e( 'Podcast Title', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
-							<input type="text" class="regular-text" id="podlove_button_title" name="podlove_button[title]" value="<?php echo esc_attr($button->title); ?>" />
+							<input type="text" class="regular-text" id="podlove_button_title" name="podlove_button[title]" value="<?php echo esc_attr( $button->title ); ?>" />
 						</td>
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_subtitle"><?php _e('Podcast Subtitle', 'podlove-subscribe-button' ); ?></label>
+							<label for="podlove_button_subtitle"><?php _e( 'Podcast Subtitle', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
-							<input type="text" class="regular-text" id="podlove_button_subtitle" name="podlove_button[subtitle]" value="<?php echo esc_attr($button->subtitle); ?>" />
+							<input type="text" class="regular-text" id="podlove_button_subtitle" name="podlove_button[subtitle]" value="<?php echo esc_attr( $button->subtitle ); ?>" />
 						</td>
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_description"><?php _e('Podcast Description', 'podlove-subscribe-button' ); ?></label>
+							<label for="podlove_button_description"><?php _e( 'Podcast Description', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
-							<textarea class="autogrow" cols="40" rows="3" id="podlove_button_description" name="podlove_button[description]"><?php echo esc_attr($button->description); ?></textarea>
+							<textarea class="autogrow" cols="40" rows="3" id="podlove_button_description" name="podlove_button[description]"><?php echo esc_attr( $button->description ); ?></textarea>
 						</td>
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="podlove-button-cover"><?php _e('Podcast Image URL', 'podlove-subscribe-button' ); ?></label>
+							<label for="podlove-button-cover"><?php _e( 'Podcast Image URL', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
-							<input type="text" class="regular-text" id="podlove-button-cover" name="podlove_button[cover]" value="<?php echo esc_attr($button->cover); ?>" />
+							<input type="text" class="regular-text" id="podlove-button-cover" name="podlove_button[cover]" value="<?php echo esc_attr( $button->cover ); ?>" />
 							<a id="Podlove_cover_image_select" class="button" href="#">Select</a>
-							<br /><img src="<?php echo sanitize_text_field($button->cover); ?>" alt="" style="width: 200px" />
+							<br /><img src="<?php echo sanitize_text_field( $button->cover ); ?>" alt="" style="width: 200px" />
 							<script type="text/javascript">
 								(function($) {
 									$("#podlove-button-cover").on( 'change', function() {
@@ -287,29 +287,29 @@ 
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="feeds_table"><?php _e('Podcast Feeds', 'podlove-subscribe-button' ); ?></label>
+							<label for="feeds_table"><?php _e( 'Podcast Feeds', 'podlove-subscribe-button' ); ?></label>
 						</td>
 						<td>
 							<table id="feeds_table" class="podlove_alternating" border="0" cellspacing="0">
 								<thead>
 									<tr>
-										<th><?php _e('URL', 'podlove-subscribe-button' ); ?></th>
-										<th><?php _e('iTunes feed ID', 'podlove-subscribe-button' ); ?></th>
-										<th><?php _e('Media format', 'podlove-subscribe-button' ); ?></th>
-										<th><?php _e('Actions', 'podlove-subscribe-button' ); ?></th>
+										<th><?php _e( 'URL', 'podlove-subscribe-button' ); ?></th>
+										<th><?php _e( 'iTunes feed ID', 'podlove-subscribe-button' ); ?></th>
+										<th><?php _e( 'Media format', 'podlove-subscribe-button' ); ?></th>
+										<th><?php _e( 'Actions', 'podlove-subscribe-button' ); ?></th>
 									</tr>
 								</thead>
 								<tbody id="feeds_table_body">
 								</tbody>
 							</table>
 							<input type="button" class="button add_feed" value="+" />
-							<p><span class="description"><?php _e('Provide all Feeds with their corresponding Media File Type. The Subscribe Button will then automatically provide the most suitable feed to the subscriber with respect to their Podcast Client.', 'podlove-subscribe-button' ); ?></span></p>
+							<p><span class="description"><?php _e( 'Provide all Feeds with their corresponding Media File Type. The Subscribe Button will then automatically provide the most suitable feed to the subscriber with respect to their Podcast Client.', 'podlove-subscribe-button' ); ?></span></p>
 						</td>
 					</tr>
 					</tbody>
 				</table>
-				<input name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'podlove-subscribe-button' ); ?>" type="submit" />
-				<input type="submit" name="submit_and_stay" id="submit_and_stay" class="button" value="<?php _e('Save Changes and Continue Editing', 'podlove-subscribe-button' ); ?>"  />
+				<input name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'podlove-subscribe-button' ); ?>" type="submit" />
+				<input type="submit" name="submit_and_stay" id="submit_and_stay" class="button" value="<?php _e( 'Save Changes and Continue Editing', 'podlove-subscribe-button' ); ?>"  />
 
 				<script type="text/template" id="feed_line_template">
 					<tr>
@@ -322,8 +322,8 @@ 
 						<td>
 							<select class="regular-text podlove-media-format" name="podlove_button[feeds][{{id}}][format]">
 								<?php
-									foreach (\PodloveSubscribeButton\MediaTypes::$audio as $id => $audio) {
-										echo "<option value='".$id."'>".$audio['title']."</option>\n";
+									foreach ( \PodloveSubscribeButton\MediaTypes::$audio as $id => $audio ) {
+										echo "<option value='" . $id . "'>" . $audio[ 'title' ] . "</option>\n";
 									}
 								?>
 							</select>
@@ -332,7 +332,7 @@ 
 					</tr>
 				</script>
 				<script type="text/javascript">
-					var feeds = <?php echo json_encode($button->feeds); ?>;
+					var feeds = <?php echo json_encode( $button->feeds ); ?>;
 				</script>
 		</form>
 		<?php
@@ -340,8 +340,8 @@ 
 
 	public static function get_action_link( $button, $title, $action = 'edit', $type = 'link' ) {
 		return sprintf(
-			'<a href="?page=%s&action=%s&button=%s&network='.is_network_admin().'&_psb_nonce=%s"%s>' . $title . '</a>',
-			filter_input(INPUT_GET, 'page'),
+			'<a href="?page=%s&action=%s&button=%s&network=' . is_network_admin() . '&_psb_nonce=%s"%s>' . $title . '</a>',
+			filter_input( INPUT_GET, 'page' ),
 			$action,
 			$button->id,
             wp_create_nonce(),

Braces +9 added lines, -6 removed lines

@@ -45,8 +45,9 @@ 
 	 * Process form: save/update a format
 	 */
 	public static function save() {
-		if ( null == filter_input(INPUT_GET, 'button') )
-			return;
+		if ( null == filter_input(INPUT_GET, 'button') ) {
+					return;
+		}
 
         if (!wp_verify_nonce($_REQUEST['_psb_nonce'])) {
             return;
@@ -85,8 +86,9 @@ 
 	 * Process form: delete a format
 	 */
 	public static function delete() {
-		if ( null ==  filter_input(INPUT_GET, 'button') )
-			return;
+		if ( null ==  filter_input(INPUT_GET, 'button') ) {
+					return;
+		}
 
 		$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') ) );
 		$button->delete();
@@ -108,8 +110,9 @@ 
 	}
 
 	public static function process_form() {
-		if ( null === filter_input(INPUT_GET, 'button') )
-			return;
+		if ( null === filter_input(INPUT_GET, 'button') ) {
+					return;
+		}
 
         $action = ( null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : null );