podlove / podlove-subscribe-button-wp-plugin

podlove.php

Spacing +50 added lines, -50 removed lines

@@ -15,49 +15,49 @@ 
 $correct_php_version = version_compare( phpversion(), "5.3", ">=" );
 
 if ( ! $correct_php_version ) {
-	_e("Podlove Subscribe Button Plugin requires <strong>PHP 5.3</strong> or higher.<br>", 'podlove-subscribe-button');
-	echo __("You are running PHP ", 'podlove-subscribe-button') . phpversion();
+	_e( "Podlove Subscribe Button Plugin requires <strong>PHP 5.3</strong> or higher.<br>", 'podlove-subscribe-button' );
+	echo __( "You are running PHP ", 'podlove-subscribe-button' ) . phpversion();
 	exit;
 }
 
 // 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 () {
-	$settings = array('size', 'autowidth', 'style', 'format', 'color');
+add_action( 'admin_init', function() {
+	$settings = array( 'size', 'autowidth', 'style', 'format', 'color' );
 
-	foreach ($settings as $setting) {
+	foreach ( $settings as $setting ) {
 		register_setting( 'podlove-subscribe-button', 'podlove_subscribe_button_default_' . $setting );
 	}
 } );
 
 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();
@@ -73,7 +73,7 @@ 
 
 		$pages = array( 'settings_page_podlove-subscribe-button', 'widgets.php' );
 
-		if ( ! in_array( $hook, $pages )  ) {
+		if ( ! in_array( $hook, $pages ) ) {
 			return;
 		}
 
@@ -103,7 +103,7 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
@@ -114,7 +114,7 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
@@ -133,56 +133,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;
 	}
@@ -192,11 +192,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 ] );
 		}
 	}
 
@@ -211,6 +211,6 @@ 
 		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' );
 	}
 }
\ No newline at end of file

settings/buttons.php

Spacing +66 added lines, -66 removed lines

@@ -6,11 +6,11 @@ 
 
 	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>
@@ -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,18 +45,18 @@ 
 	 * 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;
 
-		$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 ) );
 		}
 	}
 	/**
@@ -65,15 +65,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 ) );
 		}
 	}
 
@@ -81,33 +81,33 @@ 
 	 * 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 ( $action === 'save' ) {
 			self::save();
@@ -119,22 +119,22 @@ 
 	}
 
 	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' ), $button->title ) . '</h3>';
@@ -144,9 +144,9 @@ 
 	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();
@@ -157,49 +157,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>
@@ -223,16 +223,16 @@ 
 					<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 $button->name; ?>" />
-							<br /><span class="description"><?php _e('The ID will be used as in internal identifier for shortcodes.', 'podlove-subscribe-button' ); ?></span>
+							<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 $button->title; ?>" />
@@ -240,7 +240,7 @@ 
 					</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 $button->subtitle; ?>" />
@@ -248,7 +248,7 @@ 
 					</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 $button->description; ?></textarea>
@@ -256,7 +256,7 @@ 
 					</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 $button->cover; ?>" />
@@ -274,29 +274,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>
@@ -309,8 +309,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>
@@ -319,7 +319,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
@@ -327,8 +327,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().'"%s>' . $title . '</a>',
-			filter_input(INPUT_GET, 'page'),
+			'<a href="?page=%s&action=%s&button=%s&network=' . is_network_admin() . '"%s>' . $title . '</a>',
+			filter_input( INPUT_GET, 'page' ),
 			$action,
 			$button->id,
 			$type == 'button' ? ' class="button"' : ''

widget.php

Spacing +33 added lines, -33 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,38 +26,38 @@ 
 
 	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 ) {
-		foreach (self::$widget_settings as $setting) {
-			$$setting = isset( $instance[$setting] ) ? $instance[$setting] : '';
+		foreach ( self::$widget_settings as $setting ) {
+			$$setting = isset( $instance[ $setting ] ) ? $instance[ $setting ] : '';
 		}
 
 		$buttons = \PodloveSubscribeButton\Model\Button::all();
 		if ( is_multisite() )
 			$network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all();
 
-		$buttons_as_options = function ($buttons) {
-			foreach ($buttons as $subscribebutton) {
-				echo "<option value='".$subscribebutton->name."' ".( $subscribebutton->name == $button ? 'selected=\"selected\"' : '' )." >".$subscribebutton->title." (".$subscribebutton->name.")</option>";
+		$buttons_as_options = function( $buttons ) {
+			foreach ( $buttons as $subscribebutton ) {
+				echo "<option value='" . $subscribebutton->name . "' " . ( $subscribebutton->name == $button ? 'selected=\"selected\"' : '' ) . " >" . $subscribebutton->title . " (" . $subscribebutton->name . ")</option>";
 			}
 		}
 		?>
@@ -79,15 +79,15 @@ 
 			<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-subscribe-button' ); ?>">
-						<?php $buttons_as_options($buttons); ?>
+				<?php if ( isset( $network_buttons ) && count( $network_buttons ) > 0 ) : ?>
+					<optgroup label="<?php _e( 'Local', 'podlove-subscribe-button' ); ?>">
+						<?php $buttons_as_options( $buttons ); ?>
 					</optgroup>
-					<optgroup label="<?php _e('Network', 'podlove-subscribe-button' ); ?>">
-						<?php $buttons_as_options($network_buttons); ?>
+					<optgroup label="<?php _e( 'Network', 'podlove-subscribe-button' ); ?>">
+						<?php $buttons_as_options( $network_buttons ); ?>
 					</optgroup>
 				<?php else : 
-					$buttons_as_options($buttons);
+					$buttons_as_options( $buttons );
 				 endif; ?>
 			</select>
 
@@ -111,12 +111,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>
@@ -132,13 +132,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' );
 });
\ No newline at end of file

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'];
 	}	
@@ -52,8 +54,9 @@ 
 		}
 
 		$buttons = \PodloveSubscribeButton\Model\Button::all();
-		if ( is_multisite() )
-			$network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all();
+		if ( is_multisite() ) {
+					$network_buttons = \PodloveSubscribeButton\Model\NetworkButton::all();
+		}
 
 		$buttons_as_options = function ($buttons) {
 			foreach ($buttons as $subscribebutton) {
@@ -86,8 +89,10 @@ 
 					<optgroup label="<?php _e('Network', 'podlove-subscribe-button' ); ?>">
 						<?php $buttons_as_options($network_buttons); ?>
 					</optgroup>
-				<?php else : 
+				<?php else {
+	: 
 					$buttons_as_options($buttons);
+}
 				 endif; ?>
 			</select>
 
@@ -139,6 +144,6 @@ 
 		return $instance;
 	}
 }
-add_action( 'widgets_init', function(){
+add_action( 'widgets_init', function() {
      register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
 });
\ No newline at end of file