cfoellmann / podlove-subscribe-button-wp-plugin

helper.php

Braces +3 added lines, -2 removed lines

@@ -8,8 +8,9 @@
 	$plugin  = basename(\PodloveSubscribeButton\PLUGIN_DIR) . '/' . \PodloveSubscribeButton\PLUGIN_FILE_NAME;
 	$blogids = $wpdb->get_col("SELECT blog_id FROM " . $wpdb->blogs);
 
-	if (!is_array($blogids))
-		return;
+	if (!is_array($blogids)) {
+			return;
+	}
 
 	foreach ($blogids as $blog_id) {
 		switch_to_blog($blog_id);

Spacing +7 added lines, -7 removed lines

@@ -2,18 +2,18 @@
 
 namespace PodloveSubscribeButton;
 
-function for_every_podcast_blog($callback) {
+function for_every_podcast_blog ( $callback ) {
 	global $wpdb;
 
-	$plugin  = basename(\PodloveSubscribeButton\PLUGIN_DIR) . '/' . \PodloveSubscribeButton\PLUGIN_FILE_NAME;
-	$blogids = $wpdb->get_col("SELECT blog_id FROM " . $wpdb->blogs);
+	$plugin  = basename( \PodloveSubscribeButton\PLUGIN_DIR ) . '/' . \PodloveSubscribeButton\PLUGIN_FILE_NAME;
+	$blogids = $wpdb->get_col( "SELECT blog_id FROM " . $wpdb->blogs );
 
-	if (!is_array($blogids))
+	if ( ! is_array( $blogids ) )
 		return;
 
-	foreach ($blogids as $blog_id) {
-		switch_to_blog($blog_id);
-		if (is_plugin_active($plugin)) {
+	foreach ( $blogids as $blog_id ) {
+		switch_to_blog( $blog_id );
+		if ( is_plugin_active( $plugin ) ) {
 			$callback();
 		}
 		restore_current_blog();

podlove.php

Braces +17 added lines, -11 removed lines

@@ -38,8 +38,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' ) );
@@ -95,8 +96,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(
@@ -122,8 +124,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') );
@@ -155,8 +158,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;
 	}
@@ -180,10 +184,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 +58 added lines, -58 removed lines

@@ -14,85 +14,85 @@ 
 $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' ) );
 
-add_action( 'admin_enqueue_scripts', function () {
-	wp_register_style( 'podlove-subscribe-button', plugin_dir_url(__FILE__).'style.css' );
+add_action( 'admin_enqueue_scripts', function() {
+	wp_register_style( 'podlove-subscribe-button', plugin_dir_url( __FILE__ ) . 'style.css' );
 	wp_enqueue_style( 'podlove-subscribe-button' );
 
-	wp_enqueue_style('podlove-subscribe-button-spectrum', plugin_dir_url(__FILE__). 'js/spectrum/spectrum.css');
-	wp_enqueue_script('podlove-subscribe-button-spectrum', plugin_dir_url(__FILE__). 'js/spectrum/spectrum.js', array('jquery'));
-	wp_enqueue_script('podlove-subscribe-button-admin-tools', plugin_dir_url(__FILE__). 'js/admin.js', array('jquery'));
+	wp_enqueue_style( 'podlove-subscribe-button-spectrum', plugin_dir_url( __FILE__ ) . 'js/spectrum/spectrum.css' );
+	wp_enqueue_script( 'podlove-subscribe-button-spectrum', plugin_dir_url( __FILE__ ) . 'js/spectrum/spectrum.js', array( 'jquery' ) );
+	wp_enqueue_script( 'podlove-subscribe-button-admin-tools', plugin_dir_url( __FILE__ ) . 'js/admin.js', array( 'jquery' ) );
 } );
 
 // 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 () {
+add_action( 'plugins_loaded', function() {
 	load_plugin_textdomain( 'podlove-subscribe-button' );
 } );
 
 
 class PodloveSubscribeButton {
 
-	public static function admin_menu() {
+	public static function admin_menu () {
 		add_options_page(
 				'Podlove Subscribe Button Options',
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
-	public static function admin_network_menu() {
+	public static function admin_network_menu () {
 		add_submenu_page(
 				'settings.php',
 				'Podlove Subscribe Button Options',
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array( 'PodloveSubscribeButton\Settings\Buttons', 'page' )
 			);
 	}
 
-	public static function build_models() {
+	public static function build_models () {
 		// Build Databases
 		\PodloveSubscribeButton\Model\Button::build();
 		if ( is_multisite() )
@@ -107,56 +107,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');
+	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' );
 		} 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;
 	}
@@ -166,11 +166,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 ] );
 		}
 	}
 
@@ -179,12 +179,12 @@ 
 	 * @param  string $width_attribute
 	 * @return string
 	 */
-	private static function interpret_width_attribute( $width_attribute = NULL ) {
+	private static function interpret_width_attribute ( $width_attribute = NULL ) {
 		if ( $width_attribute == 'auto' )
 			return 'on';
 		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

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -145,9 +145,9 @@ 
 		}
 
 		if ( isset($args['hide']) && $args['hide'] == 'true' ) {
-			$hide = TRUE;
+			$hide = true;
 		} else {
-			$hide = FALSE;
+			$hide = false;
 		}
 
 		// Render button
@@ -158,7 +158,7 @@ 
 		if ( isset($args[$key]) )
 			return $args[$key];
 
-		return FALSE;
+		return false;
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @param  string $attribute_value
 	 * @return string
 	 */
-	private static function get_attribute($attribute=NULL, $attribute_value=NULL) {
+	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 {
@@ -179,7 +179,7 @@ 
 	 * @param  string $width_attribute
 	 * @return string
 	 */
-	private static function interpret_width_attribute( $width_attribute = NULL ) {
+	private static function interpret_width_attribute( $width_attribute = null ) {
 		if ( $width_attribute == 'auto' )
 			return 'on';
 		if ( $width_attribute && $width_attribute !== 'auto' )

model/button.php

Braces +9 added lines, -6 removed lines

@@ -115,8 +115,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'];
+				}
 
 				$feeds[] = $new_feed;
 			}
@@ -177,11 +178,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';
 	}

Spacing +28 added lines, -28 removed lines

@@ -44,12 +44,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;
 		}
@@ -62,9 +62,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;
@@ -81,9 +81,9 @@ 
 	 * @param  boolean $buttonid
 	 * @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,
 						'buttonid' => $buttonid,
@@ -97,7 +97,7 @@ 
 				'subtitle' => $this->subtitle,
 				'description' => $this->description,
 				'cover' => $this->cover,
-				'feeds' => $this->get_feeds_as_array($this->feeds)
+				'feeds' => $this->get_feeds_as_array( $this->feeds )
 			), $button_styling );
 	}
 
@@ -105,20 +105,20 @@ 
 	 * Provides the feed as an array in the required format
 	 * @return array
 	 */
-	private function get_feeds_as_array( $feeds=array() ) {
-		foreach ($feeds as $feed) {
-			if ( isset(\PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension']) ) {
+	private function get_feeds_as_array ( $feeds = array() ) {
+		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' ];
 
-				$feeds[] = $new_feed;
+				$feeds[ ] = $new_feed;
 			}
 		}
 
@@ -132,15 +132,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\" 
@@ -158,15 +158,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
 			);
 	}
@@ -176,8 +176,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' )

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 			return $network_button;
 		}
 
-		return FALSE;
+		return false;
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 * @param  boolean $buttonid
 	 * @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),
 				array(

model/base.php

Indentation +19 added lines, -19 removed lines

@@ -389,14 +389,14 @@ 
 			$this->set_defaults();
 
 			$sql = 'INSERT INTO '
-			     . static::table_name()
-			     . ' ( '
-			     . implode( ',', static::property_names() )
-			     . ' ) '
-			     . 'VALUES'
-			     . ' ( '
-			     . implode( ',', array_map( array( $this, 'property_name_to_sql_value' ), static::property_names() ) )
-			     . ' );'
+				 . static::table_name()
+				 . ' ( '
+				 . implode( ',', static::property_names() )
+				 . ' ) '
+				 . 'VALUES'
+				 . ' ( '
+				 . implode( ',', array_map( array( $this, 'property_name_to_sql_value' ), static::property_names() ) )
+				 . ' );'
 			;
 			$success = $wpdb->query( $sql );
 			if ( $success ) {
@@ -404,9 +404,9 @@ 
 			}
 		} else {
 			$sql = 'UPDATE ' . static::table_name()
-			     . ' SET '
-			     . implode( ',', array_map( array( $this, 'property_name_to_sql_update_statement' ), static::property_names() ) )
-			     . ' WHERE id = ' . $this->id
+				 . ' SET '
+				 . implode( ',', array_map( array( $this, 'property_name_to_sql_update_statement' ), static::property_names() ) )
+				 . ' WHERE id = ' . $this->id
 			;
 
 			$success = $wpdb->query( $sql );
@@ -454,13 +454,13 @@ 
 		global $wpdb;
 		
 		$sql = 'DELETE FROM '
-		     . static::table_name()
-		     . ' WHERE id = ' . $this->id;
+			 . static::table_name()
+			 . ' WHERE id = ' . $this->id;
 
 		$rows_affected = $wpdb->query( $sql );
 
-	    do_action('podlove_model_delete', $this);
-	    do_action('podlove_model_change', $this);
+		do_action('podlove_model_delete', $this);
+		do_action('podlove_model_change', $this);
 
 		return $rows_affected !== false;
 	}
@@ -499,10 +499,10 @@ 
 			$property_sql[] = "`{$property['name']}` {$property['type']}";
 		
 		$sql = 'CREATE TABLE IF NOT EXISTS '
-		     . static::table_name()
-		     . ' ('
-		     . implode( ',', $property_sql )
-		     . ' ) CHARACTER SET utf8;'
+			 . static::table_name()
+			 . ' ('
+			 . implode( ',', $property_sql )
+			 . ' ) CHARACTER SET utf8;'
 		;
 		
 		$wpdb->query( $sql );

Braces +18 added lines, -12 removed lines

@@ -45,11 +45,13 @@ 
 	}
 
 	private static function unserialize_property($property) {
-		if ( ! isset($property) )
-			return;
+		if ( ! isset($property) ) {
+					return;
+		}
 
-		if ( $unserialized_string = is_serialized($property) )
-			return unserialize($property);
+		if ( $unserialized_string = is_serialized($property) ) {
+					return unserialize($property);
+		}
 
 		return $property;
 	}
@@ -319,8 +321,9 @@ 
 	 */
 	public function update_attributes( $attributes ) {
 
-		if ( ! is_array( $attributes ) )
-			return false;
+		if ( ! is_array( $attributes ) ) {
+					return false;
+		}
 
 		$request = filter_input_array(INPUT_POST); // Do this for security reasons
 			
@@ -429,12 +432,14 @@ 
 		
 		$defaults = $this->default_values();
 
-		if ( ! is_array( $defaults ) || empty( $defaults ) )
-			return;
+		if ( ! is_array( $defaults ) || empty( $defaults ) ) {
+					return;
+		}
 
 		foreach ( $defaults as $property => $value ) {
-			if ( $this->$property === NULL )
-				$this->$property = $value;
+			if ( $this->$property === NULL ) {
+							$this->$property = $value;
+			}
 		}
 
 	}
@@ -495,8 +500,9 @@ 
 		global $wpdb;
 		
 		$property_sql = array();
-		foreach ( static::properties() as $property )
-			$property_sql[] = "`{$property['name']}` {$property['type']}";
+		foreach ( static::properties() as $property ) {
+					$property_sql[] = "`{$property['name']}` {$property['type']}";
+		}
 		
 		$sql = 'CREATE TABLE IF NOT EXISTS '
 		     . static::table_name()

Spacing +71 added lines, -71 removed lines

@@ -14,7 +14,7 @@ 
 	 */
 	private $data = array();
 	
-	public function __set( $name, $value ) {
+	public function __set ( $name, $value ) {
 		if ( static::has_property( $name ) ) {
 			$this->set_property( $name, $value );
 		} else {
@@ -22,11 +22,11 @@ 
 		}
 	}
 	
-	private function set_property( $name, $value ) {
+	private function set_property ( $name, $value ) {
 		$this->data[ $name ] = $value;
 	}
 	
-	public function __get( $name ) {
+	public function __get ( $name ) {
 		if ( static::has_property( $name ) ) {
 			return $this->get_property( $name );
 		} elseif ( property_exists( $this, $name ) ) {
@@ -36,7 +36,7 @@ 
 		}
 	}
 	
-	private function get_property( $name ) {
+	private function get_property ( $name ) {
 		if ( isset( $this->data[ $name ] ) ) {
 			return $this->data[ $name ];
 		} else {
@@ -44,12 +44,12 @@ 
 		}
 	}
 
-	private static function unserialize_property($property) {
-		if ( ! isset($property) )
+	private static function unserialize_property ( $property ) {
+		if ( ! isset( $property ) )
 			return;
 
-		if ( $unserialized_string = is_serialized($property) )
-			return unserialize($property);
+		if ( $unserialized_string = is_serialized( $property ) )
+			return unserialize( $property );
 
 		return $property;
 	}
@@ -63,7 +63,7 @@ 
 	 * 
 	 * @return string database table name
 	 */
-	public static function table_name() {
+	public static function table_name () {
 		global $wpdb;
 		
 		// prefix with $wpdb prefix
@@ -79,7 +79,7 @@ 
 	 * @param string $name Name of the property / column
 	 * @param string $type mySQL column type 
 	 */
-	public static function property( $name, $type, $args = array() ) {
+	public static function property ( $name, $type, $args = array() ) {
 		$class = get_called_class();
 		
 		if ( ! isset( static::$properties[ $class ] ) ) {
@@ -89,16 +89,16 @@ 
 		// "id" columns and those ending on "_id" get an index by default
 		$index = $name == 'id' || stripos( $name, '_id' );
 		// but if the argument is set, it overrides the default
-		if (isset($args['index'])) {
-			$index = $args['index'];
+		if ( isset( $args[ 'index' ] ) ) {
+			$index = $args[ 'index' ];
 		}
 		
-		static::$properties[ $class ][] = array(
+		static::$properties[ $class ][ ] = array(
 			'name'  => $name,
 			'type'  => $type,
 			'index' => $index,
-			'index_length' => isset($args['index_length']) ? $args['index_length'] : null,
-			'unique' => isset($args['unique']) ? $args['unique'] : null
+			'index_length' => isset( $args[ 'index_length' ] ) ? $args[ 'index_length' ] : null,
+			'unique' => isset( $args[ 'unique' ] ) ? $args[ 'unique' ] : null
 		);
 	}
 	
@@ -107,7 +107,7 @@ 
 	 * 
 	 * @return array property list
 	 */
-	private static function properties() {
+	private static function properties () {
 		$class = get_called_class();
 		
 		if ( ! isset( static::$properties[ $class ] ) ) {
@@ -123,7 +123,7 @@ 
 	 * @param string $name name of the property to test
 	 * @return bool True if the property exists, else false.
 	 */
-	public static function has_property( $name ) {
+	public static function has_property ( $name ) {
 		return in_array( $name, static::property_names() );
 	}
 	
@@ -132,8 +132,8 @@ 
 	 * 
 	 * @return array property names
 	 */
-	public static function property_names() {
-		return array_map( function ( $p ) { return $p['name']; } , static::properties() );
+	public static function property_names () {
+		return array_map( function( $p ) { return $p[ 'name' ]; } , static::properties() );
 	}
 	
 	/**
@@ -141,7 +141,7 @@ 
 	 * 
 	 * @return bool True if there is at least one entry, else false.
 	 */
-	public static function has_entries() {
+	public static function has_entries () {
 		return static::count() > 0;
 	}
 	
@@ -150,14 +150,14 @@ 
 	 * 
 	 * @return int number of rows
 	 */
-	public static function count() {
+	public static function count () {
 		global $wpdb;
 		
 		$sql = 'SELECT COUNT(*) FROM ' . static::table_name();
 		return (int) $wpdb->get_var( $sql );
 	}
 
-	public static function find_by_id( $id ) {
+	public static function find_by_id ( $id ) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -171,20 +171,20 @@ 
 		}
 		
 		foreach ( $row as $property => $value ) {
-			$model->$property = static::unserialize_property($value);
+			$model->$property = static::unserialize_property( $value );
 		}
 		
 		return $model;
 	}
 
-	public static function find_all_by_property( $property, $value ) {
+	public static function find_all_by_property ( $property, $value ) {
 		global $wpdb;
 		
 		$class = get_called_class();
 		$models = array();
 		
 		$rows = $wpdb->get_results(
-			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $property .  ' = \'' . $value . '\''
+			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $property . ' = \'' . $value . '\''
 		);
 		
 		if ( ! $rows ) {
@@ -195,15 +195,15 @@ 
 			$model = new $class();
 			$model->flag_as_not_new();
 			foreach ( $row as $property => $value ) {
-				$model->$property = static::unserialize_property($value);
+				$model->$property = static::unserialize_property( $value );
 			}
-			$models[] = $model;
+			$models[ ] = $model;
 		}
 		
 		return $models;
 	}
 
-	public static function find_one_by_property( $property, $value ) {
+	public static function find_one_by_property ( $property, $value ) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -211,7 +211,7 @@ 
 		$model->flag_as_not_new();
 		
 		$row = $wpdb->get_row(
-			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $property .  ' = \'' . $value . '\' LIMIT 0,1'
+			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $property . ' = \'' . $value . '\' LIMIT 0,1'
 		);
 		
 		if ( ! $row ) {
@@ -219,13 +219,13 @@ 
 		}
 		
 		foreach ( $row as $property => $value ) {
-			$model->$property = static::unserialize_property($value);
+			$model->$property = static::unserialize_property( $value );
 		}
 		
 		return $model;
 	}
 
-	public static function find_all_by_where( $where ) {
+	public static function find_all_by_where ( $where ) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -243,15 +243,15 @@ 
 			$model = new $class();
 			$model->flag_as_not_new();
 			foreach ( $row as $property => $value ) {
-				$model->$property = static::unserialize_property($value);
+				$model->$property = static::unserialize_property( $value );
 			}
-			$models[] = $model;
+			$models[ ] = $model;
 		}
 		
 		return $models;
 	}
 	
-	public static function find_one_by_where( $where ) {
+	public static function find_one_by_where ( $where ) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -267,7 +267,7 @@ 
 		}
 		
 		foreach ( $row as $property => $value ) {
-			$model->$property = static::unserialize_property($value);
+			$model->$property = static::unserialize_property( $value );
 		}
 		
 		return $model;
@@ -278,7 +278,7 @@ 
 	 * @param  string $sql_suffix optional SQL, appended after FROM clause
 	 * @return array list of model objects
 	 */
-	public static function all( $sql_suffix = '' ) {
+	public static function all ( $sql_suffix = '' ) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -290,9 +290,9 @@ 
 			$model = new $class();
 			$model->flag_as_not_new();
 			foreach ( $row as $property => $value ) {
-				$model->$property = static::unserialize_property($value);
+				$model->$property = static::unserialize_property( $value );
 			}
-			$models[] = $model;
+			$models[ ] = $model;
 		}
 		
 		return $models;
@@ -301,11 +301,11 @@ 
 	/**
 	 * True if not yet saved to database. Else false.
 	 */
-	public function is_new() {
+	public function is_new () {
 		return $this->is_new;
 	}
 	
-	public function flag_as_not_new() {
+	public function flag_as_not_new () {
 		$this->is_new = false;
 	}
 
@@ -317,23 +317,23 @@ 
 	 * @param  array $attributes
 	 * @return bool
 	 */
-	public function update_attributes( $attributes ) {
+	public function update_attributes ( $attributes ) {
 
 		if ( ! is_array( $attributes ) )
 			return false;
 
-		$request = filter_input_array(INPUT_POST); // Do this for security reasons
+		$request = filter_input_array( INPUT_POST ); // Do this for security reasons
 			
 		foreach ( $attributes as $key => $value ) {
-			if ( is_array($value) ) {
-				$this->{$key} = serialize($value);
+			if ( is_array( $value ) ) {
+				$this->{$key} = serialize( $value );
 			} else {
-				$this->{$key} = esc_sql($value);
+				$this->{$key} = esc_sql( $value );
 			}
 		}
 		
-		if ( isset( $request['checkboxes'] ) && is_array( $request['checkboxes'] ) ) {
-			foreach ( $request['checkboxes'] as $checkbox ) {
+		if ( isset( $request[ 'checkboxes' ] ) && is_array( $request[ 'checkboxes' ] ) ) {
+			foreach ( $request[ 'checkboxes' ] as $checkbox ) {
 				if ( isset( $attributes[ $checkbox ] ) && $attributes[ $checkbox ] === 'on' ) {
 					$this->$checkbox = 1;
 				} else {
@@ -345,8 +345,8 @@ 
 		// @todo this is the wrong place to do this!
 		// The feed password is the only "passphrase" which is saved. It is not encrypted!
 		// However, we keep this function for later use
-		if ( isset( $request['passwords'] ) && is_array( $request['passwords'] ) ) {
-			foreach ( $request['passwords'] as $password ) {
+		if ( isset( $request[ 'passwords' ] ) && is_array( $request[ 'passwords' ] ) ) {
+			foreach ( $request[ 'passwords' ] as $password ) {
 				$this->$password = $attributes[ $password ];
 			}
 		}
@@ -360,7 +360,7 @@ 
 	 * @param  mixed  $value
 	 * @return (bool) query success
 	 */
-	public function update_attribute($attribute, $value) {
+	public function update_attribute ( $attribute, $value ) {
 		global $wpdb;
 
 		$this->$attribute = $value;
@@ -369,7 +369,7 @@ 
 			"UPDATE %s SET %s = '%s' WHERE id = %s",
 			static::table_name(),
 			$attribute,
-			mysqli_real_escape_string($value),
+			mysqli_real_escape_string( $value ),
 			$this->id
 		);
 
@@ -381,7 +381,7 @@ 
 	 * 
 	 * @todo use wpdb::insert()
 	 */
-	public function save() {
+	public function save () {
 		global $wpdb;
 
 		if ( $this->is_new() ) {
@@ -414,8 +414,8 @@ 
 
 		$this->is_new = false;
 
-		do_action('podlove_model_save', $this);
-		do_action('podlove_model_change', $this);
+		do_action( 'podlove_model_save', $this );
+		do_action( 'podlove_model_change', $this );
 
 		return $success;
 	}
@@ -425,7 +425,7 @@ 
 	 * 
 	 * @return array
 	 */
-	private function set_defaults() {
+	private function set_defaults () {
 		
 		$defaults = $this->default_values();
 
@@ -446,11 +446,11 @@ 
 	 * 
 	 * @return array
 	 */
-	public function default_values() {
+	public function default_values () {
 		return array();
 	}
 	
-	public function delete() {
+	public function delete () {
 		global $wpdb;
 		
 		$sql = 'DELETE FROM '
@@ -459,23 +459,23 @@ 
 
 		$rows_affected = $wpdb->query( $sql );
 
-	    do_action('podlove_model_delete', $this);
-	    do_action('podlove_model_change', $this);
+	    do_action( 'podlove_model_delete', $this );
+	    do_action( 'podlove_model_change', $this );
 
 		return $rows_affected !== false;
 	}
 
-	private function property_name_to_sql_update_statement( $p ) {
+	private function property_name_to_sql_update_statement ( $p ) {
 		global $wpdb;
 
 		if ( $this->$p !== NULL && $this->$p !== '' ) {
-			return sprintf( "%s = '%s'", $p, ( is_array($this->$p) ? serialize($this->$p) : $this->$p ) );
+			return sprintf( "%s = '%s'", $p, ( is_array( $this->$p ) ? serialize( $this->$p ) : $this->$p ) );
 		} else {
 			return "$p = NULL";
 		}
 	}
 	
-	private function property_name_to_sql_value( $p ) {
+	private function property_name_to_sql_value ( $p ) {
 		global $wpdb;
 
 		if ( $this->$p !== NULL && $this->$p !== '' ) {
@@ -491,12 +491,12 @@ 
 	 * Automatically includes an id column as auto incrementing primary key.
 	 * @todo allow model changes
 	 */
-	public static function build() {
+	public static function build () {
 		global $wpdb;
 		
 		$property_sql = array();
 		foreach ( static::properties() as $property )
-			$property_sql[] = "`{$property['name']}` {$property['type']}";
+			$property_sql[ ] = "`{$property[ 'name' ]}` {$property[ 'type' ]}";
 		
 		$sql = 'CREATE TABLE IF NOT EXISTS '
 		     . static::table_name()
@@ -517,19 +517,19 @@ 
 	 * - equals "id" or contains "_id"
 	 * - doesn't have an index yet
 	 */
-	public static function build_indices() {
+	public static function build_indices () {
 		global $wpdb;
 
 		$indices_sql = 'SHOW INDEX FROM `' . static::table_name() . '`';
 		$indices = $wpdb->get_results( $indices_sql );
-		$index_columns = array_map( function($index){ return $index->Column_name; }, $indices );
+		$index_columns = array_map( function( $index ) { return $index->Column_name; }, $indices );
 
 		foreach ( static::properties() as $property ) {
 
-			if ( $property['index'] && ! in_array( $property['name'], $index_columns ) ) {
-				$length = isset($property['index_length']) ? '(' . (int) $property['index_length'] . ')' : '';
-				$unique = isset($property['unique']) && $property['unique'] ? 'UNIQUE' : '';
-				$sql = 'ALTER TABLE `' . static::table_name() . '` ADD ' . $unique . ' INDEX `' . $property['name'] . '` (' . $property['name'] . $length . ')';
+			if ( $property[ 'index' ] && ! in_array( $property[ 'name' ], $index_columns ) ) {
+				$length = isset( $property[ 'index_length' ] ) ? '(' . (int) $property[ 'index_length' ] . ')' : '';
+				$unique = isset( $property[ 'unique' ] ) && $property[ 'unique' ] ? 'UNIQUE' : '';
+				$sql = 'ALTER TABLE `' . static::table_name() . '` ADD ' . $unique . ' INDEX `' . $property[ 'name' ] . '` (' . $property[ 'name' ] . $length . ')';
 				$wpdb->query( $sql );
 			}
 		}
@@ -538,7 +538,7 @@ 
 	/**
 	 * Model identifier.
 	 */
-	public static function name() {
+	public static function name () {
 		// get name of implementing class
 		$table_name = get_called_class();
 		// replace backslashes from namespace by underscores

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 		} elseif ( property_exists( $this, $name ) ) {
 			return $this->$name;
 		} else {
-			return NULL;
+			return null;
 		}
 	}
 	
@@ -40,7 +40,7 @@ 
 		if ( isset( $this->data[ $name ] ) ) {
 			return $this->data[ $name ];
 		} else {
-			return NULL;
+			return null;
 		}
 	}
 
@@ -167,7 +167,7 @@ 
 		$row = $wpdb->get_row( 'SELECT * FROM ' . static::table_name() . ' WHERE id = ' . (int) $id );
 		
 		if ( ! $row ) {
-			return NULL;
+			return null;
 		}
 		
 		foreach ( $row as $property => $value ) {
@@ -215,7 +215,7 @@ 
 		);
 		
 		if ( ! $row ) {
-			return NULL;
+			return null;
 		}
 		
 		foreach ( $row as $property => $value ) {
@@ -263,7 +263,7 @@ 
 		);
 		
 		if ( ! $row ) {
-			return NULL;
+			return null;
 		}
 		
 		foreach ( $row as $property => $value ) {
@@ -433,7 +433,7 @@ 
 			return;
 
 		foreach ( $defaults as $property => $value ) {
-			if ( $this->$property === NULL )
+			if ( $this->$property === null )
 				$this->$property = $value;
 		}
 
@@ -468,7 +468,7 @@ 
 	private function property_name_to_sql_update_statement( $p ) {
 		global $wpdb;
 
-		if ( $this->$p !== NULL && $this->$p !== '' ) {
+		if ( $this->$p !== null && $this->$p !== '' ) {
 			return sprintf( "%s = '%s'", $p, ( is_array($this->$p) ? serialize($this->$p) : $this->$p ) );
 		} else {
 			return "$p = NULL";
@@ -478,7 +478,7 @@ 
 	private function property_name_to_sql_value( $p ) {
 		global $wpdb;
 
-		if ( $this->$p !== NULL && $this->$p !== '' ) {
+		if ( $this->$p !== null && $this->$p !== '' ) {
 			return sprintf( "'%s'", $this->$p );
 		} else {
 			return 'NULL';

settings/buttons.php

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;
+		}
 
 		$post = filter_input_array(INPUT_POST);
 
@@ -81,8 +82,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();
@@ -104,8 +106,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 );
 

Spacing +77 added lines, -77 removed lines

@@ -4,13 +4,13 @@ 
 
 class Buttons {
 
-	public static function page() {
+	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 __( 'Podcast 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 echo __( 'Add New', 'podlove-subscribe-button' ); ?></a></h2>
+			<h2><?php echo __( 'Podcast 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 echo __( '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;
@@ -44,70 +44,70 @@ 
 	/**
 	 * Process form: save/update a format
 	 */
-	public static function save() {
-		if ( null == filter_input(INPUT_GET, 'button') )
+	public static function save () {
+		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 ) );
 		}
 	}
 	/**
 	 * Process form: create a format
 	 */
-	public static function create() {
+	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 ) );
 		}
 	}
 
 	/**
 	 * Process form: delete a format
 	 */
-	public static function delete() {
-		if ( null ==  filter_input(INPUT_GET, 'button') )
+	public static function delete () {
+		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');
+	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' );
 		$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') )
+	public static function process_form () {
+		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();
@@ -118,35 +118,35 @@ 
 		}
 	}
 
-	public static function new_template() {
-		if ( filter_input(INPUT_GET, 'network') == '1' ) {
+	public static function new_template () {
+		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') );
+	public static function edit_template () {
+		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>';
 		self::form_template( $button, 'save' );
 	}
 
-	public static function view_template() {
+	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'); ?></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'); ?></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'); ?></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' ); ?></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' ); ?></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' ); ?></p>
 		<?php
 		$table = new \PodloveSubscribeButton\Button_List_Table;
 		$table->prepare_items();
@@ -157,49 +157,49 @@ 
 
 		if ( ! $is_network ) :
 		?>
-		<h3><?php _e('Default Settings', 'podlove'); ?></h3>
+		<h3><?php _e( 'Default Settings', 'podlove' ); ?></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'); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_size"><?php _e( 'Size', 'podlove' ); ?></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'); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_autowidth"><?php _e( 'Autowidth', 'podlove' ); ?></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'); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_color"><?php _e( 'Color', 'podlove' ); ?></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'); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_style"><?php _e( 'Style', 'podlove' ); ?></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'); ?></label></th>
+				<th scope="row"><label for="podlove_subscribe_button_default_format"><?php _e( 'Format', 'podlove' ); ?></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>
@@ -211,7 +211,7 @@ 
 		endif;
 	}
 
-	private static function form_template( $button, $action ) {
+	private static function form_template ( $button, $action ) {
 		// Enqueue Scripts for Media Manager
 		wp_enqueue_media();
 		// Adjust if is_network
@@ -223,16 +223,16 @@ 
 					<tbody>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_name"><?php _e('Button ID', 'podlove'); ?></label>
+							<label for="podlove_button_name"><?php _e( 'Button ID', 'podlove' ); ?></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'); ?></span>
+							<br /><span class="description"><?php _e( 'The ID will be used as in internal identifier for shortcodes.', 'podlove' ); ?></span>
 						</td>
 					</tr>
 					<tr>
 						<td scope="row">
-							<label for="podlove_button_title"><?php _e('Podcast Title', 'podlove'); ?></label>
+							<label for="podlove_button_title"><?php _e( 'Podcast Title', 'podlove' ); ?></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'); ?></label>
+							<label for="podlove_button_subtitle"><?php _e( 'Podcast Subtitle', 'podlove' ); ?></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'); ?></label>
+							<label for="podlove_button_description"><?php _e( 'Podcast Description', 'podlove' ); ?></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'); ?></label>
+							<label for="podlove-button-cover"><?php _e( 'Podcast Image URL', 'podlove' ); ?></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'); ?></label>
+							<label for="feeds_table"><?php _e( 'Podcast Feeds', 'podlove' ); ?></label>
 						</td>
 						<td>
 							<table id="feeds_table" class="podlove_alternating" border="0" cellspacing="0">
 								<thead>
 									<tr>
-										<th><?php _e('URL', 'podlove'); ?></th>
-										<th><?php _e('iTunes feed ID', 'podlove'); ?></th>
-										<th><?php _e('Media format', 'podlove'); ?></th>
-										<th><?php _e('Actions', 'podlove'); ?></th>
+										<th><?php _e( 'URL', 'podlove' ); ?></th>
+										<th><?php _e( 'iTunes feed ID', 'podlove' ); ?></th>
+										<th><?php _e( 'Media format', 'podlove' ); ?></th>
+										<th><?php _e( 'Actions', 'podlove' ); ?></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'); ?></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' ); ?></span></p>
 						</td>
 					</tr>
 					</tbody>
 				</table>
-				<input name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'podlove'); ?>" type="submit" />
-				<input type="submit" name="submit_and_stay" id="submit_and_stay" class="button" value="<?php _e('Save Changes and Continue Editing', 'podlove'); ?>"  />
+				<input name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'podlove' ); ?>" type="submit" />
+				<input type="submit" name="submit_and_stay" id="submit_and_stay" class="button" value="<?php _e( 'Save Changes and Continue Editing', 'podlove' ); ?>"  />
 
 				<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,16 +319,16 @@ 
 					</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
 	}
 
-	public static function get_action_link( $button, $title, $action = 'edit', $type = 'link' ) {
+	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"' : ''

Upper-Lower-Casing +10 added lines, -10 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') ) );
+			$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>
@@ -54,9 +54,9 @@ 
 		$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 ) );
+			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 ) );
 		}
 	}
 	/**
@@ -71,9 +71,9 @@ 
 		$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 ) );
+			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 ) );
 		}
 	}
 
@@ -87,13 +87,13 @@ 
 		$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 ) {
+	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');
 		$show    = ( $button_id ) ? '&button=' . $button_id : '';
 		$action  = '&action=' . $action;
@@ -107,7 +107,7 @@ 
 		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();
@@ -217,7 +217,7 @@ 
 		// Adjust if is_network
 		$is_network = is_network_admin();
 		?>
-		<form method="post" action="<?php echo ( $is_network === TRUE ? '/wp-admin/network/settings' : 'options-general' ) ?>.php?page=podlove-subscribe-button&button=<?php echo $button->id; ?>&action=<?php echo $action; ?>&network=<?php echo $is_network; ?>">
+		<form method="post" action="<?php echo ( $is_network === true ? '/wp-admin/network/settings' : 'options-general' ) ?>.php?page=podlove-subscribe-button&button=<?php echo $button->id; ?>&action=<?php echo $action; ?>&network=<?php echo $is_network; ?>">
 			<input type="hidden" value="<?php echo $button->id; ?>" name="podlove_button[id]" />
 			<table class="form-table" border="0" cellspacing="0">
 					<tbody>

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*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>',
-		    /*$3%s*/ $this->row_actions( $actions )
+			/*$1%s*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>',
+			/*$3%s*/ $this->row_actions( $actions )
 		);
 	}
 
@@ -83,9 +83,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 +12 added lines, -12 removed lines

@@ -1,37 +1,37 @@ 
 <?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?
 		) );
 	}
 	
-	function column_name( $button ) {
+	function column_name ( $button ) {
 
 		$actions = array(
 			'edit'   => Settings\Buttons::get_action_link( $button, __( 'Edit', 'podlove-subscribe-button' ), 'edit' ),
 			'delete' => Settings\Buttons::get_action_link( $button, __( 'Delete', 'podlove-subscribe-button' ), 'confirm_delete' )
 		);
 	
-		return sprintf('%1$s %2$s',
+		return sprintf( '%1$s %2$s',
 		    /*$1%s*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>',
 		    /*$3%s*/ $this->row_actions( $actions )
 		);
 	}
 
-	function column_button_preview( $button ) {
+	function column_button_preview ( $button ) {
 		if ( ! $button->feeds )
 			return;
 
@@ -41,24 +41,24 @@ 
 			. $button->render(
 					'big',
 					'false',
-					get_option('podlove_subscribe_button_default_style', 'filled'),
+					get_option( 'podlove_subscribe_button_default_style', 'filled' ),
 					'rectangle'
 				) 
 			. "</div>";
 	}
 	
-	function column_id( $button ) {
+	function column_id ( $button ) {
 		return $button->id;
 	}
 
-	function get_columns(){
+	function get_columns () {
 		return array(
 			'name'    => __( 'Title & Shortcode', 'podlove-subscribe-button' ),
 			'button_preview'    => __( 'Preview', 'podlove-subscribe-button' )
 		);
 	}
 	
-	function prepare_items() {
+	function prepare_items () {
 		// number of items per page
 		$per_page = 1000;
 		
@@ -77,7 +77,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 +6 added lines, -5 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
@@ -32,8 +32,9 @@ 
 	}
 
 	function column_button_preview( $button ) {
-		if ( ! $button->feeds )
-			return;
+		if ( ! $button->feeds ) {
+					return;
+		}
 
 		$is_network = is_network_admin();
 
@@ -51,7 +52,7 @@ 
 		return $button->id;
 	}
 
-	function get_columns(){
+	function get_columns() {
 		return array(
 			'name'    => __( 'Title & Shortcode', 'podlove-subscribe-button' ),
 			'button_preview'    => __( 'Preview', 'podlove-subscribe-button' )

widget.php

Indentation +1 added lines, -1 removed lines

@@ -139,5 +139,5 @@
 	}
 }
 add_action( 'widgets_init', function(){
-     register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
+	 register_widget( '\PodloveSubscribeButton\Podlove_Subscribe_Button_Widget' );
 });
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -6,57 +6,57 @@ 
 
 class Podlove_Subscribe_Button_Widget extends \WP_Widget {
 
-	public function __construct() {
+	public function __construct () {
 		parent::__construct(
 					'podlove_subscribe_button_wp_plugin_widget',
 					( self::is_podlove_publisher_active() ? 'Podlove Subscribe Button' : 'Podlove Subscribe Button (WordPress plugin)' ),
-					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-publisher/plugin.php") )
+	public static function is_podlove_publisher_active () {
+		if ( is_plugin_active( "podlove-publisher/plugin.php" ) )
 			return true;
 
 		return false;
 	}
 
-	public function widget( $args, $instance ) {
+	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] : '';
+	public function form ( $instance ) {
+		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>";
 			}
 		}
 		?>
@@ -78,15 +78,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'); ?>">
-						<?php $buttons_as_options($buttons); ?>
+				<?php if ( isset( $network_buttons ) && count( $network_buttons ) > 0 ) : ?>
+					<optgroup label="<?php _e( 'Local', 'podlove' ); ?>">
+						<?php $buttons_as_options( $buttons ); ?>
 					</optgroup>
-					<optgroup label="<?php _e('Network', 'podlove'); ?>">
-						<?php $buttons_as_options($network_buttons); ?>
+					<optgroup label="<?php _e( 'Network', 'podlove' ); ?>">
+						<?php $buttons_as_options( $network_buttons ); ?>
 					</optgroup>
 				<?php else : 
-					$buttons_as_options($buttons);
+					$buttons_as_options( $buttons );
 				 endif; ?>
 			</select>
 
@@ -110,12 +110,12 @@ 
 						)
 				);
 
-			foreach ($customize_options as $slug => $properties) : ?>
-				<label for="<?php echo $this->get_field_id( $slug ); ?>"><?php _e( $properties['name'], 'podlove-subscribe-button' ); ?></label> 
+			foreach ( $customize_options as $slug => $properties ) : ?>
+				<label for="<?php echo $this->get_field_id( $slug ); ?>"><?php _e( $properties[ 'name' ], 'podlove-subscribe-button' ); ?></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 _e( 'Default ' . $properties['name'], 'podlove-subscribe-button' ) ?></option>
+					<option value="default" <?php echo ( $$slug == 'default' ? 'selected="selected"' : '' ); ?>><?php _e( 'Default ' . $properties[ 'name' ], 'podlove-subscribe-button' ) ?></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 _e( $name, 'podlove-subscribe-button' ) ?></option>
 						<?php endforeach; ?>
 					</optgroup>
@@ -128,16 +128,16 @@ 
 		<?php 
 	}
 
-	public function update( $new_instance, $old_instance ) {
+	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 +16 added lines, -10 removed lines

@@ -17,16 +17,18 @@ 
 	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-publisher/plugin.php") )
-			return true;
+		if ( is_plugin_active("podlove-publisher/plugin.php") ) {
+					return true;
+		}
 
 		return false;
 	}
 
 	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'];
@@ -39,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'];
 	}	
@@ -51,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) {
@@ -85,8 +89,10 @@ 
 					<optgroup label="<?php _e('Network', 'podlove'); ?>">
 						<?php $buttons_as_options($network_buttons); ?>
 					</optgroup>
-				<?php else : 
+				<?php else {
+	: 
 					$buttons_as_options($buttons);
+}
 				 endif; ?>
 			</select>
 
@@ -138,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

model/network_button.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 class NetworkButton extends Button {
 
-	public static function table_name() {
+	public static function table_name () {
 		global $wpdb;
 		
 		// prefix with $wpdb prefix

version.php

Spacing +15 added lines, -15 removed lines

@@ -45,8 +45,8 @@ 
 add_action( 'admin_init', '\PodloveSubscribeButton\maybe_run_database_migrations' );
 add_action( 'admin_init', '\PodloveSubscribeButton\run_database_migrations', 5 );
 
-function maybe_run_database_migrations() {
-	$database_version = get_option('podlove_subscribe_button_plugin_database_version');
+function maybe_run_database_migrations () {
+	$database_version = get_option( 'podlove_subscribe_button_plugin_database_version' );
 
 	if ( $database_version === false ) {
 		// plugin has just been installed or Plugin Version < 1.3
@@ -54,29 +54,29 @@ 
 	}
 }
 
-function run_database_migrations() {
-	if (get_option('podlove_subscribe_button_plugin_database_version') >= DATABASE_VERSION)
+function run_database_migrations () {
+	if ( get_option( 'podlove_subscribe_button_plugin_database_version' ) >= DATABASE_VERSION )
 		return;
 
-	if (is_multisite()) {
-		set_time_limit(0); // may take a while, depending on network size
-		\PodloveSubscribeButton\for_every_podcast_blog(function() { migrate_for_current_blog(); });
+	if ( is_multisite() ) {
+		set_time_limit( 0 ); // may take a while, depending on network size
+		\PodloveSubscribeButton\for_every_podcast_blog( function() { migrate_for_current_blog(); });
 	} else {
 		migrate_for_current_blog();
 	}
 
-	if (isset($_REQUEST['_wp_http_referer']) && $_REQUEST['_wp_http_referer']) {
-		wp_redirect($_REQUEST['_wp_http_referer']);
+	if ( isset( $_REQUEST[ '_wp_http_referer' ] ) && $_REQUEST[ '_wp_http_referer' ] ) {
+		wp_redirect( $_REQUEST[ '_wp_http_referer' ] );
 		exit;
 	}
 }
 
-function migrate_for_current_blog() {
-	$database_version = get_option('podlove_subscribe_button_plugin_database_version');
+function migrate_for_current_blog () {
+	$database_version = get_option( 'podlove_subscribe_button_plugin_database_version' );
 
-	for ($i = $database_version+1; $i <= DATABASE_VERSION; $i++) { 
-		\PodloveSubscribeButton\run_migrations_for_version($i);
-		update_option('podlove_subscribe_button_plugin_database_version', $i);
+	for ( $i = $database_version + 1; $i <= DATABASE_VERSION; $i++ ) { 
+		\PodloveSubscribeButton\run_migrations_for_version( $i );
+		update_option( 'podlove_subscribe_button_plugin_database_version', $i );
 	}
 }
 
@@ -87,7 +87,7 @@ 
  * 
  * @param  int $version
  */
-function run_migrations_for_version( $version ) {
+function run_migrations_for_version ( $version ) {
 	global $wpdb;
 	
 	switch ( $version ) {}

Braces +4 added lines, -3 removed lines

@@ -55,8 +55,9 @@ 
 }
 
 function run_database_migrations() {
-	if (get_option('podlove_subscribe_button_plugin_database_version') >= DATABASE_VERSION)
-		return;
+	if (get_option('podlove_subscribe_button_plugin_database_version') >= DATABASE_VERSION) {
+			return;
+	}
 
 	if (is_multisite()) {
 		set_time_limit(0); // may take a while, depending on network size
@@ -74,7 +75,7 @@ 
 function migrate_for_current_blog() {
 	$database_version = get_option('podlove_subscribe_button_plugin_database_version');
 
-	for ($i = $database_version+1; $i <= DATABASE_VERSION; $i++) { 
+	for ($i = $database_version+1; $i <= DATABASE_VERSION; $i++) {
 		\PodloveSubscribeButton\run_migrations_for_version($i);
 		update_option('podlove_subscribe_button_plugin_database_version', $i);
 	}