cfoellmann / podlove-subscribe-button-wp-plugin

version.php

Spacing +8 added lines, -8 removed lines

@@ -40,17 +40,17 @@ 
 namespace PodloveSubscribeButton;
 use \PodloveSubscribeButton\Model;
 
-define( __NAMESPACE__ . '\DATABASE_VERSION', 2 );
+define(__NAMESPACE__ . '\DATABASE_VERSION', 2);
 
-add_action( 'admin_init', '\PodloveSubscribeButton\maybe_run_database_migrations' );
-add_action( 'admin_init', '\PodloveSubscribeButton\run_database_migrations', 5 );
+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');
 
-	if ( $database_version === false ) {
+	if ($database_version === false) {
 		// plugin has just been installed or Plugin Version < 1.3
-		update_option( 'podlove_subscribe_button_plugin_database_version', DATABASE_VERSION );
+		update_option('podlove_subscribe_button_plugin_database_version', DATABASE_VERSION);
 	}
 }
 
@@ -74,7 +74,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);
 	}
@@ -87,9 +87,9 @@ 
  * 
  * @param  int $version
  */
-function run_migrations_for_version( $version ) {
+function run_migrations_for_version($version) {
 	global $wpdb;
 	
-	switch ( $version ) {}
+	switch ($version) {}
 
 }
\ No newline at end of file

Braces +3 added lines, -2 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

helper.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	$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) {

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);

constants.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@
 
 namespace PodloveSubscribeButton;
 
-define( __NAMESPACE__ . '\PLUGIN_FILE_NAME', strtolower( preg_replace( '/([a-z])([A-Z])/', '$1-$2', __NAMESPACE__ ) ) . '.php' );
-define( __NAMESPACE__ . '\PLUGIN_DIR' , plugin_dir_path( dirname(__FILE__) ) );
-define( __NAMESPACE__ . '\PLUGIN_FILE', PLUGIN_DIR . PLUGIN_FILE_NAME );
-define( __NAMESPACE__ . '\PLUGIN_URL' , plugins_url( '', PLUGIN_FILE ) );
\ No newline at end of file
+define(__NAMESPACE__ . '\PLUGIN_FILE_NAME', strtolower(preg_replace('/([a-z])([A-Z])/', '$1-$2', __NAMESPACE__)) . '.php');
+define(__NAMESPACE__ . '\PLUGIN_DIR', plugin_dir_path(dirname(__FILE__)));
+define(__NAMESPACE__ . '\PLUGIN_FILE', PLUGIN_DIR . PLUGIN_FILE_NAME);
+define(__NAMESPACE__ . '\PLUGIN_URL', plugins_url('', PLUGIN_FILE));
\ No newline at end of file

podlove.php

Spacing +40 added lines, -40 removed lines

@@ -11,9 +11,9 @@ 
  * Text Domain: podlove-subscribe-button
  */
 
-$correct_php_version = version_compare( phpversion(), "5.3", ">=" );
+$correct_php_version = version_compare(phpversion(), "5.3", ">=");
 
