WordPoints / wordpoints

src/includes/apps.php

Spacing +81 added lines, -81 removed lines

@@ -20,8 +20,8 @@ 
  */
 function wordpoints_apps() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
-		WordPoints_App::$main = new WordPoints_App( 'apps' );
+	if ( ! isset(WordPoints_App::$main)) {
+		WordPoints_App::$main = new WordPoints_App('apps');
 	}
 
 	return WordPoints_App::$main;
@@ -36,15 +36,15 @@ 
  *
  * @param WordPoints_App $app The main apps app.
  */
-function wordpoints_apps_init( $app ) {
+function wordpoints_apps_init($app) {
 
 	$apps = $app->sub_apps();
 
-	$apps->register( 'hooks', 'WordPoints_Hooks' );
-	$apps->register( 'entities', 'WordPoints_App_Registry' );
-	$apps->register( 'data_types', 'WordPoints_Class_Registry' );
-	$apps->register( 'components', 'WordPoints_App' );
-	$apps->register( 'modules', 'WordPoints_App' );
+	$apps->register('hooks', 'WordPoints_Hooks');
+	$apps->register('entities', 'WordPoints_App_Registry');
+	$apps->register('data_types', 'WordPoints_Class_Registry');
+	$apps->register('components', 'WordPoints_App');
+	$apps->register('modules', 'WordPoints_App');
 }
 
 /**
@@ -63,13 +63,13 @@ 
  * @return array The slug parsed into the 'generic' and 'dynamic' portions. If the
  *               slug is not dynamic, the value of each of those keys will be false.
  */
-function wordpoints_parse_dynamic_slug( $slug ) {
+function wordpoints_parse_dynamic_slug($slug) {
 
-	$parsed = array( 'dynamic' => false, 'generic' => false );
+	$parsed = array('dynamic' => false, 'generic' => false);
 
-	$parts = explode( '\\', $slug, 2 );
+	$parts = explode('\\', $slug, 2);
 
-	if ( isset( $parts[1] ) ) {
+	if (isset($parts[1])) {
 		$parsed['dynamic'] = $parts[1];
 		$parsed['generic'] = $parts[0];
 	}
@@ -86,7 +86,7 @@ 
  */
 function wordpoints_get_post_types_for_auto_integration() {
 
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to automatically integrate with.
@@ -95,7 +95,7 @@ 
 	 *
 	 * @param string[] $post_types The post type slugs ("names").
 	 */
-	return apply_filters( 'wordpoints_post_types_for_auto_integration', $post_types );
+	return apply_filters('wordpoints_post_types_for_auto_integration', $post_types);
 }
 
 //
@@ -111,13 +111,13 @@ 
  *
  * @return false|WordPoints_App The component's app.
  */
-function wordpoints_component( $slug ) {
+function wordpoints_component($slug) {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'components' )->get_sub_app( $slug );
+	return WordPoints_App::$main->get_sub_app('components')->get_sub_app($slug);
 }
 
 //
@@ -133,13 +133,13 @@ 
  *
  * @return false|WordPoints_App The module's app.
  */
-function wordpoints_module( $slug ) {
+function wordpoints_module($slug) {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'modules' )->get_sub_app( $slug );
+	return WordPoints_App::$main->get_sub_app('modules')->get_sub_app($slug);
 }
 
 //
@@ -155,11 +155,11 @@ 
  */
 function wordpoints_entities() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'entities' );
+	return WordPoints_App::$main->get_sub_app('entities');
 }
 
 /**
@@ -171,12 +171,12 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_app_init( $entities ) {
+function wordpoints_entities_app_init($entities) {
 
 	$sub_apps = $entities->sub_apps();
-	$sub_apps->register( 'children', 'WordPoints_Class_Registry_Children' );
-	$sub_apps->register( 'contexts', 'WordPoints_Entity_Contexts' );
-	$sub_apps->register( 'restrictions', 'WordPoints_Entity_Restrictions' );
+	$sub_apps->register('children', 'WordPoints_Class_Registry_Children');
+	$sub_apps->register('contexts', 'WordPoints_Entity_Contexts');
+	$sub_apps->register('restrictions', 'WordPoints_Entity_Restrictions');
 }
 
 /**
@@ -188,10 +188,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $contexts The entity context registry.
  */
-function wordpoints_entity_contexts_init( $contexts ) {
+function wordpoints_entity_contexts_init($contexts) {
 
-	$contexts->register( 'network', 'WordPoints_Entity_Context_Network' );
-	$contexts->register( 'site', 'WordPoints_Entity_Context_Site' );
+	$contexts->register('network', 'WordPoints_Entity_Context_Network');
+	$contexts->register('site', 'WordPoints_Entity_Context_Site');
 }
 
 /**
@@ -203,11 +203,11 @@ 
  *
  * @param WordPoints_App $restrictions The entity restrictions app.
  */
-function wordpoints_entities_restrictions_app_init( $restrictions ) {
+function wordpoints_entities_restrictions_app_init($restrictions) {
 
 	$sub_apps = $restrictions->sub_apps();
-	$sub_apps->register( 'know', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless' );
-	$sub_apps->register( 'view', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless' );
+	$sub_apps->register('know', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless');
+	$sub_apps->register('view', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless');
 }
 
 /**
@@ -223,7 +223,7 @@ 
  * @param WordPoints_Class_Registry_Deep_Multilevel $restrictions The restrictions
  *                                                                registry.
  */
-function wordpoints_entity_restrictions_know_init( $restrictions ) {
+function wordpoints_entity_restrictions_know_init($restrictions) {
 
 	$restrictions->register(
 		'unregistered'
@@ -237,17 +237,17 @@ 
 		, 'WordPoints_Entity_Restriction_Legacy'
 	);
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
 
 		$restrictions->register(
 			'status_nonpublic'
-			, array( "post\\$slug" )
+			, array("post\\$slug")
 			, 'WordPoints_Entity_Restriction_Post_Status_Nonpublic'
 		);
 
 		$restrictions->register(
 			'post_status_nonpublic'
-			, array( "comment\\$slug" )
+			, array("comment\\$slug")
 			, 'WordPoints_Entity_Restriction_Comment_Post_Status_Nonpublic'
 		);
 	}
@@ -263,13 +263,13 @@ 
  * @param WordPoints_Class_Registry_Deep_Multilevel $restrictions The restrictions
  *                                                                registry.
  */
-function wordpoints_entity_restrictions_view_init( $restrictions ) {
+function wordpoints_entity_restrictions_view_init($restrictions) {
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
 
 		$restrictions->register(
 			'password_protected'
-			, array( "post\\$slug", 'content' )
+			, array("post\\$slug", 'content')
 			, 'WordPoints_Entity_Restriction_View_Post_Content_Password_Protected'
 		);
 	}
@@ -284,21 +284,21 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_init( $entities ) {
+function wordpoints_entities_init($entities) {
 
-	$children = $entities->get_sub_app( 'children' );
+	$children = $entities->get_sub_app('children');
 
-	$entities->register( 'user', 'WordPoints_Entity_User' );
-	$children->register( 'user', 'roles', 'WordPoints_Entity_User_Roles' );
+	$entities->register('user', 'WordPoints_Entity_User');
+	$children->register('user', 'roles', 'WordPoints_Entity_User_Roles');
 
-	$entities->register( 'user_role', 'WordPoints_Entity_User_Role' );
+	$entities->register('user_role', 'WordPoints_Entity_User_Role');
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
-		wordpoints_register_post_type_entities( $slug );
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
+		wordpoints_register_post_type_entities($slug);
 	}
 
 	// Also register entities for any post types that are late to the party.
-	add_action( 'registered_post_type', 'wordpoints_register_post_type_entities' );
+	add_action('registered_post_type', 'wordpoints_register_post_type_entities');
 }
 
 /**
@@ -319,7 +319,7 @@ 
 	 *
 	 * @param string[] $post_types The post type slugs ("names").
 	 */
-	return apply_filters( 'wordpoints_register_entities_for_post_types', $post_types );
+	return apply_filters('wordpoints_register_entities_for_post_types', $post_types);
 }
 
 /**
@@ -331,24 +331,24 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_entities( $slug ) {
+function wordpoints_register_post_type_entities($slug) {
 
 	$entities = wordpoints_entities();
-	$children = $entities->get_sub_app( 'children' );
+	$children = $entities->get_sub_app('children');
 
-	$entities->register( "post\\{$slug}", 'WordPoints_Entity_Post' );
-	$children->register( "post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author' );
+	$entities->register("post\\{$slug}", 'WordPoints_Entity_Post');
+	$children->register("post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author');
 
-	$supports = get_all_post_type_supports( $slug );
+	$supports = get_all_post_type_supports($slug);
 
-	if ( isset( $supports['editor'] ) ) {
-		$children->register( "post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content' );
+	if (isset($supports['editor'])) {
+		$children->register("post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content');
 	}
 
-	if ( isset( $supports['comments'] ) ) {
-		$entities->register( "comment\\{$slug}", 'WordPoints_Entity_Comment' );
-		$children->register( "comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post' );
-		$children->register( "comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author' );
+	if (isset($supports['comments'])) {
+		$entities->register("comment\\{$slug}", 'WordPoints_Entity_Comment');
+		$children->register("comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post');
+		$children->register("comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author');
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_entities', $slug );
+	do_action('wordpoints_register_post_type_entities', $slug);
 }
 
 /**
@@ -373,12 +373,12 @@ 
  *
  * @return bool Whether the user can view this entity.
  */
-function wordpoints_entity_user_can_view( $user_id, $entity_slug, $entity_id ) {
+function wordpoints_entity_user_can_view($user_id, $entity_slug, $entity_id) {
 
 	/** @var WordPoints_Entity_Restrictions $restrictions */
-	$restrictions = wordpoints_entities()->get_sub_app( 'restrictions' );
-	$restriction = $restrictions->get( $entity_id, $entity_slug, 'view' );
-	return $restriction->user_can( $user_id );
+	$restrictions = wordpoints_entities()->get_sub_app('restrictions');
+	$restriction = $restrictions->get($entity_id, $entity_slug, 'view');
+	return $restriction->user_can($user_id);
 }
 
 /**
@@ -412,28 +412,28 @@ 
  *                     contexts, indexed by context slug, or false if any of the
  *                     contexts isn't current.
  */
-function wordpoints_entities_get_current_context_id( $slug ) {
+function wordpoints_entities_get_current_context_id($slug) {
 
 	$current_context = array();
 
 	/** @var WordPoints_Class_Registry $contexts */
-	$contexts = wordpoints_entities()->get_sub_app( 'contexts' );
+	$contexts = wordpoints_entities()->get_sub_app('contexts');
 
-	while ( $slug ) {
+	while ($slug) {
 
-		$context = $contexts->get( $slug );
+		$context = $contexts->get($slug);
 
-		if ( ! $context instanceof WordPoints_Entity_Context ) {
+		if ( ! $context instanceof WordPoints_Entity_Context) {
 			return false;
 		}
 
 		$id = $context->get_current_id();
 
-		if ( false === $id ) {
+		if (false === $id) {
 			return false;
 		}
 
-		$current_context[ $slug ] = $id;
+		$current_context[$slug] = $id;
 
 		$slug = $context->get_parent_slug();
 	}
@@ -454,22 +454,22 @@ 
  */
 function wordpoints_is_network_context() {
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return false;
 	}
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 		return true;
 	}
 
 	// See https://core.trac.wordpress.org/ticket/22589
 	if (
-		defined( 'DOING_AJAX' )
+		defined('DOING_AJAX')
 		&& DOING_AJAX
-		&& isset( $_SERVER['HTTP_REFERER'] )
+		&& isset($_SERVER['HTTP_REFERER'])
 		&& preg_match(
-			'#^' . preg_quote( network_admin_url(), '#' ) . '#i'
-			, esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) )
+			'#^' . preg_quote(network_admin_url(), '#') . '#i'
+			, esc_url_raw(wp_unslash($_SERVER['HTTP_REFERER']))
 		)
 	) {
 		return true;
@@ -482,7 +482,7 @@ 
 	 *
 	 * @param bool $in_network_context Whether we are in network context.
 	 */
-	return apply_filters( 'wordpoints_is_network_context', false );
+	return apply_filters('wordpoints_is_network_context', false);
 }
 
 //
@@ -498,10 +498,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $data_types The data types registry.
  */
-function wordpoints_data_types_init( $data_types ) {
+function wordpoints_data_types_init($data_types) {
 
-	$data_types->register( 'integer', 'WordPoints_Data_Type_Integer' );
-	$data_types->register( 'text', 'WordPoints_Data_Type_Text' );
+	$data_types->register('integer', 'WordPoints_Data_Type_Integer');
+	$data_types->register('text', 'WordPoints_Data_Type_Text');
 }
 
 // EOF

src/includes/hooks.php

Spacing +57 added lines, -57 removed lines

@@ -16,11 +16,11 @@ 
  */
 function wordpoints_hooks() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'hooks' );
+	return WordPoints_App::$main->get_sub_app('hooks');
 }
 
 /**
@@ -37,7 +37,7 @@ 
 	// Just accessing this causes it to be initialized. We need to do that so
 	// the actions will be registered and hooked up. The rest of the API can be
 	// lazy-loaded as it is needed.
-	$hooks->get_sub_app( 'actions' );
+	$hooks->get_sub_app('actions');
 }
 
 /**
@@ -49,13 +49,13 @@ 
  *
  * @param WordPoints_Class_Registry_Persistent $extensions The extension registry.
  */
-function wordpoints_hook_extensions_init( $extensions ) {
+function wordpoints_hook_extensions_init($extensions) {
 
-	$extensions->register( 'blocker', 'WordPoints_Hook_Extension_Blocker' );
-	$extensions->register( 'repeat_blocker', 'WordPoints_Hook_Extension_Repeat_Blocker' );
-	$extensions->register( 'reversals', 'WordPoints_Hook_Extension_Reversals' );
-	$extensions->register( 'conditions', 'WordPoints_Hook_Extension_Conditions' );
-	$extensions->register( 'periods', 'WordPoints_Hook_Extension_Periods' );
+	$extensions->register('blocker', 'WordPoints_Hook_Extension_Blocker');
+	$extensions->register('repeat_blocker', 'WordPoints_Hook_Extension_Repeat_Blocker');
+	$extensions->register('reversals', 'WordPoints_Hook_Extension_Reversals');
+	$extensions->register('conditions', 'WordPoints_Hook_Extension_Conditions');
+	$extensions->register('periods', 'WordPoints_Hook_Extension_Periods');
 }
 
 /**
@@ -67,7 +67,7 @@ 
  *
  * @param WordPoints_Class_Registry_Children $conditions The conditions registry.
  */
-function wordpoints_hook_conditions_init( $conditions ) {
+function wordpoints_hook_conditions_init($conditions) {
 
 	$conditions->register(
 		'text'
@@ -103,7 +103,7 @@ 
  *
  * @param WordPoints_Hook_Actions $actions The action registry.
  */
-function wordpoints_hook_actions_init( $actions ) {
+function wordpoints_hook_actions_init($actions) {
 
 	$actions->register(
 		'user_register'
@@ -111,7 +111,7 @@ 
 		, array(
 			'action' => 'user_register',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -122,7 +122,7 @@ 
 		, array(
 			'action' => is_multisite() ? 'wpmu_delete_user' : 'delete_user',
 			'data'   => array(
-				'arg_index' => array( 'user' => 0 ),
+				'arg_index' => array('user' => 0),
 			),
 		)
 	);
@@ -148,17 +148,17 @@ 
 	 */
 	$post_types = apply_filters_deprecated(
 		'wordpoints_register_hook_actions_for_post_types'
-		, array( $post_types )
+		, array($post_types)
 		, '2.2.0'
 		, 'wordpoints_register_hook_events_for_post_types'
 	);
 
-	foreach ( $post_types as $slug ) {
-		wordpoints_register_post_type_hook_actions( $slug );
+	foreach ($post_types as $slug) {
+		wordpoints_register_post_type_hook_actions($slug);
 	}
 
 	// Also register actions for any post types that are late to the party.
-	add_action( 'registered_post_type', 'wordpoints_register_post_type_hook_actions' );
+	add_action('registered_post_type', 'wordpoints_register_post_type_hook_actions');
 }
 
 /**
@@ -170,11 +170,11 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_hook_actions( $slug ) {
+function wordpoints_register_post_type_hook_actions($slug) {
 
-	$actions = wordpoints_hooks()->get_sub_app( 'actions' );
+	$actions = wordpoints_hooks()->get_sub_app('actions');
 
-	if ( post_type_supports( $slug, 'comments' ) ) {
+	if (post_type_supports($slug, 'comments')) {
 
 		$actions->register(
 			"comment_approve\\{$slug}"
@@ -182,8 +182,8 @@ 
 			, array(
 				'action' => 'transition_comment_status',
 				'data'   => array(
-					'arg_index'    => array( "comment\\{$slug}" => 2 ),
-					'requirements' => array( 0 => 'approved' ),
+					'arg_index'    => array("comment\\{$slug}" => 2),
+					'requirements' => array(0 => 'approved'),
 				),
 			)
 		);
@@ -194,7 +194,7 @@ 
 			, array(
 				'action' => 'wp_insert_comment',
 				'data'   => array(
-					'arg_index' => array( "comment\\{$slug}" => 1 ),
+					'arg_index' => array("comment\\{$slug}" => 1),
 				),
 			)
 		);
@@ -205,8 +205,8 @@ 
 			, array(
 				'action' => 'transition_comment_status',
 				'data'   => array(
-					'arg_index'    => array( "comment\\{$slug}" => 2 ),
-					'requirements' => array( 1 => 'approved' ),
+					'arg_index'    => array("comment\\{$slug}" => 2),
+					'requirements' => array(1 => 'approved'),
 				),
 			)
 		);
@@ -214,7 +214,7 @@ 
 	} // End if ( post type supports comments ).
 
 	// This works for all post types except attachments.
-	if ( 'attachment' !== $slug ) {
+	if ('attachment' !== $slug) {
 
 		$actions->register(
 			"post_publish\\{$slug}"
@@ -222,10 +222,10 @@ 
 			, array(
 				'action' => 'transition_post_status',
 				'data'   => array(
-					'arg_index'    => array( "post\\{$slug}" => 2 ),
+					'arg_index'    => array("post\\{$slug}" => 2),
 					'requirements' => array(
 						0 => 'publish',
-						1 => array( 'comparator' => '!=', 'value' => 'publish' ),
+						1 => array('comparator' => '!=', 'value' => 'publish'),
 					),
 				),
 			)
@@ -237,9 +237,9 @@ 
 			, array(
 				'action' => 'transition_post_status',
 				'data'   => array(
-					'arg_index'    => array( "post\\{$slug}" => 2 ),
+					'arg_index'    => array("post\\{$slug}" => 2),
 					'requirements' => array(
-						0 => array( 'comparator' => '!=', 'value' => 'publish' ),
+						0 => array('comparator' => '!=', 'value' => 'publish'),
 						1 => 'publish',
 					),
 				),
@@ -252,7 +252,7 @@ 
 			, array(
 				'action' => 'delete_post',
 				'data'   => array(
-					'arg_index' => array( "post\\{$slug}" => 0 ),
+					'arg_index' => array("post\\{$slug}" => 0),
 				),
 			)
 		);
@@ -265,7 +265,7 @@ 
 			, array(
 				'action' => 'add_attachment',
 				'data'   => array(
-					'arg_index' => array( 'post\attachment' => 0 ),
+					'arg_index' => array('post\attachment' => 0),
 				),
 			)
 		);
@@ -278,7 +278,7 @@ 
 		, array(
 			'action' => 'delete_post',
 			'data'   => array(
-				'arg_index' => array( "post\\{$slug}" => 0 ),
+				'arg_index' => array("post\\{$slug}" => 0),
 			),
 		)
 	);
@@ -290,7 +290,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_hook_actions', $slug );
+	do_action('wordpoints_register_post_type_hook_actions', $slug);
 }
 
 /**
@@ -302,7 +302,7 @@ 
  *
  * @param WordPoints_Hook_Events $events The event registry.
  */
-function wordpoints_hook_events_init( $events ) {
+function wordpoints_hook_events_init($events) {
 
 	$events->register(
 		'user_register'
@@ -331,12 +331,12 @@ 
 		)
 	);
 
-	foreach ( wordpoints_get_post_types_for_hook_events() as $slug ) {
-		wordpoints_register_post_type_hook_events( $slug );
+	foreach (wordpoints_get_post_types_for_hook_events() as $slug) {
+		wordpoints_register_post_type_hook_events($slug);
 	}
 
 	// Also register events for any post types that are late to the party.
-	add_action( 'registered_post_type', 'wordpoints_register_post_type_hook_events' );
+	add_action('registered_post_type', 'wordpoints_register_post_type_hook_events');
 }
 
 /**
@@ -370,11 +370,11 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_hook_events( $slug ) {
+function wordpoints_register_post_type_hook_events($slug) {
 
-	$events = wordpoints_hooks()->get_sub_app( 'events' );
+	$events = wordpoints_hooks()->get_sub_app('events');
 
-	if ( 'attachment' === $slug ) {
+	if ('attachment' === $slug) {
 
 		$events->register(
 			'media_upload'
@@ -410,7 +410,7 @@ 
 		);
 	}
 
-	if ( post_type_supports( $slug, 'comments' ) ) {
+	if (post_type_supports($slug, 'comments')) {
 
 		$events->register(
 			"comment_leave\\{$slug}"
@@ -437,7 +437,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_hook_events', $slug );
+	do_action('wordpoints_register_post_type_hook_events', $slug);
 }
 
 /**
@@ -451,36 +451,36 @@ 
  *
  * @return string The signature arg(s)'s GUID(s), JSON encoded.
  */
-function wordpoints_hooks_get_event_signature_arg_guids_json( WordPoints_Hook_Event_Args $event_args ) {
+function wordpoints_hooks_get_event_signature_arg_guids_json(WordPoints_Hook_Event_Args $event_args) {
 
 	$entities = $event_args->get_signature_args();
 
-	if ( ! $entities ) {
+	if ( ! $entities) {
 		return '';
 	}
 
 	$the_guids = array();
 
-	foreach ( $entities as $arg_slug => $entity ) {
+	foreach ($entities as $arg_slug => $entity) {
 
 		$the_guid = $entity->get_the_guid();
 
-		if ( $the_guid ) {
-			$the_guids[ $arg_slug ] = $the_guid;
+		if ($the_guid) {
+			$the_guids[$arg_slug] = $the_guid;
 		}
 	}
 
-	if ( ! $the_guids ) {
+	if ( ! $the_guids) {
 		return '';
 	}
 
-	if ( 1 === count( $the_guids ) ) {
-		$the_guids = reset( $the_guids );
+	if (1 === count($the_guids)) {
+		$the_guids = reset($the_guids);
 	} else {
-		ksort( $the_guids );
+		ksort($the_guids);
 	}
 
-	return wp_json_encode( $the_guids );
+	return wp_json_encode($the_guids);
 }
 
 /**
@@ -495,7 +495,7 @@ 
  *
  * @return string The primary arg's GUID, JSON encoded.
  */
-function wordpoints_hooks_get_event_primary_arg_guid_json( WordPoints_Hook_Event_Args $event_args ) {
+function wordpoints_hooks_get_event_primary_arg_guid_json(WordPoints_Hook_Event_Args $event_args) {
 
 	_deprecated_function(
 		__FUNCTION__
@@ -505,17 +505,17 @@ 
 
 	$entity = $event_args->get_primary_arg();
 
-	if ( ! $entity ) {
+	if ( ! $entity) {
 		return '';
 	}
 
 	$the_guid = $entity->get_the_guid();
 
-	if ( ! $the_guid ) {
+	if ( ! $the_guid) {
 		return '';
 	}
 
-	return wp_json_encode( $the_guid );
+	return wp_json_encode($the_guid);
 }
 
 // EOF

src/includes/class-widget.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @deprecated 2.3.0
  */
 
-_deprecated_file( __FILE__, '2.3.0', 'classes/widget.php' );
+_deprecated_file(__FILE__, '2.3.0', 'classes/widget.php');
 
 /**
  * The widget class.

src/includes/modules.php

Spacing +223 added lines, -223 removed lines

@@ -18,11 +18,11 @@ 
  *
  * @return bool Whether the module is active.
  */
-function is_wordpoints_module_active( $module ) {
+function is_wordpoints_module_active($module) {
 
 	return (
-		in_array( $module, wordpoints_get_array_option( 'wordpoints_active_modules' ) )
-		|| is_wordpoints_module_active_for_network( $module )
+		in_array($module, wordpoints_get_array_option('wordpoints_active_modules'))
+		|| is_wordpoints_module_active_for_network($module)
 	);
 }
 
@@ -35,15 +35,15 @@ 
  *
  * @return bool Whether the module is network active.
  */
-function is_wordpoints_module_active_for_network( $module ) {
+function is_wordpoints_module_active_for_network($module) {
 
-	if ( ! is_wordpoints_network_active() ) {
+	if ( ! is_wordpoints_network_active()) {
 		return false;
 	}
 
-	$modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
+	$modules = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
 
-	if ( isset( $modules[ $module ] ) ) {
+	if (isset($modules[$module])) {
 		return true;
 	}
 
@@ -65,9 +65,9 @@ 
  *
  * @return bool True if the module is network only, false otherwise.
  */
-function is_network_only_wordpoints_module( $module ) {
+function is_network_only_wordpoints_module($module) {
 
-	$module_data = wordpoints_get_module_data( wordpoints_modules_dir() . '/' . $module );
+	$module_data = wordpoints_get_module_data(wordpoints_modules_dir() . '/' . $module);
 
 	return $module_data['network'];
 }
@@ -81,9 +81,9 @@ 
  *
  * @return bool True if the module has an uninstall script, false otherwise.
  */
-function is_uninstallable_wordpoints_module( $module ) {
+function is_uninstallable_wordpoints_module($module) {
 
-	return ( file_exists( wordpoints_modules_dir() . '/' . dirname( wordpoints_module_basename( $module ) ) . '/uninstall.php' ) );
+	return (file_exists(wordpoints_modules_dir() . '/' . dirname(wordpoints_module_basename($module)) . '/uninstall.php'));
 }
 
 /**
@@ -107,11 +107,11 @@ 
 
 	static $modules_dir;
 
-	if ( ! $modules_dir ) {
+	if ( ! $modules_dir) {
 
-		if ( defined( 'WORDPOINTS_MODULES_DIR' ) ) {
+		if (defined('WORDPOINTS_MODULES_DIR')) {
 
-			$modules_dir = trailingslashit( WORDPOINTS_MODULES_DIR );
+			$modules_dir = trailingslashit(WORDPOINTS_MODULES_DIR);
 
 		} else {
 
@@ -127,7 +127,7 @@ 
 	 *
 	 * @param string $module_dir The full path to the modules folder.
 	 */
-	return apply_filters( 'wordpoints_modules_dir', $modules_dir );
+	return apply_filters('wordpoints_modules_dir', $modules_dir);
 }
 
 /**
@@ -140,30 +140,30 @@ 
  *
  * @return string The URL for the path passed.
  */
-function wordpoints_modules_url( $path = '', $module = '' ) {
+function wordpoints_modules_url($path = '', $module = '') {
 
-	$path   = wp_normalize_path( $path );
-	$module = wp_normalize_path( $module );
+	$path   = wp_normalize_path($path);
+	$module = wp_normalize_path($module);
 
-	if ( defined( 'WORDPOINTS_MODULES_URL' ) ) {
+	if (defined('WORDPOINTS_MODULES_URL')) {
 		$url = WORDPOINTS_MODULES_URL;
 	} else {
 		$url = WP_CONTENT_URL . '/wordpoints-modules';
 	}
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( ! empty( $module ) && is_string( $module ) ) {
+	if ( ! empty($module) && is_string($module)) {
 
-		$folder = dirname( wordpoints_module_basename( $module ) );
+		$folder = dirname(wordpoints_module_basename($module));
 
-		if ( '.' !== $folder ) {
-			$url .= '/' . ltrim( $folder, '/' );
+		if ('.' !== $folder) {
+			$url .= '/' . ltrim($folder, '/');
 		}
 	}
 
-	if ( $path && is_string( $path ) ) {
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path)) {
+		$url .= '/' . ltrim($path, '/');
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 * @param string $path   A relative path to a file or folder.
 	 * @param string $module A module file that the $path should be relative to.
 	 */
-	return apply_filters( 'wordpoints_modules_url', $url, $path, $module );
+	return apply_filters('wordpoints_modules_url', $url, $path, $module);
 }
 
 /**
@@ -187,17 +187,17 @@ 
  *
  * @return string The name of the module file.
  */
-function wordpoints_module_basename( $file ) {
+function wordpoints_module_basename($file) {
 
 	// Sanitize, and resolve possible symlink path from what is likely a real path.
-	$file = WordPoints_Module_Paths::resolve( $file );
+	$file = WordPoints_Module_Paths::resolve($file);
 
 	// Sanitize for Win32 installs and remove any duplicate slashes.
-	$modules_dir = wp_normalize_path( wordpoints_modules_dir() );
+	$modules_dir = wp_normalize_path(wordpoints_modules_dir());
 
 	// Get the relative path from the modules directory, and trim off the slashes.
-	$file = preg_replace( '#^' . preg_quote( $modules_dir, '#' ) . '#', '', $file );
-	$file = trim( $file, '/' );
+	$file = preg_replace('#^' . preg_quote($modules_dir, '#') . '#', '', $file);
+	$file = trim($file, '/');
 
 	return $file;
 }
@@ -237,7 +237,7 @@ 
  *         @type string $namespace   The namespace for this module. Should be Title_Case, and omit "WordPoints" prefix.
  * }
  */
-function wordpoints_get_module_data( $module_file, $markup = true, $translate = true ) {
+function wordpoints_get_module_data($module_file, $markup = true, $translate = true) {
 
 	$default_headers = array(
 		'name'        => 'Module Name',
@@ -255,94 +255,94 @@ 
 		'namespace'   => 'Namespace',
 	);
 
-	$module_data = WordPoints_Modules::get_data( $module_file );
+	$module_data = WordPoints_Modules::get_data($module_file);
 
-	if ( $module_data && wp_normalize_path( $module_file ) === $module_data['raw_file'] ) {
-		unset( $module_data['raw'], $module_data['raw_file'] );
+	if ($module_data && wp_normalize_path($module_file) === $module_data['raw_file']) {
+		unset($module_data['raw'], $module_data['raw_file']);
 	} else {
-		$module_data = get_file_data( $module_file, $default_headers, 'wordpoints_module' );
+		$module_data = get_file_data($module_file, $default_headers, 'wordpoints_module');
 	}
 
-	if ( ! empty( $module_data['update_api'] ) ) {
-		_deprecated_argument( __FUNCTION__, '1.10.0', 'The "Update API" module header has been deprecated in favor of "Channel".' );
+	if ( ! empty($module_data['update_api'])) {
+		_deprecated_argument(__FUNCTION__, '1.10.0', 'The "Update API" module header has been deprecated in favor of "Channel".');
 	}
 
-	$module_data['network'] = ( 'true' === strtolower( $module_data['network'] ) );
+	$module_data['network'] = ('true' === strtolower($module_data['network']));
 
-	if ( $markup || $translate ) {
+	if ($markup || $translate) {
 
 		// Sanitize the plugin filename to a WP_module_DIR relative path
-		$module_file = wordpoints_module_basename( $module_file );
+		$module_file = wordpoints_module_basename($module_file);
 
 		// Translate fields
-		if ( $translate ) {
+		if ($translate) {
 
 			$textdomain = $module_data['text_domain'];
 
-			if ( $textdomain ) {
+			if ($textdomain) {
 
-				if ( ! is_textdomain_loaded( $textdomain ) ) {
+				if ( ! is_textdomain_loaded($textdomain)) {
 
-					$domain_path = dirname( $module_file );
+					$domain_path = dirname($module_file);
 
-					if ( $module_data['domain_path'] ) {
+					if ($module_data['domain_path']) {
 						$domain_path .= $module_data['domain_path'];
 					}
 
-					wordpoints_load_module_textdomain( $textdomain, $domain_path );
+					wordpoints_load_module_textdomain($textdomain, $domain_path);
 				}
 
-				foreach ( array( 'name', 'module_uri', 'description', 'author', 'author_uri', 'version' ) as $field ) {
+				foreach (array('name', 'module_uri', 'description', 'author', 'author_uri', 'version') as $field) {
 
-					$module_data[ $field ] = translate( $module_data[ $field ], $textdomain ); // @codingStandardsIgnoreLine
+					$module_data[$field] = translate($module_data[$field], $textdomain); // @codingStandardsIgnoreLine
 				}
 			}
 		}
 
 		// Sanitize fields.
 		$allowed_tags_in_links = array(
-			'abbr'    => array( 'title' => true ),
-			'acronym' => array( 'title' => true ),
+			'abbr'    => array('title' => true),
+			'acronym' => array('title' => true),
 			'code'    => true,
 			'em'      => true,
 			'strong'  => true,
 		);
 
 		$allowed_tags = $allowed_tags_in_links;
-		$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+		$allowed_tags['a'] = array('href' => true, 'title' => true);
 
 		// Name and author ar marked up inside <a> tags. Don't allow these.
-		$module_data['name']   = wp_kses( $module_data['name'],   $allowed_tags_in_links );
-		$module_data['author'] = wp_kses( $module_data['author'], $allowed_tags_in_links );
+		$module_data['name']   = wp_kses($module_data['name'], $allowed_tags_in_links);
+		$module_data['author'] = wp_kses($module_data['author'], $allowed_tags_in_links);
 
-		$module_data['description'] = wp_kses( $module_data['description'], $allowed_tags );
-		$module_data['version']     = wp_kses( $module_data['version'],     $allowed_tags );
+		$module_data['description'] = wp_kses($module_data['description'], $allowed_tags);
+		$module_data['version']     = wp_kses($module_data['version'], $allowed_tags);
 
-		$module_data['module_uri'] = esc_url( $module_data['module_uri'] );
-		$module_data['author_uri'] = esc_url( $module_data['author_uri'] );
+		$module_data['module_uri'] = esc_url($module_data['module_uri']);
+		$module_data['author_uri'] = esc_url($module_data['author_uri']);
 
 		$module_data['title']       = $module_data['name'];
 		$module_data['author_name'] = $module_data['author'];
 
 		// Apply markup.
-		if ( $markup ) {
+		if ($markup) {
 
-			if ( $module_data['module_uri'] && $module_data['name'] ) {
+			if ($module_data['module_uri'] && $module_data['name']) {
 				$module_data['title'] = '<a href="' . $module_data['module_uri']
 					. '">' . $module_data['name'] . '</a>';
 			}
 
-			if ( $module_data['author_uri'] && $module_data['author'] ) {
+			if ($module_data['author_uri'] && $module_data['author']) {
 				$module_data['author'] = '<a href="' . $module_data['author_uri']
 					. '">' . $module_data['author'] . '</a>';
 			}
 
-			$module_data['description'] = wptexturize( $module_data['description'] );
+			$module_data['description'] = wptexturize($module_data['description']);
 
-			if ( $module_data['author'] ) {
+			if ($module_data['author']) {
 				$module_data['description'] .= ' <cite>'
 					// translators: Author name.
-					. sprintf( __( 'By %s.', 'wordpoints' ), $module_data['author'] )
+					. sprintf(__('By %s.', 'wordpoints'), $module_data['author'])
 					. '</cite>';
 			}
 		}
@@ -368,7 +368,7 @@ 
  *
  * @return bool Whether the textdoamin was loaded successfully.
  */
-function wordpoints_load_module_textdomain( $domain, $module_rel_path = false ) {
+function wordpoints_load_module_textdomain($domain, $module_rel_path = false) {
 
 	$locale = get_locale();
 
@@ -380,11 +380,11 @@ 
 	 * @param string $locale The module's current locale.
 	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
 	 */
-	$locale = apply_filters( 'wordpoints_module_locale', $locale, $domain );
+	$locale = apply_filters('wordpoints_module_locale', $locale, $domain);
 
-	if ( false !== $module_rel_path	) {
+	if (false !== $module_rel_path) {
 
-		$path = wordpoints_modules_dir() . '/' . trim( $module_rel_path, '/' );
+		$path = wordpoints_modules_dir() . '/' . trim($module_rel_path, '/');
 
 	} else {
 
@@ -394,14 +394,14 @@ 
 	// Load the textdomain according to the module first.
 	$mofile = $domain . '-' . $locale . '.mo';
 
-	if ( load_textdomain( $domain, $path . '/' . $mofile ) ) {
+	if (load_textdomain($domain, $path . '/' . $mofile)) {
 		return true;
 	}
 
 	// Otherwise, load from the languages directory.
 	$mofile = WP_LANG_DIR . '/wordpoints-modules/' . $mofile;
 
-	return load_textdomain( $domain, $mofile );
+	return load_textdomain($domain, $mofile);
 }
 
 /**
@@ -421,76 +421,76 @@ 
  *
  * @return array A list of the module files found (files with module headers).
  */
-function wordpoints_get_modules( $module_folder = '', $markup = false, $translate = false ) {
+function wordpoints_get_modules($module_folder = '', $markup = false, $translate = false) {
 
-	$cache_modules = wp_cache_get( 'wordpoints_modules', 'wordpoints_modules' );
+	$cache_modules = wp_cache_get('wordpoints_modules', 'wordpoints_modules');
 
-	if ( ! $cache_modules ) {
+	if ( ! $cache_modules) {
 		$cache_modules = array();
 	}
 
-	if ( isset( $cache_modules[ $module_folder ] ) ) {
-		return $cache_modules[ $module_folder ];
+	if (isset($cache_modules[$module_folder])) {
+		return $cache_modules[$module_folder];
 	}
 
 	$modules     = array();
 	$module_root = wordpoints_modules_dir();
 
-	if ( ! empty( $module_folder ) ) {
+	if ( ! empty($module_folder)) {
 		$module_root .= $module_folder;
 	}
 
 	// Escape pattern-matching characters in the path.
-	$module_escape_root = str_replace( array( '*', '?', '[' ), array( '[*]', '[?]', '[[]' ), $module_root );
+	$module_escape_root = str_replace(array('*', '?', '['), array('[*]', '[?]', '[[]'), $module_root);
 
 	// Get the top level files.
-	$module_files = glob( "{$module_escape_root}/*.php" );
+	$module_files = glob("{$module_escape_root}/*.php");
 
-	if ( false === $module_files ) {
+	if (false === $module_files) {
 		return $modules;
 	}
 
 	// Get the files of subfolders, if not already searching in a subfolder.
-	if ( empty( $module_folder ) ) {
+	if (empty($module_folder)) {
 
-		$subfolder_files = glob( "{$module_escape_root}/*/*.php" );
+		$subfolder_files = glob("{$module_escape_root}/*/*.php");
 
-		if ( false === $subfolder_files ) {
+		if (false === $subfolder_files) {
 			return $modules;
 		}
 
-		$module_files = array_merge( $module_files, $subfolder_files );
+		$module_files = array_merge($module_files, $subfolder_files);
 	}
 
-	if ( empty( $module_files ) ) {
+	if (empty($module_files)) {
 		return $modules;
 	}
 
-	foreach ( $module_files as $module_file ) {
+	foreach ($module_files as $module_file) {
 
-		if ( ! is_readable( $module_file ) ) {
+		if ( ! is_readable($module_file)) {
 			continue;
 		}
 
-		$module_data = wordpoints_get_module_data( $module_file, $markup, $translate );
+		$module_data = wordpoints_get_module_data($module_file, $markup, $translate);
 
-		if ( empty( $module_data['name'] ) ) {
+		if (empty($module_data['name'])) {
 			continue;
 		}
 
-		$module_file = wordpoints_module_basename( $module_file );
+		$module_file = wordpoints_module_basename($module_file);
 
-		if ( $module_folder ) {
-			$module_file = basename( $module_file );
+		if ($module_folder) {
+			$module_file = basename($module_file);
 		}
 
-		$modules[ $module_file ] = $module_data;
+		$modules[$module_file] = $module_data;
 	}
 
-	uasort( $modules, '_wordpoints_sort_uname_callback' );
+	uasort($modules, '_wordpoints_sort_uname_callback');
 
-	$cache_modules[ $module_folder ] = $modules;
-	wp_cache_set( 'wordpoints_modules', $cache_modules, 'wordpoints_modules' );
+	$cache_modules[$module_folder] = $modules;
+	wp_cache_set('wordpoints_modules', $cache_modules, 'wordpoints_modules');
 
 	return $modules;
 }
@@ -504,20 +504,20 @@ 
  *
  * @return true|WP_Error True on success, a WP_Error on failure.
  */
-function wordpoints_validate_module( $module ) {
+function wordpoints_validate_module($module) {
 
-	if ( validate_file( $module ) ) {
-		return new WP_Error( 'module_invalid', __( 'Invalid module path.', 'wordpoints' ) );
+	if (validate_file($module)) {
+		return new WP_Error('module_invalid', __('Invalid module path.', 'wordpoints'));
 	}
 
-	if ( ! file_exists( wordpoints_modules_dir() . '/' . $module ) ) {
-		return new WP_Error( 'module_not_found', __( 'Module file does not exist.', 'wordpoints' ) );
+	if ( ! file_exists(wordpoints_modules_dir() . '/' . $module)) {
+		return new WP_Error('module_not_found', __('Module file does not exist.', 'wordpoints'));
 	}
 
 	$installed_modules = wordpoints_get_modules();
 
-	if ( ! isset( $installed_modules[ $module ] ) ) {
-		return new WP_Error( 'no_module_header', __( 'The module does not have a valid header.', 'wordpoints' ) );
+	if ( ! isset($installed_modules[$module])) {
+		return new WP_Error('no_module_header', __('The module does not have a valid header.', 'wordpoints'));
 	}
 
 	return true;
@@ -534,27 +534,27 @@ 
  */
 function wordpoints_validate_active_modules() {
 
-	$modules = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$modules = wordpoints_get_array_option('wordpoints_active_modules');
 
-	if ( is_multisite() && current_user_can( 'manage_network_wordpoints_modules' ) ) {
+	if (is_multisite() && current_user_can('manage_network_wordpoints_modules')) {
 
-		$network_modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
-		$modules = array_merge( $modules, array_keys( $network_modules ) );
+		$network_modules = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
+		$modules = array_merge($modules, array_keys($network_modules));
 	}
 
-	if ( empty( $modules ) ) {
+	if (empty($modules)) {
 		return null;
 	}
 
 	$invalid = array();
 
-	foreach ( $modules as $module ) {
+	foreach ($modules as $module) {
 
-		$result = wordpoints_validate_module( $module );
+		$result = wordpoints_validate_module($module);
 
-		if ( is_wp_error( $result ) ) {
-			$invalid[ $module ] = $result;
-			wordpoints_deactivate_modules( $module, true );
+		if (is_wp_error($result)) {
+			$invalid[$module] = $result;
+			wordpoints_deactivate_modules($module, true);
 		}
 	}
 
@@ -571,9 +571,9 @@ 
  *
  * @return int {@see strnatcasecmp()}.
  */
-function _wordpoints_sort_uname_callback( $a, $b ) {
+function _wordpoints_sort_uname_callback($a, $b) {
 
-	return strnatcasecmp( $a['name'], $b['name'] );
+	return strnatcasecmp($a['name'], $b['name']);
 }
 
 /**
@@ -604,33 +604,33 @@ 
  *
  * @return WP_Error|null An error object on failure, or null on success.
  */
-function wordpoints_activate_module( $module, $redirect = '', $network_wide = false, $silent = false ) {
+function wordpoints_activate_module($module, $redirect = '', $network_wide = false, $silent = false) {
 
-	$module = wordpoints_module_basename( $module );
+	$module = wordpoints_module_basename($module);
 
-	$valid = wordpoints_validate_module( $module );
+	$valid = wordpoints_validate_module($module);
 
-	if ( is_wp_error( $valid ) ) {
+	if (is_wp_error($valid)) {
 		return $valid;
 	}
 
-	if ( is_multisite() && ( $network_wide || is_network_only_wordpoints_module( $module ) ) ) {
+	if (is_multisite() && ($network_wide || is_network_only_wordpoints_module($module))) {
 
 		$network_wide = true;
-		$network_current = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
-		$current = array_keys( $network_current );
+		$network_current = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
+		$current = array_keys($network_current);
 
 	} else {
 
-		$current = wordpoints_get_array_option( 'wordpoints_active_modules' );
+		$current = wordpoints_get_array_option('wordpoints_active_modules');
 	}
 
 	// If the module is already active, return.
-	if ( in_array( $module, $current ) ) {
+	if (in_array($module, $current)) {
 		return null;
 	}
 
-	if ( ! empty( $redirect ) ) {
+	if ( ! empty($redirect)) {
 
 		/*
 		 * Redirect. We'll override this later if the module can be included
@@ -639,7 +639,7 @@ 
 		wp_safe_redirect(
 			add_query_arg(
 				'_error_nonce'
-				, wp_create_nonce( 'module-activation-error_' . $module )
+				, wp_create_nonce('module-activation-error_' . $module)
 				, $redirect
 			)
 		);
@@ -648,11 +648,11 @@ 
 	ob_start();
 
 	$module_file = wordpoints_modules_dir() . '/' . $module;
-	WordPoints_Module_Paths::register( $module_file );
+	WordPoints_Module_Paths::register($module_file);
 
 	include_once $module_file;
 
-	if ( ! $silent ) {
+	if ( ! $silent) {
 
 		/**
 		 * Fires before a module is activated.
@@ -664,7 +664,7 @@ 
 		 *                             all sites in the network or just the
 		 *                             current site.
 		 */
-		do_action( 'wordpoints_module_activate', $module, $network_wide );
+		do_action('wordpoints_module_activate', $module, $network_wide);
 
 		/**
 		 * Fires before a module is activated.
@@ -675,28 +675,28 @@ 
 		 *                           all sites in the network or just the current
 		 *                           site.
 		 */
-		do_action( "wordpoints_module_activate-{$module}", $network_wide );
+		do_action("wordpoints_module_activate-{$module}", $network_wide);
 
 		WordPoints_Installables::install(
 			'module'
-			, WordPoints_Modules::get_slug( $module )
+			, WordPoints_Modules::get_slug($module)
 			, $network_wide
 		);
 	}
 
-	if ( $network_wide ) {
+	if ($network_wide) {
 
-		$network_current[ $module ] = time();
-		update_site_option( 'wordpoints_sitewide_active_modules', $network_current );
+		$network_current[$module] = time();
+		update_site_option('wordpoints_sitewide_active_modules', $network_current);
 
 	} else {
 
 		$current[] = $module;
-		sort( $current );
-		update_option( 'wordpoints_active_modules', $current );
+		sort($current);
+		update_option('wordpoints_active_modules', $current);
 	}
 
-	if ( ! $silent ) {
+	if ( ! $silent) {
 		/**
 		 * Fires after a module has been activated in activate_plugin() when the $silent parameter is false.
 		 *
@@ -707,14 +707,14 @@ 
 		 *                             all sites in the network or just the
 		 *                             current site.
 		 */
-		do_action( 'wordpoints_activated_module', $module, $network_wide );
+		do_action('wordpoints_activated_module', $module, $network_wide);
 	}
 
-	if ( ob_get_length() > 0 ) {
+	if (ob_get_length() > 0) {
 
 		return new WP_Error(
 			'unexpected_output'
-			, __( 'The module generated unexpected output.', 'wordpoints' )
+			, __('The module generated unexpected output.', 'wordpoints')
 			, ob_get_contents()
 		);
 	}
@@ -734,29 +734,29 @@ 
  *                                   Default is false.
  * @param bool         $network_wide Whether to apply the change network wide.
  */
-function wordpoints_deactivate_modules( $modules, $silent = false, $network_wide = null ) {
+function wordpoints_deactivate_modules($modules, $silent = false, $network_wide = null) {
 
 	$network_current = array();
-	if ( is_wordpoints_network_active() ) {
-		$network_current = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
+	if (is_wordpoints_network_active()) {
+		$network_current = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
 	}
 
-	$current = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$current = wordpoints_get_array_option('wordpoints_active_modules');
 
 	$do_network = false;
 	$do_blog = false;
 
-	foreach ( (array) $modules as $module ) {
+	foreach ((array) $modules as $module) {
 
-		$module = wordpoints_module_basename( $module );
+		$module = wordpoints_module_basename($module);
 
-		if ( ! is_wordpoints_module_active( $module ) ) {
+		if ( ! is_wordpoints_module_active($module)) {
 			continue;
 		}
 
-		$network_deactivating = ( false !== $network_wide && is_wordpoints_module_active_for_network( $module ) );
+		$network_deactivating = (false !== $network_wide && is_wordpoints_module_active_for_network($module));
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires for each module being deactivated in wordpoints_deactivate_modules(), before deactivation
 			 * and when the $silent parameter is false.
@@ -767,34 +767,34 @@ 
 			 * @param bool   $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivate_module', $module, $network_deactivating );
+			do_action('wordpoints_deactivate_module', $module, $network_deactivating);
 		}
 
-		if ( false !== $network_wide ) {
+		if (false !== $network_wide) {
 
-			if ( is_wordpoints_module_active_for_network( $module ) ) {
+			if (is_wordpoints_module_active_for_network($module)) {
 
 				$do_network = true;
-				unset( $network_current[ $module ] );
+				unset($network_current[$module]);
 
-			} elseif ( $network_wide ) {
+			} elseif ($network_wide) {
 
 				continue;
 			}
 		}
 
-		if ( true !== $network_wide ) {
+		if (true !== $network_wide) {
 
-			$key = array_search( $module, $current );
+			$key = array_search($module, $current);
 
-			if ( false !== $key ) {
+			if (false !== $key) {
 
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset($current[$key]);
 			}
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires for each module being deactivated in wordpoints_deactivate_module(), after deactivation
 			 * and when the $silent parameter is false.
@@ -807,7 +807,7 @@ 
 			 * @param bool $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                   or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivate_module-' . $module, $network_deactivating );
+			do_action('wordpoints_deactivate_module-' . $module, $network_deactivating);
 
 			/**
 			 * Fires for each module being deactivated in deactivate_plugins(), after deactivation
@@ -819,17 +819,17 @@ 
 			 * @param bool   $network_deactivating Whether the module is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'wordpoints_deactivated_module', $module, $network_deactivating );
+			do_action('wordpoints_deactivated_module', $module, $network_deactivating);
 		}
 
 	} // End foreach ( $modules ).
 
-	if ( $do_blog ) {
-		update_option( 'wordpoints_active_modules', $current );
+	if ($do_blog) {
+		update_option('wordpoints_active_modules', $current);
 	}
 
-	if ( $do_network ) {
-		update_site_option( 'wordpoints_sitewide_active_modules', $network_current );
+	if ($do_network) {
+		update_site_option('wordpoints_sitewide_active_modules', $network_current);
 	}
 }
 
@@ -846,31 +846,31 @@ 
  * @return bool|WP_Error True if all modules deleted successfully, false or WP_Error
  *                       on failure.
  */
-function wordpoints_delete_modules( $modules ) {
+function wordpoints_delete_modules($modules) {
 
 	global $wp_filesystem;
 
-	if ( empty( $modules ) ) {
+	if (empty($modules)) {
 		return false;
 	}
 
 	$checked = array();
 
-	foreach ( $modules as $module ) {
+	foreach ($modules as $module) {
 		$checked[] = 'checked[]=' . $module;
 	}
 
 	ob_start();
 
-	$url = wp_nonce_url( self_admin_url( 'admin.php?page=wordpoints_modules&action=delete-selected&verify-delete=1&' . implode( '&', $checked ) ), 'bulk-modules' );
+	$url = wp_nonce_url(self_admin_url('admin.php?page=wordpoints_modules&action=delete-selected&verify-delete=1&' . implode('&', $checked)), 'bulk-modules');
 
-	$credentials = request_filesystem_credentials( $url );
+	$credentials = request_filesystem_credentials($url);
 
-	if ( false === $credentials ) {
+	if (false === $credentials) {
 
 		$data = ob_get_clean();
 
-		if ( ! empty( $data ) ) {
+		if ( ! empty($data)) {
 
 			include_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data; // XSS OK here, WPCS.
@@ -881,14 +881,14 @@ 
 		return false;
 	}
 
-	if ( ! WP_Filesystem( $credentials ) ) {
+	if ( ! WP_Filesystem($credentials)) {
 
 		// Failed to connect, Error and request again
-		request_filesystem_credentials( $url, '', true );
+		request_filesystem_credentials($url, '', true);
 
 		$data = ob_get_clean();
 
-		if ( ! empty( $data ) ) {
+		if ( ! empty($data)) {
 
 			include_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data; // XSS OK here too, WPCS.
@@ -899,41 +899,41 @@ 
 		return false;
 	}
 
-	if ( ! is_object( $wp_filesystem ) ) {
-		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.', 'wordpoints' ) );
+	if ( ! is_object($wp_filesystem)) {
+		return new WP_Error('fs_unavailable', __('Could not access filesystem.', 'wordpoints'));
 	}
 
-	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-		return new WP_Error( 'fs_error', __( 'Filesystem error.', 'wordpoints' ), $wp_filesystem->errors );
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+		return new WP_Error('fs_error', __('Filesystem error.', 'wordpoints'), $wp_filesystem->errors);
 	}
 
 	// Get the base module folder.
-	$modules_dir = $wp_filesystem->find_folder( wordpoints_modules_dir() );
+	$modules_dir = $wp_filesystem->find_folder(wordpoints_modules_dir());
 
-	if ( empty( $modules_dir ) ) {
-		return new WP_Error( 'fs_no_modules_dir', __( 'Unable to locate WordPoints Module directory.', 'wordpoints' ) );
+	if (empty($modules_dir)) {
+		return new WP_Error('fs_no_modules_dir', __('Unable to locate WordPoints Module directory.', 'wordpoints'));
 	}
 
-	$modules_dir = trailingslashit( $modules_dir );
+	$modules_dir = trailingslashit($modules_dir);
 	$errors = array();
 
-	foreach ( $modules as $module_file ) {
+	foreach ($modules as $module_file) {
 
 		// Run uninstall hook.
-		if ( is_uninstallable_wordpoints_module( $module_file ) ) {
-			wordpoints_uninstall_module( $module_file );
+		if (is_uninstallable_wordpoints_module($module_file)) {
+			wordpoints_uninstall_module($module_file);
 		}
 
-		$this_module_dir = trailingslashit( dirname( $modules_dir . $module_file ) );
+		$this_module_dir = trailingslashit(dirname($modules_dir . $module_file));
 
 		// If module is in its own directory, recursively delete the directory.
-		if ( strpos( $module_file, '/' ) && $this_module_dir !== $modules_dir ) {
-			$deleted = $wp_filesystem->delete( $this_module_dir, true );
+		if (strpos($module_file, '/') && $this_module_dir !== $modules_dir) {
+			$deleted = $wp_filesystem->delete($this_module_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $modules_dir . $module_file );
+			$deleted = $wp_filesystem->delete($modules_dir . $module_file);
 		}
 
-		if ( ! $deleted ) {
+		if ( ! $deleted) {
 			$errors[] = $module_file;
 		}
 	}
@@ -950,9 +950,9 @@ 
 	 * @param array $modules The modules that were to be deleted.
 	 * @param array $errors  The modules that failed to delete.
 	 */
-	do_action( 'wordpoints_deleted_modules', $modules, $errors );
+	do_action('wordpoints_deleted_modules', $modules, $errors);
 
-	if ( ! empty( $errors ) ) {
+	if ( ! empty($errors)) {
 		return new WP_Error(
 			'could_not_remove_module'
 			, sprintf(
@@ -960,10 +960,10 @@ 
 				_n(
 					'Could not fully remove the module %s.'
 					, 'Could not fully remove the modules %s.'
-					, count( $errors )
+					, count($errors)
 					, 'wordpoints'
 				)
-				, implode( ', ', $errors )
+				, implode(', ', $errors)
 			)
 		);
 	}
@@ -982,16 +982,16 @@ 
  *
  * @return bool Whether the module had an uninstall process.
  */
-function wordpoints_uninstall_module( $module ) {
+function wordpoints_uninstall_module($module) {
 
-	$file              = wordpoints_module_basename( $module );
-	$module_dir        = wordpoints_modules_dir() . '/' . dirname( $file );
+	$file              = wordpoints_module_basename($module);
+	$module_dir        = wordpoints_modules_dir() . '/' . dirname($file);
 	$uninstall_file    = $module_dir . '/uninstall.php';
 	$un_installer_file = $module_dir . '/includes/class-un-installer.php';
 
-	if ( file_exists( $uninstall_file ) ) {
+	if (file_exists($uninstall_file)) {
 
-		if ( ! defined( 'WORDPOINTS_UNINSTALL_MODULE' ) ) {
+		if ( ! defined('WORDPOINTS_UNINSTALL_MODULE')) {
 			/**
 			 * Uninstalling a module.
 			 *
@@ -1005,17 +1005,17 @@ 
 			 *
 			 * @const WORDPOINTS_UNINSTALL_MODULE
 			 */
-			define( 'WORDPOINTS_UNINSTALL_MODULE', true );
+			define('WORDPOINTS_UNINSTALL_MODULE', true);
 		}
 
-		WordPoints_Module_Paths::register( $uninstall_file );
+		WordPoints_Module_Paths::register($uninstall_file);
 		include $uninstall_file;
 
 		return true;
 
-	} elseif ( file_exists( $un_installer_file ) ) {
+	} elseif (file_exists($un_installer_file)) {
 
-		$slug = WordPoints_Modules::get_slug( $module );
+		$slug = WordPoints_Modules::get_slug($module);
 
 		WordPoints_Installables::register(
 			'module'
@@ -1027,7 +1027,7 @@ 
 			)
 		);
 
-		return WordPoints_Installables::uninstall( 'module', $slug );
+		return WordPoints_Installables::uninstall('module', $slug);
 
 	} else {
 
@@ -1053,34 +1053,34 @@ 
  */
 function wordpoints_load_modules() {
 
-	$active_modules = wordpoints_get_array_option( 'wordpoints_active_modules' );
+	$active_modules = wordpoints_get_array_option('wordpoints_active_modules');
 
-	if ( is_wordpoints_network_active() ) {
+	if (is_wordpoints_network_active()) {
 
 		$network_active_modules = array_keys(
-			wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' )
+			wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site')
 		);
 
 		// On the network admin screens we only load the network active modules.
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$active_modules = $network_active_modules;
 		} else {
-			$active_modules = array_merge( $active_modules, $network_active_modules );
+			$active_modules = array_merge($active_modules, $network_active_modules);
 		}
 	}
 
-	if ( ! empty( $active_modules ) ) {
+	if ( ! empty($active_modules)) {
 
 		$modules_dir = wordpoints_modules_dir();
 
-		foreach ( $active_modules as $module ) {
+		foreach ($active_modules as $module) {
 
 			if (
-				0 === validate_file( $module )
-				&& '.php' === substr( $module, -4 )
-				&& file_exists( $modules_dir . '/' . $module )
+				0 === validate_file($module)
+				&& '.php' === substr($module, -4)
+				&& file_exists($modules_dir . '/' . $module)
 			) {
-				WordPoints_Module_Paths::register( $modules_dir . '/' . $module );
+				WordPoints_Module_Paths::register($modules_dir . '/' . $module);
 				include $modules_dir . '/' . $module;
 			}
 		}
@@ -1093,7 +1093,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	do_action( 'wordpoints_modules_loaded' );
+	do_action('wordpoints_modules_loaded');
 }
 
 /**
@@ -1104,11 +1104,11 @@ 
  * @param string $file     The main file of the module the hook is for.
  * @param string $function The callback function.
  */
-function wordpoints_register_module_activation_hook( $file, $function ) {
+function wordpoints_register_module_activation_hook($file, $function) {
 
-	$module_file = wordpoints_module_basename( $file );
+	$module_file = wordpoints_module_basename($file);
 
-	add_action( "wordpoints_module_activate-{$module_file}", $function );
+	add_action("wordpoints_module_activate-{$module_file}", $function);
 }
 
 /**
@@ -1119,11 +1119,11 @@ 
  * @param string $file     The main file of the module the hook is for.
  * @param string $function The callback function.
  */
-function wordpoints_register_module_deactivation_hook( $file, $function ) {
+function wordpoints_register_module_deactivation_hook($file, $function) {
 
-	$module_file = wordpoints_module_basename( $file );
+	$module_file = wordpoints_module_basename($file);
 
-	add_action( "wordpoints_deactivate_module-{$module_file}", $function );
+	add_action("wordpoints_deactivate_module-{$module_file}", $function);
 }
 
 // EOF

src/classes/module/paths.php

Spacing +17 added lines, -17 removed lines

@@ -64,30 +64,30 @@ 
 	 *
 	 * @return bool Whether the path was able to be registered.
 	 */
-	public static function register( $file ) {
+	public static function register($file) {
 
-		$file = wp_normalize_path( $file );
+		$file = wp_normalize_path($file);
 
 		// We store this so that we don't have to keep normalizing a constant value.
-		if ( ! isset( self::$modules_dir ) ) {
-			self::$modules_dir = wp_normalize_path( wordpoints_modules_dir() );
+		if ( ! isset(self::$modules_dir)) {
+			self::$modules_dir = wp_normalize_path(wordpoints_modules_dir());
 		}
 
-		$module_path = wp_normalize_path( dirname( $file ) );
+		$module_path = wp_normalize_path(dirname($file));
 
 		// It was a single-file module.
-		if ( $module_path . '/' === self::$modules_dir ) {
+		if ($module_path . '/' === self::$modules_dir) {
 			return false;
 		}
 
-		$module_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+		$module_realpath = wp_normalize_path(dirname(realpath($file)));
 
-		if ( $module_path !== $module_realpath ) {
+		if ($module_path !== $module_realpath) {
 
-			$realpath_length = strlen( $module_realpath );
+			$realpath_length = strlen($module_realpath);
 
 			// Use unique keys, but still easy to sort by realpath length.
-			self::$paths[ $realpath_length . '-' . $module_path ] = array(
+			self::$paths[$realpath_length . '-' . $module_path] = array(
 				'module_path'     => $module_path,
 				'module_realpath' => $module_realpath,
 				'realpath_length' => $realpath_length,
@@ -108,19 +108,19 @@ 
 	 *
 	 * @return string The path to the symlink in the modules directory.
 	 */
-	public static function resolve( $file ) {
+	public static function resolve($file) {
 
-		$file = wp_normalize_path( $file );
+		$file = wp_normalize_path($file);
 
 		// Sort the paths by the realpath length, see https://core.trac.wordpress.org/ticket/28441.
-		if ( ! self::$paths_sorted ) {
-			krsort( self::$paths );
+		if ( ! self::$paths_sorted) {
+			krsort(self::$paths);
 			self::$paths_sorted = true;
 		}
 
-		foreach ( self::$paths as $path ) {
-			if ( 0 === strpos( $file, $path['module_realpath'] ) ) {
-				$file = $path['module_path'] . substr( $file, $path['realpath_length'] );
+		foreach (self::$paths as $path) {
+			if (0 === strpos($file, $path['module_realpath'])) {
+				$file = $path['module_path'] . substr($file, $path['realpath_length']);
 			}
 		}
 

src/classes/shortcodes.php

Spacing +12 added lines, -12 removed lines

@@ -45,11 +45,11 @@ 
 	 * @param string $shortcode The shortcode to register a handler class for.
 	 * @param string $class     The handler class for this shortcode.
 	 */
-	public static function register( $shortcode, $class ) {
+	public static function register($shortcode, $class) {
 
-		self::$shortcodes[ $shortcode ] = $class;
+		self::$shortcodes[$shortcode] = $class;
 
-		add_shortcode( $shortcode, array( __CLASS__, 'do_shortcode' ) );
+		add_shortcode($shortcode, array(__CLASS__, 'do_shortcode'));
 	}
 
 	/**
@@ -71,12 +71,12 @@ 
 	 *                                          or a handler, or false if $shortcode
 	 *                                          is invalid.
 	 */
-	public static function get( $shortcode = null, $atts = null, $content = null ) {
+	public static function get($shortcode = null, $atts = null, $content = null) {
 
-		if ( isset( $shortcode ) ) {
+		if (isset($shortcode)) {
 
-			if ( isset( self::$shortcodes[ $shortcode ] ) ) {
-				return new self::$shortcodes[ $shortcode ]( $atts, $content, $shortcode );
+			if (isset(self::$shortcodes[$shortcode])) {
+				return new self::$shortcodes[$shortcode]($atts, $content, $shortcode);
 			} else {
 				return false;
 			}
@@ -103,20 +103,20 @@ 
 	 *
 	 * @return string The content generated for this shortcode.
 	 */
-	public static function do_shortcode( $atts, $content, $shortcode ) {
+	public static function do_shortcode($atts, $content, $shortcode) {
 
-		if ( ! isset( self::$shortcodes[ $shortcode ] ) ) {
+		if ( ! isset(self::$shortcodes[$shortcode])) {
 			return wordpoints_shortcode_error(
 				sprintf(
 					// translators: Shortcode name.
-					esc_html__( 'The %s shortcode was not registered properly.', 'wordpoints' )
-					, '<code>[' . esc_html( $shortcode ) . ']</code>'
+					esc_html__('The %s shortcode was not registered properly.', 'wordpoints')
+					, '<code>[' . esc_html($shortcode) . ']</code>'
 				)
 			);
 		}
 
 		/** @var WordPoints_Shortcode $shortcode */
-		$shortcode = new self::$shortcodes[ $shortcode ]( $atts, $content, $shortcode );
+		$shortcode = new self::$shortcodes[$shortcode]($atts, $content, $shortcode);
 		return $shortcode->expand();
 	}
 }

src/classes/dropdown/builder.php

Spacing +10 added lines, -10 removed lines

@@ -74,9 +74,9 @@ 
 	 *                                       option is an array or object.
 	 * }
 	 */
-	public function __construct( array $options, array $args ) {
+	public function __construct(array $options, array $args) {
 
-		$this->args = array_merge( $this->args, $args );
+		$this->args = array_merge($this->args, $args);
 
 		$this->options = $options;
 	}
@@ -100,7 +100,7 @@ 
 	 */
 	public function start() {
 
-		echo '<select id="', esc_attr( $this->args['id'] ), '" name="', esc_attr( $this->args['name'] ), '" class="', esc_attr( $this->args['class'] ), '">';
+		echo '<select id="', esc_attr($this->args['id']), '" name="', esc_attr($this->args['name']), '" class="', esc_attr($this->args['class']), '">';
 	}
 
 	/**
@@ -110,20 +110,20 @@ 
 	 */
 	public function options() {
 
-		if ( ! empty( $this->args['show_option_none'] ) ) {
+		if ( ! empty($this->args['show_option_none'])) {
 
-			echo '<option value="-1"', selected( '-1', $this->args['selected'], false ), '>', esc_html( $this->args['show_option_none'] ), '</option>';
+			echo '<option value="-1"', selected('-1', $this->args['selected'], false), '>', esc_html($this->args['show_option_none']), '</option>';
 		}
 
-		foreach ( $this->options as $value => $option ) {
+		foreach ($this->options as $value => $option) {
 
-			if ( isset( $this->args['values_key'], $this->args['options_key'] ) ) {
+			if (isset($this->args['values_key'], $this->args['options_key'])) {
 				$option = (array) $option;
-				$value = $option[ $this->args['values_key'] ];
-				$option = $option[ $this->args['options_key'] ];
+				$value = $option[$this->args['values_key']];
+				$option = $option[$this->args['options_key']];
 			}
 
-			echo '<option value="', esc_attr( $value ), '"', selected( $value, $this->args['selected'], false ), '>', esc_html( $option ), '</option>';
+			echo '<option value="', esc_attr($value), '"', selected($value, $this->args['selected'], false), '>', esc_html($option), '</option>';
 		}
 	}
 

src/components/ranks/includes/filters.php

Spacing +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@
  * @since 2.1.0
  */
 
-add_action( 'wordpoints_modules_loaded', 'WordPoints_Rank_Types::init' );
+add_action('wordpoints_modules_loaded', 'WordPoints_Rank_Types::init');
 
-add_action( 'wordpoints_ranks_register', 'wordpoints_register_core_ranks' );
+add_action('wordpoints_ranks_register', 'wordpoints_register_core_ranks');
 
-WordPoints_Shortcodes::register( 'wordpoints_user_rank', 'WordPoints_Rank_Shortcode_User_Rank' );
+WordPoints_Shortcodes::register('wordpoints_user_rank', 'WordPoints_Rank_Shortcode_User_Rank');
 
 // EOF

src/components/ranks/includes/shortcodes.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	/**
 	 * @since 2.3.0
 	 */
-	public function __construct( $atts, $content, $shortcode = null ) {
+	public function __construct($atts, $content, $shortcode = null) {
 
 		_deprecated_function(
 			__METHOD__
@@ -27,7 +27,7 @@ 
 			, 'WordPoints_Rank_Shortcode_User_Rank::__construct'
 		);
 
-		parent::__construct( $atts, $content, $shortcode );
+		parent::__construct($atts, $content, $shortcode);
 	}
 }