-if ( ! $correct_php_version ) {
+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();
 	exit;
@@ -37,35 +37,35 @@ 
 // Helper functions
 require('helper.php');
 
-add_action( 'admin_menu', array( 'PodloveSubscribeButton', 'admin_menu') );
-if ( is_multisite() )
-	add_action( 'network_admin_menu', array( 'PodloveSubscribeButton', 'admin_network_menu') );
+add_action('admin_menu', array('PodloveSubscribeButton', 'admin_menu'));
+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' ) );
+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' );
-	wp_enqueue_style( 'podlove-subscribe-button' );
+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 () {
+add_action('admin_init', function() {
 	$settings = array('size', 'autowidth', 'style', 'format', 'color');
 
 	foreach ($settings as $setting) {
-		register_setting( 'podlove-subscribe-button', 'podlove_subscribe_button_default_' . $setting );
+		register_setting('podlove-subscribe-button', 'podlove_subscribe_button_default_' . $setting);
 	}
 } );
 
-add_shortcode( 'podlove-subscribe-button', array( 'PodloveSubscribeButton', 'shortcode' ) );
+add_shortcode('podlove-subscribe-button', array('PodloveSubscribeButton', 'shortcode'));
 
-add_action( 'plugins_loaded', function () {
-	load_plugin_textdomain( 'podlove-subscribe-button' );
+add_action('plugins_loaded', function() {
+	load_plugin_textdomain('podlove-subscribe-button');
 } );
 
 
@@ -77,7 +77,7 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array('PodloveSubscribeButton\Settings\Buttons', 'page')
 			);
 	}
 
@@ -88,14 +88,14 @@ 
 				'Podlove Subscribe Button',
 				'manage_options',
 				'podlove-subscribe-button',
-				array( 'PodloveSubscribeButton\Settings\Buttons', 'page')
+				array('PodloveSubscribeButton\Settings\Buttons', 'page')
 			);
 	}
 
 	public static function build_models() {
 		// Build Databases
 		\PodloveSubscribeButton\Model\Button::build();
-		if ( is_multisite() )
+		if (is_multisite())
 			\PodloveSubscribeButton\Model\NetworkButton::build();
 
 		// Set Button "default" values
@@ -108,43 +108,43 @@ 
 			);
 
 		foreach ($default_values as $option => $default_value) {
-			if ( ! get_option('podlove_subscribe_button_default_' . $option ) ) {
+			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']) ) {
+	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'];
 		}
 
 		// 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') );
+		$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']) ) {
+		if (isset($args['language'])) {
 			$language = $args['language'];
 		} else {
 			$language = 'en';
 		}
 
-		if ( isset($args['color']) ) {
+		if (isset($args['color'])) {
 			$color = $args['color'];
 		} else {
 			$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;
@@ -155,7 +155,7 @@ 
 	}
 
 	public static function get_array_value_with_fallback($args, $key) {
-		if ( isset($args[$key]) )
+		if (isset($args[$key]))
 			return $args[$key];
 
 		return FALSE;
@@ -166,8 +166,8 @@ 
 	 * @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]);
@@ -179,10 +179,10 @@ 
 	 * @param  string $width_attribute
 	 * @return string
 	 */
-	private static function interpret_width_attribute( $width_attribute = NULL ) {
-		if ( $width_attribute == 'auto' )
+	private static function interpret_width_attribute($width_attribute = NULL) {
+		if ($width_attribute == 'auto')
 			return 'on';
-		if ( $width_attribute && $width_attribute !== 'auto' )
+		if ($width_attribute && $width_attribute !== 'auto')
 			return 'off';
 
 		return get_option('podlove_subscribe_button_default_autowidth', 'on');

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');
 	}

model/network_button.php

Spacing +7 added lines, -7 removed lines

@@ -12,10 +12,10 @@
 
 }
 
-NetworkButton::property( 'id', 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY' );
-NetworkButton::property( 'name', 'VARCHAR(255)' );
-NetworkButton::property( 'title', 'VARCHAR(255)' );
-NetworkButton::property( 'subtitle', 'VARCHAR(255)' );
-NetworkButton::property( 'description', 'TEXT' );
-NetworkButton::property( 'cover', 'VARCHAR(255)' );
-NetworkButton::property( 'feeds', 'TEXT' );
\ No newline at end of file
+NetworkButton::property('id', 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY');
+NetworkButton::property('name', 'VARCHAR(255)');
+NetworkButton::property('title', 'VARCHAR(255)');
+NetworkButton::property('subtitle', 'VARCHAR(255)');
+NetworkButton::property('description', 'TEXT');
+NetworkButton::property('cover', 'VARCHAR(255)');
+NetworkButton::property('feeds', 'TEXT');
\ No newline at end of file

model/button.php

Spacing +23 added lines, -23 removed lines

@@ -45,11 +45,11 @@ 
 	 * @return object||FALSE
 	 */
 	public static function get_button_by_name($name) {
-		if ( $button = \PodloveSubscribeButton\Model\Button::find_one_by_property('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() ) {
+	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 );
+			$settings[$property] = (get_option('podlove_subscribe_button_default_' . $property) ? get_option('podlove_subscribe_button_default_' . $property) : $default);
 		}
 
 		return $settings;
@@ -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(
@@ -105,9 +105,9 @@ 
 	 * Provides the feed as an array in the required format
 	 * @return array
 	 */
-	private function get_feeds_as_array( $feeds=array() ) {
+	private function get_feeds_as_array($feeds = array()) {
 		foreach ($feeds as $feed) {
-			if ( isset(\PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension']) ) {
+			if (isset(\PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension'])) {
 				$new_feed = array(
 						'type' => 'audio',
 						'format' => \PodloveSubscribeButton\MediaTypes::$audio[$feed['format']]['extension'],
@@ -115,7 +115,7 @@ 
 						'variant' => 'high'
 					);
 
-				if ( isset($feed['itunesfeedid']) && $feed['itunesfeedid'] > 0 )
+				if (isset($feed['itunesfeedid']) && $feed['itunesfeedid'] > 0)
 					$new_feed['directory-url-itunes'] = "https://itunes.apple.com/podcast/id" . $feed['itunesfeedid'];
 
 				$feeds[] = $new_feed;
@@ -132,7 +132,7 @@ 
 	 * @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) {
 			$data_attributes .= 'data-' . $attribute . '="' . $value . '" ';
@@ -140,7 +140,7 @@ 
 
 		return"
 			<script>
-				podcastData".$this->id . " = ".json_encode($podcast_data)."
+				podcastData".$this->id . " = " . json_encode($podcast_data) . "
 			</script>
 			<script 
 				class=\"podlove-subscribe-button\" 
@@ -162,11 +162,11 @@ 
 
 		return array(
 				// $attribute => $value
-				'size' => ( $size == 'default' ? get_option('podlove_subscribe_button_default_size', $size) : $size )
+				'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) ),
+				'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
 			);
 	}
@@ -177,20 +177,20 @@ 
 	 * @return string
 	 */
 	private static function interpret_autowidth_attribute($autowidth) {
-		if ( $autowidth == 'default' && get_option('podlove_subscribe_button_default_autowidth') !== 'on' )
+		if ($autowidth == 'default' && get_option('podlove_subscribe_button_default_autowidth') !== 'on')
 			return '';
 
-		if ( $autowidth !== 'default' && $autowidth !== 'on' )
+		if ($autowidth !== 'default' && $autowidth !== 'on')
 			return '';
 
 		return ' auto';
 	}
 }
 
-Button::property( 'id', 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY' );
-Button::property( 'name', 'VARCHAR(255)' );
-Button::property( 'title', 'VARCHAR(255)' );
-Button::property( 'subtitle', 'VARCHAR(255)' );
-Button::property( 'description', 'TEXT' );
-Button::property( 'cover', 'VARCHAR(255)' );
-Button::property( 'feeds', 'TEXT' );
\ No newline at end of file
+Button::property('id', 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY');
+Button::property('name', 'VARCHAR(255)');
+Button::property('title', 'VARCHAR(255)');
+Button::property('subtitle', 'VARCHAR(255)');
+Button::property('description', 'TEXT');
+Button::property('cover', 'VARCHAR(255)');
+Button::property('feeds', 'TEXT');
\ No newline at end of file

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';
 	}

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 );

Spacing +89 added lines, -89 removed lines

@@ -14,41 +14,41 @@ 
 	 */
 	private $data = array();
 	
-	public function __set( $name, $value ) {
-		if ( static::has_property( $name ) ) {
-			$this->set_property( $name, $value );
+	public function __set($name, $value) {
+		if (static::has_property($name)) {
+			$this->set_property($name, $value);
 		} else {
 			$this->$name = $value;
 		}
 	}
 	
-	private function set_property( $name, $value ) {
-		$this->data[ $name ] = $value;
+	private function set_property($name, $value) {
+		$this->data[$name] = $value;
 	}
 	
-	public function __get( $name ) {
-		if ( static::has_property( $name ) ) {
-			return $this->get_property( $name );
-		} elseif ( property_exists( $this, $name ) ) {
+	public function __get($name) {
+		if (static::has_property($name)) {
+			return $this->get_property($name);
+		} elseif (property_exists($this, $name)) {
 			return $this->$name;
 		} else {
 			return NULL;
 		}
 	}
 	
-	private function get_property( $name ) {
-		if ( isset( $this->data[ $name ] ) ) {
-			return $this->data[ $name ];
+	private function get_property($name) {
+		if (isset($this->data[$name])) {
+			return $this->data[$name];
 		} else {
 			return NULL;
 		}
 	}
 
 	private static function unserialize_property($property) {
-		if ( ! isset($property) )
+		if ( ! isset($property))
 			return;
 
-		if ( $unserialized_string = is_serialized($property) )
+		if ($unserialized_string = is_serialized($property))
 			return unserialize($property);
 
 		return $property;
@@ -79,21 +79,21 @@ 
 	 * @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 ] ) ) {
-			static::$properties[ $class ] = array();
+		if ( ! isset(static::$properties[$class])) {
+			static::$properties[$class] = array();
 		}
 
 		// "id" columns and those ending on "_id" get an index by default
-		$index = $name == 'id' || stripos( $name, '_id' );
+		$index = $name == 'id' || stripos($name, '_id');
 		// but if the argument is set, it overrides the default
 		if (isset($args['index'])) {
 			$index = $args['index'];
 		}
 		
-		static::$properties[ $class ][] = array(
+		static::$properties[$class][] = array(
 			'name'  => $name,
 			'type'  => $type,
 			'index' => $index,
@@ -110,11 +110,11 @@ 
 	private static function properties() {
 		$class = get_called_class();
 		
-		if ( ! isset( static::$properties[ $class ] ) ) {
-			static::$properties[ $class ] = array();
+		if ( ! isset(static::$properties[$class])) {
+			static::$properties[$class] = array();
 		}
 		
-		return static::$properties[ $class ];
+		return static::$properties[$class];
 	}
 	
 	/**
@@ -123,8 +123,8 @@ 
 	 * @param string $name name of the property to test
 	 * @return bool True if the property exists, else false.
 	 */
-	public static function has_property( $name ) {
-		return in_array( $name, static::property_names() );
+	public static function has_property($name) {
+		return in_array($name, static::property_names());
 	}
 	
 	/**
@@ -133,7 +133,7 @@ 
 	 * @return array property names
 	 */
 	public static function property_names() {
-		return array_map( function ( $p ) { return $p['name']; } , static::properties() );
+		return array_map(function($p) { return $p['name']; } , static::properties());
 	}
 	
 	/**
@@ -154,47 +154,47 @@ 
 		global $wpdb;
 		
 		$sql = 'SELECT COUNT(*) FROM ' . static::table_name();
-		return (int) $wpdb->get_var( $sql );
+		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();
 		$model = new $class();
 		$model->flag_as_not_new();
 		
-		$row = $wpdb->get_row( 'SELECT * FROM ' . static::table_name() . ' WHERE id = ' . (int) $id );
+		$row = $wpdb->get_row('SELECT * FROM ' . static::table_name() . ' WHERE id = ' . (int) $id);
 		
-		if ( ! $row ) {
+		if ( ! $row) {
 			return NULL;
 		}
 		
-		foreach ( $row as $property => $value ) {
+		foreach ($row as $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 ) {
+		if ( ! $rows) {
 			return array();
 		}
 		
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$model = new $class();
 			$model->flag_as_not_new();
-			foreach ( $row as $property => $value ) {
+			foreach ($row as $property => $value) {
 				$model->$property = static::unserialize_property($value);
 			}
 			$models[] = $model;
@@ -203,7 +203,7 @@ 
 		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,21 +211,21 @@ 
 		$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 ) {
+		if ( ! $row) {
 			return NULL;
 		}
 		
-		foreach ( $row as $property => $value ) {
+		foreach ($row as $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();
@@ -235,14 +235,14 @@ 
 			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $where
 		);
 		
-		if ( ! $rows ) {
+		if ( ! $rows) {
 			return array();
 		}
 		
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$model = new $class();
 			$model->flag_as_not_new();
-			foreach ( $row as $property => $value ) {
+			foreach ($row as $property => $value) {
 				$model->$property = static::unserialize_property($value);
 			}
 			$models[] = $model;
@@ -251,7 +251,7 @@ 
 		return $models;
 	}
 	
-	public static function find_one_by_where( $where ) {
+	public static function find_one_by_where($where) {
 		global $wpdb;
 		
 		$class = get_called_class();
@@ -262,11 +262,11 @@ 
 			'SELECT * FROM ' . static::table_name() . ' WHERE ' . $where . ' LIMIT 0,1'
 		);
 		
-		if ( ! $row ) {
+		if ( ! $row) {
 			return NULL;
 		}
 		
-		foreach ( $row as $property => $value ) {
+		foreach ($row as $property => $value) {
 			$model->$property = static::unserialize_property($value);
 		}
 		
@@ -278,18 +278,18 @@ 
 	 * @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();
 		$models = array();
 		
-		$rows = $wpdb->get_results( 'SELECT * FROM ' . static::table_name() . ' ' . $sql_suffix );
+		$rows = $wpdb->get_results('SELECT * FROM ' . static::table_name() . ' ' . $sql_suffix);
 
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$model = new $class();
 			$model->flag_as_not_new();
-			foreach ( $row as $property => $value ) {
+			foreach ($row as $property => $value) {
 				$model->$property = static::unserialize_property($value);
 			}
 			$models[] = $model;
@@ -317,24 +317,24 @@ 
 	 * @param  array $attributes
 	 * @return bool
 	 */
-	public function update_attributes( $attributes ) {
+	public function update_attributes($attributes) {
 
-		if ( ! is_array( $attributes ) )
+		if ( ! is_array($attributes))
 			return false;
 
 		$request = filter_input_array(INPUT_POST); // Do this for security reasons
 			
-		foreach ( $attributes as $key => $value ) {
-			if ( is_array($value) ) {
+		foreach ($attributes as $key => $value) {
+			if (is_array($value)) {
 				$this->{$key} = serialize($value);
 			} else {
 				$this->{$key} = esc_sql($value);
 			}
 		}
 		
-		if ( isset( $request['checkboxes'] ) && is_array( $request['checkboxes'] ) ) {
-			foreach ( $request['checkboxes'] as $checkbox ) {
-				if ( isset( $attributes[ $checkbox ] ) && $attributes[ $checkbox ] === 'on' ) {
+		if (isset($request['checkboxes']) && is_array($request['checkboxes'])) {
+			foreach ($request['checkboxes'] as $checkbox) {
+				if (isset($attributes[$checkbox]) && $attributes[$checkbox] === 'on') {
 					$this->$checkbox = 1;
 				} else {
 					$this->$checkbox = 0;
@@ -345,9 +345,9 @@ 
 		// @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 ) {
-				$this->$password = $attributes[ $password ];
+		if (isset($request['passwords']) && is_array($request['passwords'])) {
+			foreach ($request['passwords'] as $password) {
+				$this->$password = $attributes[$password];
 			}
 		}
 		return $this->save();
@@ -373,7 +373,7 @@ 
 			$this->id
 		);
 
-		return $wpdb->query( $sql );
+		return $wpdb->query($sql);
 	}
 	
 	/**
@@ -384,32 +384,32 @@ 
 	public function save() {
 		global $wpdb;
 
-		if ( $this->is_new() ) {
+		if ($this->is_new()) {
 
 			$this->set_defaults();
 
 			$sql = 'INSERT INTO '
 			     . static::table_name()
 			     . ' ( '
-			     . implode( ',', static::property_names() )
+			     . implode(',', static::property_names())
 			     . ' ) '
 			     . 'VALUES'
 			     . ' ( '
-			     . implode( ',', array_map( array( $this, 'property_name_to_sql_value' ), static::property_names() ) )
+			     . implode(',', array_map(array($this, 'property_name_to_sql_value'), static::property_names()))
 			     . ' );'
 			;
-			$success = $wpdb->query( $sql );
-			if ( $success ) {
+			$success = $wpdb->query($sql);
+			if ($success) {
 				$this->id = $wpdb->insert_id;
 			}
 		} else {
 			$sql = 'UPDATE ' . static::table_name()
 			     . ' SET '
-			     . implode( ',', array_map( array( $this, 'property_name_to_sql_update_statement' ), static::property_names() ) )
+			     . implode(',', array_map(array($this, 'property_name_to_sql_update_statement'), static::property_names()))
 			     . ' WHERE id = ' . $this->id
 			;
 
-			$success = $wpdb->query( $sql );
+			$success = $wpdb->query($sql);
 		}
 
 		$this->is_new = false;
@@ -429,11 +429,11 @@ 
 		
 		$defaults = $this->default_values();
 
-		if ( ! is_array( $defaults ) || empty( $defaults ) )
+		if ( ! is_array($defaults) || empty($defaults))
 			return;
 
-		foreach ( $defaults as $property => $value ) {
-			if ( $this->$property === NULL )
+		foreach ($defaults as $property => $value) {
+			if ($this->$property === NULL)
 				$this->$property = $value;
 		}
 
@@ -457,7 +457,7 @@ 
 		     . static::table_name()
 		     . ' WHERE id = ' . $this->id;
 
-		$rows_affected = $wpdb->query( $sql );
+		$rows_affected = $wpdb->query($sql);
 
 	    do_action('podlove_model_delete', $this);
 	    do_action('podlove_model_change', $this);
@@ -465,21 +465,21 @@ 
 		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 ) );
+		if ($this->$p !== NULL && $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 !== '' ) {
-			return sprintf( "'%s'", $this->$p );
+		if ($this->$p !== NULL && $this->$p !== '') {
+			return sprintf("'%s'", $this->$p);
 		} else {
 			return 'NULL';
 		}
@@ -495,17 +495,17 @@ 
 		global $wpdb;
 		
 		$property_sql = array();
-		foreach ( static::properties() as $property )
+		foreach (static::properties() as $property)
 			$property_sql[] = "`{$property['name']}` {$property['type']}";
 		
 		$sql = 'CREATE TABLE IF NOT EXISTS '
 		     . static::table_name()
 		     . ' ('
-		     . implode( ',', $property_sql )
+		     . implode(',', $property_sql)
 		     . ' ) CHARACTER SET utf8;'
 		;
 		
-		$wpdb->query( $sql );
+		$wpdb->query($sql);
 
 		static::build_indices();
 	}
@@ -521,16 +521,16 @@ 
 		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 );
+		$indices = $wpdb->get_results($indices_sql);
+		$index_columns = array_map(function($index) { return $index->Column_name; }, $indices);
 
-		foreach ( static::properties() as $property ) {
+		foreach (static::properties() as $property) {
 
-			if ( $property['index'] && ! in_array( $property['name'], $index_columns ) ) {
+			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 );
+				$wpdb->query($sql);
 			}
 		}
 	}
@@ -542,11 +542,11 @@ 
 		// get name of implementing class
 		$table_name = get_called_class();
 		// replace backslashes from namespace by underscores
-		$table_name = str_replace( '\\', '_', $table_name );
+		$table_name = str_replace('\\', '_', $table_name);
 		// remove Models subnamespace from name
-		$table_name = str_replace( 'Model_', '', $table_name );
+		$table_name = str_replace('Model_', '', $table_name);
 		// all lowercase
-		$table_name = strtolower( $table_name );
+		$table_name = strtolower($table_name);
 
 		return $table_name;
 	}

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()

settings/buttons.php

Spacing +53 added lines, -53 removed lines

@@ -9,29 +9,29 @@ 
 		$action = null !== filter_input(INPUT_GET, 'action') ? filter_input(INPUT_GET, 'action') : NULL;
 		$is_network = is_network_admin();
 
-		if ( $action == 'confirm_delete' && null !== filter_input(INPUT_GET, 'button') ) {
-			$button = ( $is_network === TRUE ? \PodloveSubscribeButton\Model\NetworkButton::find_by_id( (int) filter_input(INPUT_GET, 'button') ) : \PodloveSubscribeButton\Model\Button::find_by_id( (int) filter_input(INPUT_GET, 'button') ) );
+		if ($action == 'confirm_delete' && null !== filter_input(INPUT_GET, 'button')) {
+			$button = ($is_network === TRUE ? \PodloveSubscribeButton\Model\NetworkButton::find_by_id((int) filter_input(INPUT_GET, 'button')) : \PodloveSubscribeButton\Model\Button::find_by_id((int) filter_input(INPUT_GET, 'button')));
 			?>
 			<div class="updated">
 				<p>
 					<strong>
-						<?php echo sprintf( __( 'You selected to delete the button "%s". Please confirm this action.', 'podlove-subscribe-button' ), $button->title ) ?>
+						<?php echo sprintf(__('You selected to delete the button "%s". Please confirm this action.', 'podlove-subscribe-button'), $button->title) ?>
 					</strong>
 				</p>
 				<p>
-					<?php echo self::get_action_link( $button, __( 'Delete button permanently', 'podlove-subscribe-button' ), 'delete', 'button' ) ?>
-					<?php echo self::get_action_link( $button, __( 'Don\'t change anything', 'podlove-subscribe-button' ), 'keep', 'button-primary' ) ?>
+					<?php echo self::get_action_link($button, __('Delete button permanently', 'podlove-subscribe-button'), 'delete', 'button') ?>
+					<?php echo self::get_action_link($button, __('Don\'t change anything', 'podlove-subscribe-button'), 'keep', 'button-primary') ?>
 				</p>
 			</div>
 			<?php
 		}
 		?>
 		<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;
+			switch ($action) {
+				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);
 
-		$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));
 		}
 	}
 	/**
@@ -67,13 +67,13 @@ 
 
 		$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,64 +81,64 @@ 
 	 * 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');
-		$show    = ( $button_id ) ? '&button=' . $button_id : '';
+	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 ) ) );
+		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' ) {
+		if ($action === 'save') {
 			self::save();
-		} elseif ( $action === 'create' ) {
+		} elseif ($action === 'create') {
 			self::create();
-		} elseif ( $action === 'delete' ) {
+		} elseif ($action === 'delete') {
 			self::delete();
 		}
 	}
 
 	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>'.
-				__( 'Please fill in your Podcast metadata to create a Podlove Subscription button', 'podlove-subscribe-button' );
-		self::form_template( $button, 'create' );
+		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>';
-		self::form_template( $button, 'save' );
+		echo '<h3>' . sprintf(__('Edit Subscribe button: %s', 'podlove-subscribe-button'), $button->title) . '</h3>';
+		self::form_template($button, 'save');
 	}
 
 	public static function view_template() {
@@ -155,19 +155,19 @@ 
 		// Get the global button settings (with fallback to default values)
 		$settings = \PodloveSubscribeButton\Model\Button::get_global_setting_with_fallback();
 
-		if ( ! $is_network ) :
+		if ( ! $is_network) :
 		?>
 		<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' ); ?>
+			<?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>
 				<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>
+							<option value="<?php echo $value; ?>" <?php echo ($settings['size'] == $value ? "selected" : ''); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -175,7 +175,7 @@ 
 				<tr valign="top">
 				<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">
@@ -189,7 +189,7 @@ 
 				<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>
+							<option value="<?php echo $value; ?>" <?php echo ($settings['style'] == $value ? "selected" : ''); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -199,7 +199,7 @@ 
 				<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>
+							<option value="<?php echo $value; ?>" <?php echo ($settings['format'] == $value ? "selected" : ''); ?>><?php echo $description; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -211,13 +211,13 @@ 
 		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
 		$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>
@@ -310,7 +310,7 @@ 
 							<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";
+										echo "<option value='" . $id . "'>" . $audio['title'] . "</option>\n";
 									}
 								?>
 							</select>
@@ -325,9 +325,9 @@ 
 		<?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>',
+			'<a href="?page=%s&action=%s&button=%s&network=' . is_network_admin() . '"%s>' . $title . '</a>',
 			filter_input(INPUT_GET, 'page'),
 			$action,
 			$button->id,

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 );
 

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 +24 added lines, -24 removed lines

@@ -1,38 +1,38 @@ 
 <?php
 namespace PodloveSubscribeButton;
 
-if( ! class_exists( 'WP_List_Table' ) ){
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+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
+		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?
-		) );
+		));
 	}
 	
-	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' )
+			'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',
 		    /*$1%s*/ $button->title . '<br><code>[podlove-subscribe-button button="' . $button->name . '"]</code>',
-		    /*$3%s*/ $this->row_actions( $actions )
+		    /*$3%s*/ $this->row_actions($actions)
 		);
 	}
 
-	function column_button_preview( $button ) {
-		if ( ! $button->feeds )
+	function column_button_preview($button) {
+		if ( ! $button->feeds)
 			return;
 
 		$is_network = is_network_admin();
@@ -47,14 +47,14 @@ 
 			. "</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' )
+			'name'    => __('Title & Shortcode', 'podlove-subscribe-button'),
+			'button_preview'    => __('Preview', 'podlove-subscribe-button')
 		);
 	}
 	
@@ -66,27 +66,27 @@ 
 		$columns = $this->get_columns();
 		$hidden = array();
 		$sortable = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		
 		// retrieve data
 		// TODO select data for current page only
-		$data = ( is_network_admin() ? \PodloveSubscribeButton\Model\NetworkButton::all() : \PodloveSubscribeButton\Model\Button::all() );
+		$data = (is_network_admin() ? \PodloveSubscribeButton\Model\NetworkButton::all() : \PodloveSubscribeButton\Model\Button::all());
 
 		// get current page
 		$current_page = $this->get_pagenum();
 		// get total items
-		$total_items = count( $data );
+		$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;
 		
 		// register pagination options & calculations
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 		    'total_items' => $total_items,
 		    'per_page'    => $per_page,
-		    'total_pages' => ceil( $total_items / $per_page )
-		) );
+		    'total_pages' => ceil($total_items / $per_page)
+		));
 	}
 
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -32,8 +32,9 @@
 	}
 
 	function column_button_preview( $button ) {
-		if ( ! $button->feeds )
-			return;
+		if ( ! $button->feeds ) {
+					return;
+		}
 
 		$is_network = is_network_admin();