insideout10 / wordlift-plugin

src/admin/class-wordlift-admin-entity-taxonomy-list-page.php

Indentation +109 added lines, -109 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -28,113 +28,113 @@ 
  */
 class Wordlift_Admin_Entity_Taxonomy_List_Page {
 
-	/**
-	 * Hook to `wl_entity_type_row_actions` to add an "action" link to Thread
-	 * SEO related settings for the term.
-	 *
-	 * @see   https://developer.wordpress.org/reference/hooks/taxonomy_row_actions/
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array  $actions An array of action links to be displayed. Default
-	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
-	 * @param object $term    Term object.
-	 *
-	 * @return array  $actions An array of action links to be displayed. Default
-	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
-	 */
-	function wl_entity_type_row_actions( $actions, $term ) {
-
-		$url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
-		$actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
-
-		// Hacks for pre 4.7 compatibility:
-		// * remove the quick edit.
-		unset( $actions['inline hide-if-no-js'] );
-		// * remove the edit link.
-		unset( $actions['edit'] );
-
-		return $actions;
-	}
-
-	/**
-	 * Override the capabilities related to managing the entity type terms
-	 * for multisite super admin to prevent it from manipulating it in any
-	 * way.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param array  $caps    The user's current capabilities.
-	 * @param string $cap     Capability name.
-	 * @param int    $user_id The user ID.
-	 * @param array  $args    Adds the context to the cap. Typically the object ID.
-	 *
-	 * @return array    Array containing the do_not_allow capability for super admin
-	 *                  when editing and deleting entity type terms capabilities
-	 *                    are being "approved"
-	 */
-	function restrict_super_admin( $caps, $cap, $user_id, $args ) {
-
-		switch ( $cap ) {
-			case 'wl_entity_type_edit_term':
-			case 'wl_entity_type_delete_term':
-				$caps[] = 'do_not_allow';
-		}
-
-		return $caps;
-	}
-
-	/**
-	 * Override the capabilities related to managing the entity type terms
-	 * required for WordPress < 4.7 to get access to the admin page.
-	 *
-	 * Before 4.7, WordPress checks whether the user has permission to access
-	 * the `edit-tags.php` page. So we need to provide temporary the permission
-	 * otherwise the user will get an `access not allowed` when trying to access
-	 * the page.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/512
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param array  $caps    The user's current capabilities.
-	 * @param string $cap     Capability name.
-	 * @param int    $user_id The user ID.
-	 * @param array  $args    Adds the context to the cap. Typically the object ID.
-	 *
-	 * @return array    Array containing the manage_options capability
-	 */
-	function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
-
-		// Bail out if we're not dealing with the `wl_entity_type_edit_term`
-		// capability.
-		if ( 'wl_entity_type_edit_term' !== $cap ) {
-			return $caps;
-		}
-
-		$path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
-
-		// Bail out if the `path` cannot be determined.
-		if ( null === $path ) {
-			return $caps;
-		}
-
-		// Bail out if a specific term is being handled.
-		if ( isset( $_REQUEST['action'] ) ) {
-			return $caps;
-		}
-
-		// Split the path and check if the page is the `edit-tags.php`. We can't
-		// use WP's own function because this is called very early.
-		$components = explode( '/', $path );
-		if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
-			return $caps;
-		}
-
-		// Give permission to the user.
-		$mapped[] = 'manage_options';
-
-		return $mapped;
-	}
+    /**
+     * Hook to `wl_entity_type_row_actions` to add an "action" link to Thread
+     * SEO related settings for the term.
+     *
+     * @see   https://developer.wordpress.org/reference/hooks/taxonomy_row_actions/
+     *
+     * @since 3.11.0
+     *
+     * @param array  $actions An array of action links to be displayed. Default
+     *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
+     * @param object $term    Term object.
+     *
+     * @return array  $actions An array of action links to be displayed. Default
+     *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
+     */
+    function wl_entity_type_row_actions( $actions, $term ) {
+
+        $url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
+        $actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
+
+        // Hacks for pre 4.7 compatibility:
+        // * remove the quick edit.
+        unset( $actions['inline hide-if-no-js'] );
+        // * remove the edit link.
+        unset( $actions['edit'] );
+
+        return $actions;
+    }
+
+    /**
+     * Override the capabilities related to managing the entity type terms
+     * for multisite super admin to prevent it from manipulating it in any
+     * way.
+     *
+     * @since 3.12.0
+     *
+     * @param array  $caps    The user's current capabilities.
+     * @param string $cap     Capability name.
+     * @param int    $user_id The user ID.
+     * @param array  $args    Adds the context to the cap. Typically the object ID.
+     *
+     * @return array    Array containing the do_not_allow capability for super admin
+     *                  when editing and deleting entity type terms capabilities
+     *                    are being "approved"
+     */
+    function restrict_super_admin( $caps, $cap, $user_id, $args ) {
+
+        switch ( $cap ) {
+            case 'wl_entity_type_edit_term':
+            case 'wl_entity_type_delete_term':
+                $caps[] = 'do_not_allow';
+        }
+
+        return $caps;
+    }
+
+    /**
+     * Override the capabilities related to managing the entity type terms
+     * required for WordPress < 4.7 to get access to the admin page.
+     *
+     * Before 4.7, WordPress checks whether the user has permission to access
+     * the `edit-tags.php` page. So we need to provide temporary the permission
+     * otherwise the user will get an `access not allowed` when trying to access
+     * the page.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/512
+     *
+     * @since 3.12.0
+     *
+     * @param array  $caps    The user's current capabilities.
+     * @param string $cap     Capability name.
+     * @param int    $user_id The user ID.
+     * @param array  $args    Adds the context to the cap. Typically the object ID.
+     *
+     * @return array    Array containing the manage_options capability
+     */
+    function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
+
+        // Bail out if we're not dealing with the `wl_entity_type_edit_term`
+        // capability.
+        if ( 'wl_entity_type_edit_term' !== $cap ) {
+            return $caps;
+        }
+
+        $path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+
+        // Bail out if the `path` cannot be determined.
+        if ( null === $path ) {
+            return $caps;
+        }
+
+        // Bail out if a specific term is being handled.
+        if ( isset( $_REQUEST['action'] ) ) {
+            return $caps;
+        }
+
+        // Split the path and check if the page is the `edit-tags.php`. We can't
+        // use WP's own function because this is called very early.
+        $components = explode( '/', $path );
+        if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
+            return $caps;
+        }
+
+        // Give permission to the user.
+        $mapped[] = 'manage_options';
+
+        return $mapped;
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.11.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -43,16 +43,16 @@ 
 	 * @return array  $actions An array of action links to be displayed. Default
 	 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 	 */
-	function wl_entity_type_row_actions( $actions, $term ) {
+	function wl_entity_type_row_actions($actions, $term) {
 
-		$url               = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id" );
-		$actions['wl-seo'] = '<a href="' . esc_url( $url ) . '">' . __( 'SEO Settings', 'wordlift' ) . '</a>';
+		$url               = admin_url("admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id");
+		$actions['wl-seo'] = '<a href="'.esc_url($url).'">'.__('SEO Settings', 'wordlift').'</a>';
 
 		// Hacks for pre 4.7 compatibility:
 		// * remove the quick edit.
-		unset( $actions['inline hide-if-no-js'] );
+		unset($actions['inline hide-if-no-js']);
 		// * remove the edit link.
-		unset( $actions['edit'] );
+		unset($actions['edit']);
 
 		return $actions;
 	}
@@ -73,9 +73,9 @@ 
 	 *                  when editing and deleting entity type terms capabilities
 	 *                    are being "approved"
 	 */
-	function restrict_super_admin( $caps, $cap, $user_id, $args ) {
+	function restrict_super_admin($caps, $cap, $user_id, $args) {
 
-		switch ( $cap ) {
+		switch ($cap) {
 			case 'wl_entity_type_edit_term':
 			case 'wl_entity_type_delete_term':
 				$caps[] = 'do_not_allow';
@@ -104,30 +104,30 @@ 
 	 *
 	 * @return array    Array containing the manage_options capability
 	 */
-	function enable_admin_access_pre_47( $caps, $cap, $user_id, $args ) {
+	function enable_admin_access_pre_47($caps, $cap, $user_id, $args) {
 
 		// Bail out if we're not dealing with the `wl_entity_type_edit_term`
 		// capability.
-		if ( 'wl_entity_type_edit_term' !== $cap ) {
+		if ('wl_entity_type_edit_term' !== $cap) {
 			return $caps;
 		}
 
-		$path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
+		$path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
 
 		// Bail out if the `path` cannot be determined.
-		if ( null === $path ) {
+		if (null === $path) {
 			return $caps;
 		}
 
 		// Bail out if a specific term is being handled.
-		if ( isset( $_REQUEST['action'] ) ) {
+		if (isset($_REQUEST['action'])) {
 			return $caps;
 		}
 
 		// Split the path and check if the page is the `edit-tags.php`. We can't
 		// use WP's own function because this is called very early.
-		$components = explode( '/', $path );
-		if ( 'edit-tags.php' !== $components[ count( $components ) - 1 ] ) {
+		$components = explode('/', $path);
+		if ('edit-tags.php' !== $components[count($components) - 1]) {
 			return $caps;
 		}
 

src/modules/prefixes/wordlift_prefixes.php

Indentation +28 added lines, -28 removed lines

@@ -15,34 +15,34 @@
  */
 function wl_prefixes_list() {
 
-	// If the parameter is false, default prefixes have never been installed.
-	if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
+    // If the parameter is false, default prefixes have never been installed.
+    if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
 
-		$prefixes = array(
-			array(
-				'prefix'    => 'geo',
-				'namespace' => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-			),
-			array(
-				'prefix'    => 'dct',
-				'namespace' => 'http://purl.org/dc/terms/',
-			),
-			array(
-				'prefix'    => 'rdfs',
-				'namespace' => 'http://www.w3.org/2000/01/rdf-schema#',
-			),
-			array(
-				'prefix'    => 'owl',
-				'namespace' => 'http://www.w3.org/2002/07/owl#',
-			),
-			array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
-			array(
-				'prefix'    => 'xsd',
-				'namespace' => 'http://www.w3.org/2001/XMLSchema#',
-			),
-		);
-		add_option( 'wl_option_prefixes', $prefixes );
-	}
+        $prefixes = array(
+            array(
+                'prefix'    => 'geo',
+                'namespace' => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
+            ),
+            array(
+                'prefix'    => 'dct',
+                'namespace' => 'http://purl.org/dc/terms/',
+            ),
+            array(
+                'prefix'    => 'rdfs',
+                'namespace' => 'http://www.w3.org/2000/01/rdf-schema#',
+            ),
+            array(
+                'prefix'    => 'owl',
+                'namespace' => 'http://www.w3.org/2002/07/owl#',
+            ),
+            array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
+            array(
+                'prefix'    => 'xsd',
+                'namespace' => 'http://www.w3.org/2001/XMLSchema#',
+            ),
+        );
+        add_option( 'wl_option_prefixes', $prefixes );
+    }
 
-	return $prefixes;
+    return $prefixes;
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 function wl_prefixes_list() {
 
 	// If the parameter is false, default prefixes have never been installed.
-	if ( false === ( $prefixes = get_option( 'wl_option_prefixes' ) ) ) {
+	if (false === ($prefixes = get_option('wl_option_prefixes'))) {
 
 		$prefixes = array(
 			array(
@@ -35,13 +35,13 @@ 
 				'prefix'    => 'owl',
 				'namespace' => 'http://www.w3.org/2002/07/owl#',
 			),
-			array( 'prefix' => 'schema', 'namespace' => 'http://schema.org/' ),
+			array('prefix' => 'schema', 'namespace' => 'http://schema.org/'),
 			array(
 				'prefix'    => 'xsd',
 				'namespace' => 'http://www.w3.org/2001/XMLSchema#',
 			),
 		);
-		add_option( 'wl_option_prefixes', $prefixes );
+		add_option('wl_option_prefixes', $prefixes);
 	}
 
 	return $prefixes;

src/wordlift.php

Indentation +234 added lines, -234 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -48,7 +48,7 @@ 
  */
 function wl_write_log( $log ) {
 
-	Wordlift_Log_Service::get_instance()->info( $log );
+    Wordlift_Log_Service::get_instance()->info( $log );
 
 }
 
@@ -64,20 +64,20 @@ 
  */
 function wl_write_log_handler( $log, $caller = null ) {
 
-	global $wl_logger;
+    global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+    if ( true === WP_DEBUG ) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+        $message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
+                    ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
-		} else {
-			error_log( $message );
-		}
+        if ( isset( $wl_logger ) ) {
+            $wl_logger->info( $message );
+        } else {
+            error_log( $message );
+        }
 
-	}
+    }
 
 }
 
@@ -94,7 +94,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -106,10 +106,10 @@ 
  */
 function wl_queue_sparql_update_query( $query ) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    file_put_contents( $filename, $query . "\n", FILE_APPEND );
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
 }
 
 /**
@@ -119,28 +119,28 @@ 
  */
 function wl_execute_saved_sparql_update_query( $request_id ) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+    $filename = WL_TEMP_DIR . $request_id . '.sparql';
 
-	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+    // If the file doesn't exist, exit.
+    if ( ! file_exists( $filename ) ) {
+        wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
 
-		return;
-	}
+        return;
+    }
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
 
-	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+    // Get the query saved in the file.
+    $query = file_get_contents( $filename );
 
-	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+    // Execute the SPARQL query.
+    rl_execute_sparql_update_query( $query, false );
 
-	// Reindex the triple store.
-	wordlift_reindex_triple_store();
+    // Reindex the triple store.
+    wordlift_reindex_triple_store();
 
-	// Delete the temporary file.
-	unlink( $filename );
+    // Delete the temporary file.
+    unlink( $filename );
 }
 
 add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
@@ -150,21 +150,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // init process for button control
@@ -179,28 +179,28 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-	wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
+    wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+    wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 }
 
 add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+    wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
@@ -215,18 +215,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -240,16 +240,16 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
-	// place on the globe:"The zero/zero point of this system is located in the
-	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific
+    // place on the globe:"The zero/zero point of this system is located in the
+    // Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -261,13 +261,13 @@ 
  */
 function wl_get_post_modified_time( $post ) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+    $date_modified = get_post_modified_time( 'c', true, $post );
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
-	}
+    if ( '-' === substr( $date_modified, 0, 1 ) ) {
+        return get_the_time( 'c', $post );
+    }
 
-	return $date_modified;
+    return $date_modified;
 }
 
 /**
@@ -279,40 +279,40 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	// If there is a featured image it has the priority.
-	$featured_image_id = get_post_thumbnail_id( $post_id );
-	if ( is_numeric( $featured_image_id ) ) {
-		$image_url = wp_get_attachment_url( $featured_image_id );
+    // If there is a featured image it has the priority.
+    $featured_image_id = get_post_thumbnail_id( $post_id );
+    if ( is_numeric( $featured_image_id ) ) {
+        $image_url = wp_get_attachment_url( $featured_image_id );
 
-		return array( $image_url );
-	}
+        return array( $image_url );
+    }
 
-	$images = get_children( array(
-		'post_parent'    => $post_id,
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-	) );
+    $images = get_children( array(
+        'post_parent'    => $post_id,
+        'post_type'      => 'attachment',
+        'post_mime_type' => 'image',
+    ) );
 
-	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
-		return array();
-	}
+    // Return an empty array if no image is found.
+    if ( empty( $images ) ) {
+        return array();
+    }
 
-	// Prepare the return array.
-	$image_urls = array();
+    // Prepare the return array.
+    $image_urls = array();
 
-	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
-		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
-		}
-	}
+    // Collect the URLs.
+    foreach ( $images as $attachment_id => $attachment ) {
+        $image_url = wp_get_attachment_url( $attachment_id );
+        // Ensure the URL isn't collected already.
+        if ( ! in_array( $image_url, $image_urls ) ) {
+            array_push( $image_urls, $image_url );
+        }
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
 
-	return $image_urls;
+    return $image_urls;
 }
 
 /**
@@ -325,19 +325,19 @@ 
  */
 function wl_get_sparql_images( $uri, $post_id ) {
 
-	$sparql = '';
+    $sparql = '';
 
-	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+    // Get the escaped URI.
+    $uri_e = esc_html( $uri );
 
-	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
-		$sparql        .= " <$uri_e> schema:image <$image_url_esc> . \n";
-	}
+    // Add SPARQL stmts to write the schema:image.
+    $image_urls = wl_get_image_urls( $post_id );
+    foreach ( $image_urls as $image_url ) {
+        $image_url_esc = wl_sparql_escape_uri( $image_url );
+        $sparql        .= " <$uri_e> schema:image <$image_url_esc> . \n";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -350,24 +350,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -378,8 +378,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 
@@ -397,61 +397,61 @@ 
  */
 function wl_flush_rewrite_rules_hard( $hard ) {
 
-	// If WL is not yet configured, we cannot perform any update, so we exit.
-	if ( '' === wl_configuration_get_key() ) {
-		return;
-	}
+    // If WL is not yet configured, we cannot perform any update, so we exit.
+    if ( '' === wl_configuration_get_key() ) {
+        return;
+    }
 
-	// Set the initial offset and limit each call to 100 posts to avoid memory errors.
-	$offset = 0;
-	$limit  = 100;
+    // Set the initial offset and limit each call to 100 posts to avoid memory errors.
+    $offset = 0;
+    $limit  = 100;
 
-	// Get more posts if the number of returned posts matches the limit.
-	while ( $limit === ( $posts = get_posts( array(
-			'offset'      => $offset,
-			'numberposts' => $limit,
-			'orderby'     => 'ID',
-			'post_type'   => 'any',
-			'post_status' => 'publish',
-		) ) ) ) {
+    // Get more posts if the number of returned posts matches the limit.
+    while ( $limit === ( $posts = get_posts( array(
+            'offset'      => $offset,
+            'numberposts' => $limit,
+            'orderby'     => 'ID',
+            'post_type'   => 'any',
+            'post_status' => 'publish',
+        ) ) ) ) {
 
-		// Holds the delete part of the query.
-		$delete_query = rl_sparql_prefixes();
+        // Holds the delete part of the query.
+        $delete_query = rl_sparql_prefixes();
 
-		// Holds the insert part of the query.
-		$insert_query = '';
+        // Holds the insert part of the query.
+        $insert_query = '';
 
-		// Cycle in each post to build the query.
-		foreach ( $posts as $post ) {
+        // Cycle in each post to build the query.
+        foreach ( $posts as $post ) {
 
-			// Ignore revisions.
-			if ( wp_is_post_revision( $post->ID ) ) {
-				continue;
-			}
+            // Ignore revisions.
+            if ( wp_is_post_revision( $post->ID ) ) {
+                continue;
+            }
 
-			// Get the entity URI.
-			$s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
-			                                                                 ->get_uri( $post->ID ) );
+            // Get the entity URI.
+            $s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
+                                                                                ->get_uri( $post->ID ) );
 
-			// Get the post URL.
-			// $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+            // Get the post URL.
+            // $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
 
-			// Prepare the DELETE and INSERT commands.
-			$delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
+            // Prepare the DELETE and INSERT commands.
+            $delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
 
-			$insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
-			                                                     ->get_insert_query( $s, $post->ID );
+            $insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
+                                                                    ->get_insert_query( $s, $post->ID );
 
-		}
+        }
 
 
-		// Execute the query.
-		rl_execute_sparql_update_query( $delete_query . $insert_query );
+        // Execute the query.
+        rl_execute_sparql_update_query( $delete_query . $insert_query );
 
-		// Advance to the next posts.
-		$offset += $limit;
+        // Advance to the next posts.
+        $offset += $limit;
 
-	}
+    }
 
 //	// Get all published posts.
 //	$posts = get_posts( array(
@@ -477,7 +477,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 /**
@@ -489,11 +489,11 @@ 
  */
 function wl_force_to_array( $value ) {
 
-	if ( ! is_array( $value ) ) {
-		return array( $value );
-	}
+    if ( ! is_array( $value ) ) {
+        return array( $value );
+    }
 
-	return $value;
+    return $value;
 }
 
 /**
@@ -501,26 +501,26 @@ 
  */
 function wl_shutdown() {
 
-	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    // Get the filename to the temporary SPARQL file.
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
 
-	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+    // If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
+    if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
 
-		// The request ID.
-		$args = array( WL_REQUEST_ID );
+        // The request ID.
+        $args = array( WL_REQUEST_ID );
 
-		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+        // Schedule the execution of the SPARQL query with the request ID.
+        wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
 
-		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+        // Check that the request is scheduled.
+        $timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
 
-		// Spawn the cron.
-		spawn_cron();
+        // Spawn the cron.
+        spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
-	}
+        wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+    }
 }
 
 add_action( 'shutdown', 'wl_shutdown' );
@@ -534,46 +534,46 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	// wl_write_log( "wl_replace_item_id_with_uri" );
+    // wl_write_log( "wl_replace_item_id_with_uri" );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -646,8 +646,8 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
 }
 
 /**
@@ -655,8 +655,8 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
 }
 
 register_activation_hook( __FILE__, 'activate_wordlift' );
@@ -679,8 +679,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +153 added lines, -153 removed lines

@@ -25,15 +25,15 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules.
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -46,9 +46,9 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->info( $log );
+	Wordlift_Log_Service::get_instance()->info($log);
 
 }
 
@@ -62,19 +62,19 @@ 
  * @param string|array $log    The log data.
  * @param string       $caller The calling function.
  */
-function wl_write_log_handler( $log, $caller = null ) {
+function wl_write_log_handler($log, $caller = null) {
 
 	global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+	if (true === WP_DEBUG) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+		$message = (isset($caller) ? sprintf('[%-40.40s] ', $caller) : '').
+		           (is_array($log) || is_object($log) ? print_r($log, true) : wl_write_log_hide_key($log));
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
+		if (isset($wl_logger)) {
+			$wl_logger->info($message);
 		} else {
-			error_log( $message );
+			error_log($message);
 		}
 
 	}
@@ -92,9 +92,9 @@ 
  *
  * @return string A text with the key hidden.
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -104,12 +104,12 @@ 
  *
  * @param string $query A SPARQL query.
  */
-function wl_queue_sparql_update_query( $query ) {
+function wl_queue_sparql_update_query($query) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
+	file_put_contents($filename, $query."\n", FILE_APPEND);
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_queue_sparql_update_query [ filename :: $filename ]");
 }
 
 /**
@@ -117,33 +117,33 @@ 
  *
  * @param int $request_id The request ID.
  */
-function wl_execute_saved_sparql_update_query( $request_id ) {
+function wl_execute_saved_sparql_update_query($request_id) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+	$filename = WL_TEMP_DIR.$request_id.'.sparql';
 
 	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+	if ( ! file_exists($filename)) {
+		wl_write_log("wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]");
 
 		return;
 	}
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_execute_saved_sparql_update_query [ filename :: $filename ]");
 
 	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+	$query = file_get_contents($filename);
 
 	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+	rl_execute_sparql_update_query($query, false);
 
 	// Reindex the triple store.
 	wordlift_reindex_triple_store();
 
 	// Delete the temporary file.
-	unlink( $filename );
+	unlink($filename);
 }
 
-add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
+add_action('wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1);
 
 /**
  * Enable microdata schema.org tagging.
@@ -152,7 +152,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -160,9 +160,9 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
@@ -171,7 +171,7 @@ 
 //add_action( 'init', 'wordlift_buttonhooks' );
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 
 /**
@@ -180,30 +180,30 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-	wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-geolocation', plugin_dir_url(__FILE__).'/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
+	wp_enqueue_script('angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', plugin_dir_url(__FILE__).'css/wordlift-ui.min.css');
 }
 
-add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
+add_action('wp_enqueue_scripts', 'wl_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -213,23 +213,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -238,17 +238,17 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
 	// place on the globe:"The zero/zero point of this system is located in the
 	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -259,12 +259,12 @@ 
  *
  * @return string A datetime.
  */
-function wl_get_post_modified_time( $post ) {
+function wl_get_post_modified_time($post) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+	$date_modified = get_post_modified_time('c', true, $post);
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
+	if ('-' === substr($date_modified, 0, 1)) {
+		return get_the_time('c', $post);
 	}
 
 	return $date_modified;
@@ -277,24 +277,24 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	// If there is a featured image it has the priority.
-	$featured_image_id = get_post_thumbnail_id( $post_id );
-	if ( is_numeric( $featured_image_id ) ) {
-		$image_url = wp_get_attachment_url( $featured_image_id );
+	$featured_image_id = get_post_thumbnail_id($post_id);
+	if (is_numeric($featured_image_id)) {
+		$image_url = wp_get_attachment_url($featured_image_id);
 
-		return array( $image_url );
+		return array($image_url);
 	}
 
-	$images = get_children( array(
+	$images = get_children(array(
 		'post_parent'    => $post_id,
 		'post_type'      => 'attachment',
 		'post_mime_type' => 'image',
-	) );
+	));
 
 	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
+	if (empty($images)) {
 		return array();
 	}
 
@@ -302,11 +302,11 @@ 
 	$image_urls = array();
 
 	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
+	foreach ($images as $attachment_id => $attachment) {
+		$image_url = wp_get_attachment_url($attachment_id);
 		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
+		if ( ! in_array($image_url, $image_urls)) {
+			array_push($image_urls, $image_url);
 		}
 	}
 
@@ -323,18 +323,18 @@ 
  *
  * @return string The SPARQL fragment.
  */
-function wl_get_sparql_images( $uri, $post_id ) {
+function wl_get_sparql_images($uri, $post_id) {
 
 	$sparql = '';
 
 	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+	$uri_e = esc_html($uri);
 
 	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
-		$sparql        .= " <$uri_e> schema:image <$image_url_esc> . \n";
+	$image_urls = wl_get_image_urls($post_id);
+	foreach ($image_urls as $image_url) {
+		$image_url_esc = wl_sparql_escape_uri($image_url);
+		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
 	}
 
 	return $sparql;
@@ -348,21 +348,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -376,10 +376,10 @@ 
  * @param int    $post_id    The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 
@@ -395,10 +395,10 @@ 
  *
  * @param bool $hard True if the rewrite involves configuration updates in Apache/IIS.
  */
-function wl_flush_rewrite_rules_hard( $hard ) {
+function wl_flush_rewrite_rules_hard($hard) {
 
 	// If WL is not yet configured, we cannot perform any update, so we exit.
-	if ( '' === wl_configuration_get_key() ) {
+	if ('' === wl_configuration_get_key()) {
 		return;
 	}
 
@@ -407,13 +407,13 @@ 
 	$limit  = 100;
 
 	// Get more posts if the number of returned posts matches the limit.
-	while ( $limit === ( $posts = get_posts( array(
+	while ($limit === ($posts = get_posts(array(
 			'offset'      => $offset,
 			'numberposts' => $limit,
 			'orderby'     => 'ID',
 			'post_type'   => 'any',
 			'post_status' => 'publish',
-		) ) ) ) {
+		)))) {
 
 		// Holds the delete part of the query.
 		$delete_query = rl_sparql_prefixes();
@@ -422,16 +422,16 @@ 
 		$insert_query = '';
 
 		// Cycle in each post to build the query.
-		foreach ( $posts as $post ) {
+		foreach ($posts as $post) {
 
 			// Ignore revisions.
-			if ( wp_is_post_revision( $post->ID ) ) {
+			if (wp_is_post_revision($post->ID)) {
 				continue;
 			}
 
 			// Get the entity URI.
-			$s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
-			                                                                 ->get_uri( $post->ID ) );
+			$s = Wordlift_Sparql_Service::escape_uri(Wordlift_Entity_Service::get_instance()
+			                                                                 ->get_uri($post->ID));
 
 			// Get the post URL.
 			// $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
@@ -440,13 +440,13 @@ 
 			$delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
 
 			$insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
-			                                                     ->get_insert_query( $s, $post->ID );
+			                                                     ->get_insert_query($s, $post->ID);
 
 		}
 
 
 		// Execute the query.
-		rl_execute_sparql_update_query( $delete_query . $insert_query );
+		rl_execute_sparql_update_query($delete_query.$insert_query);
 
 		// Advance to the next posts.
 		$offset += $limit;
@@ -462,7 +462,7 @@ 
 
 }
 
-add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
+add_filter('flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1);
 
 /**
  * Sanitizes an URI path by replacing the non allowed characters with an underscore.
@@ -475,9 +475,9 @@ 
  *
  * @return string The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -487,10 +487,10 @@ 
  *
  * @return array Array containing $value (if $value was not an array)
  */
-function wl_force_to_array( $value ) {
+function wl_force_to_array($value) {
 
-	if ( ! is_array( $value ) ) {
-		return array( $value );
+	if ( ! is_array($value)) {
+		return array($value);
 	}
 
 	return $value;
@@ -502,28 +502,28 @@ 
 function wl_shutdown() {
 
 	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
 
 	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+	if (WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists($filename)) {
 
 		// The request ID.
-		$args = array( WL_REQUEST_ID );
+		$args = array(WL_REQUEST_ID);
 
 		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+		wp_schedule_single_event(time(), 'wl_execute_saved_sparql_update_query', $args);
 
 		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+		$timestamp = wp_next_scheduled('wl_execute_saved_sparql_update_query', $args);
 
 		// Spawn the cron.
 		spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+		wl_write_log("wl_shutdown [ request id :: ".WL_REQUEST_ID." ][ timestamp :: $timestamp ]");
 	}
 }
 
-add_action( 'shutdown', 'wl_shutdown' );
+add_action('shutdown', 'wl_shutdown');
 
 /**
  * Replaces the *itemid* attributes URIs with the WordLift URIs.
@@ -532,113 +532,113 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
-require_once( 'wordlift_entity_type_taxonomy.php' );
+require_once('wordlift_entity_type.php');
+require_once('wordlift_entity_type_taxonomy.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/redirector/wordlift_redirector.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 // Provide syncing features.
-require_once( 'admin/wordlift_admin_sync.php' );
+require_once('admin/wordlift_admin_sync.php');
 //}
 
 // load languages.
 // TODO: the following call gives for granted that the plugin is in the wordlift directory,
 //       we're currently doing this because wordlift is symbolic linked.
-load_plugin_textdomain( 'wordlift', false, '/wordlift/languages' );
+load_plugin_textdomain('wordlift', false, '/wordlift/languages');
 
 
 /**
@@ -646,7 +646,7 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 }
 
@@ -655,18 +655,18 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +149 added lines, -149 removed lines

@@ -5,71 +5,71 @@ 
  */
 function wl_shortcode_faceted_search( $atts ) {
 
-	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
-		'show_facets'    => true,
-		'with_carousel'  => true,
-		'squared_thumbs' => false,
-
-	), $atts );
-
-	foreach (
-		array(
-			'show_facets',
-			'with_carousel',
-			'squared_thumbs',
-		) as $att
-	) {
-
-		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-		);
-	}
-
-
-	// If the current post is not an entity and has no related entities
-	// than the shortcode cannot be rendered
-	// TODO Add an alert visibile only for connected admin users
-	$current_post = get_post();
-
-	$entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		$current_post->ID :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	if ( 0 === count( $entity_ids ) ) {
-		return '';
-	}
-
-	$div_id = 'wordlift-faceted-entity-search-widget';
-
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
-
-	wp_localize_script(
-		'wordlift-faceted-search',
-		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
-			'action'               => 'wl_faceted_search',
-			'post_id'              => $current_post->ID,
-			'entity_ids'           => $entity_ids,
-			'div_id'               => $div_id,
-			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
-			'attrs'                => $shortcode_atts,
-			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
-			),
-		)
-	);
-
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+    // Extract attributes and set default values.
+    $shortcode_atts = shortcode_atts( array(
+        'title'          => __( 'Related articles', 'wordlift' ),
+        'show_facets'    => true,
+        'with_carousel'  => true,
+        'squared_thumbs' => false,
+
+    ), $atts );
+
+    foreach (
+        array(
+            'show_facets',
+            'with_carousel',
+            'squared_thumbs',
+        ) as $att
+    ) {
+
+        // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
+        $shortcode_atts[ $att ] = filter_var(
+            $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+        );
+    }
+
+
+    // If the current post is not an entity and has no related entities
+    // than the shortcode cannot be rendered
+    // TODO Add an alert visibile only for connected admin users
+    $current_post = get_post();
+
+    $entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
+        $current_post->ID :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    if ( 0 === count( $entity_ids ) ) {
+        return '';
+    }
+
+    $div_id = 'wordlift-faceted-entity-search-widget';
+
+    wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+
+    wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+
+    wp_localize_script(
+        'wordlift-faceted-search',
+        'wl_faceted_search_params', array(
+            'ajax_url'             => admin_url( 'admin-ajax.php' ),
+            'action'               => 'wl_faceted_search',
+            'post_id'              => $current_post->ID,
+            'entity_ids'           => $entity_ids,
+            'div_id'               => $div_id,
+            'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
+            'attrs'                => $shortcode_atts,
+            'l10n'                 => array(
+                'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
+                'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
+                'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
+                'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+            ),
+        )
+    );
+
+    return '<div id="' . $div_id . '" style="width:100%"></div>';
 }
 
 add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
@@ -80,125 +80,125 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_die( 'No post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+    // Extract filtering conditions
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
 
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
 
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// If the current post is an entity, 
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used. 
-	$entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+    // If the current post is an entity, 
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used. 
+    $entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
+        array( $current_post->ID ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
 
-	// If there are no entities we cannot render the widget
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+    // If there are no entities we cannot render the widget
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
 
-		return;
-	}
+        return;
+    }
 
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null;
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null;
 
-	// Set up data structures            
-	$referencing_posts = wl_core_get_posts( array(
-		'get'            => 'posts',
-		'post__not_in'   => array( $current_post_id ),
-		'related_to__in' => $entity_ids,
-		'post_type'      => 'post',
-		'as'             => 'subject',
-		'post_status'    => 'publish',
-	) );
+    // Set up data structures            
+    $referencing_posts = wl_core_get_posts( array(
+        'get'            => 'posts',
+        'post__not_in'   => array( $current_post_id ),
+        'related_to__in' => $entity_ids,
+        'post_type'      => 'post',
+        'as'             => 'subject',
+        'post_status'    => 'publish',
+    ) );
 
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
 
-	if ( 'posts' === $required_type ) {
+    if ( 'posts' === $required_type ) {
 
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			wl_core_get_posts( array(
-				'get'            => 'posts',
-				'post__in'       => $referencing_post_ids,
-				'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-				'post_type'      => 'post',
-				'as'             => 'subject',
-			) );
+        $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+            $referencing_posts :
+            wl_core_get_posts( array(
+                'get'            => 'posts',
+                'post__in'       => $referencing_post_ids,
+                'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+                'post_type'      => 'post',
+                'as'             => 'subject',
+            ) );
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
+        if ( $filtered_posts ) {
+            foreach ( $filtered_posts as $post_obj ) {
 
-				$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-				$post_obj->thumbnail = ( $thumbnail ) ?
-					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+                $thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
+                $post_obj->thumbnail = ( $thumbnail ) ?
+                    $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+                $post_obj->permalink = get_post_permalink( $post_obj->ID );
 
-				$results[] = $post_obj;
-			}
-		}
-	} else {
+                $results[] = $post_obj;
+            }
+        }
+    } else {
 
-		global $wpdb;
+        global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
 
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
 
-		$subject_ids = implode( ',', $referencing_post_ids );
+        $subject_ids = implode( ',', $referencing_post_ids );
 
-		$query = <<<EOF
+        $query = <<<EOF
             SELECT object_id as ID, count( object_id ) as counter 
             FROM $table_name 
             WHERE subject_id IN ($subject_ids) and object_id != ($current_post_id)
             GROUP BY object_id;
 EOF;
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-		$entities = $wpdb->get_results( $query, OBJECT );
+        $entities = $wpdb->get_results( $query, OBJECT );
 
-		wl_write_log( "Entities found " . count( $entities ) );
+        wl_write_log( "Entities found " . count( $entities ) );
 
-		foreach ( $entities as $obj ) {
+        foreach ( $entities as $obj ) {
 
-			$entity = get_post( $obj->ID );
-			// Ensure only valid and published entities are returned
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+            $entity = get_post( $obj->ID );
+            // Ensure only valid and published entities are returned
+            if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-				$serialized_entity              = wl_serialize_entity( $entity );
-				$serialized_entity['counter']   = $obj->counter;
-				$serialized_entity['createdAt'] = $entity->post_date;
+                $serialized_entity              = wl_serialize_entity( $entity );
+                $serialized_entity['counter']   = $obj->counter;
+                $serialized_entity['createdAt'] = $entity->post_date;
 
-				$results[] = $serialized_entity;
-			}
-		}
+                $results[] = $serialized_entity;
+            }
+        }
 
-	}
+    }
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 

Spacing +61 added lines, -64 removed lines

@@ -3,16 +3,16 @@ 
 /**
  * Function in charge of diplaying the [wl-faceted-search]
  */
-function wl_shortcode_faceted_search( $atts ) {
+function wl_shortcode_faceted_search($atts) {
 
 	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
+	$shortcode_atts = shortcode_atts(array(
+		'title'          => __('Related articles', 'wordlift'),
 		'show_facets'    => true,
 		'with_carousel'  => true,
 		'squared_thumbs' => false,
 
-	), $atts );
+	), $atts);
 
 	foreach (
 		array(
@@ -23,8 +23,8 @@ 
 	) {
 
 		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+		$shortcode_atts[$att] = filter_var(
+			$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 		);
 	}
 
@@ -34,26 +34,25 @@ 
 	// TODO Add an alert visibile only for connected admin users
 	$current_post = get_post();
 
-	$entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		$current_post->ID :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids = (Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type) ?
+		$current_post->ID : wl_core_get_related_entity_ids($current_post->ID);
 
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		return '';
 	}
 
 	$div_id = 'wordlift-faceted-entity-search-widget';
 
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+	wp_enqueue_style('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-faceted-entity-search-widget.min.css');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
 
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+	wp_enqueue_script('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-faceted-entity-search-widget.min.js');
 
 	wp_localize_script(
 		'wordlift-faceted-search',
 		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
+			'ajax_url'             => admin_url('admin-ajax.php'),
 			'action'               => 'wl_faceted_search',
 			'post_id'              => $current_post->ID,
 			'entity_ids'           => $entity_ids,
@@ -61,42 +60,42 @@ 
 			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
 			'attrs'                => $shortcode_atts,
 			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+				'what'  => _x('What', 'Faceted Search Widget', 'wordlift'),
+				'who'   => _x('Who', 'Faceted Search Widget', 'wordlift'),
+				'where' => _x('Where', 'Faceted Search Widget', 'wordlift'),
+				'when'  => _x('When', 'Faceted Search Widget', 'wordlift'),
 			),
 		)
 	);
 
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+	return '<div id="'.$div_id.'" style="width:100%"></div>';
 }
 
-add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
+add_shortcode('wl_faceted_search', 'wl_shortcode_faceted_search');
 
 
 /*
  * Ajax call for the faceted search widget
  */
-function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_ajax($http_raw_data = null) {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents("php://input") : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -104,57 +103,55 @@ 
 	// If the current post is an entity, 
 	// the current post is used as main entity.
 	// Otherwise, current post related entities are used. 
-	$entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids = (Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null;
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null;
 
 	// Set up data structures            
-	$referencing_posts = wl_core_get_posts( array(
+	$referencing_posts = wl_core_get_posts(array(
 		'get'            => 'posts',
-		'post__not_in'   => array( $current_post_id ),
+		'post__not_in'   => array($current_post_id),
 		'related_to__in' => $entity_ids,
 		'post_type'      => 'post',
 		'as'             => 'subject',
 		'post_status'    => 'publish',
-	) );
+	));
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			wl_core_get_posts( array(
+		$filtered_posts = (empty($filtering_entity_uris)) ?
+			$referencing_posts : wl_core_get_posts(array(
 				'get'            => 'posts',
 				'post__in'       => $referencing_post_ids,
-				'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+				'related_to__in' => wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 				'post_type'      => 'post',
 				'as'             => 'subject',
-			) );
+			));
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
+		if ($filtered_posts) {
+			foreach ($filtered_posts as $post_obj) {
 
-				$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-				$post_obj->thumbnail = ( $thumbnail ) ?
+				$thumbnail           = wp_get_attachment_url(get_post_thumbnail_id($post_obj->ID, 'thumbnail'));
+				$post_obj->thumbnail = ($thumbnail) ?
 					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[] = $post_obj;
 			}
@@ -163,12 +160,12 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name
 		$table_name = wl_core_get_relation_instances_table_name();
 
-		$subject_ids = implode( ',', $referencing_post_ids );
+		$subject_ids = implode(',', $referencing_post_ids);
 
 		$query = <<<EOF
             SELECT object_id as ID, count( object_id ) as counter 
@@ -176,19 +173,19 @@ 
             WHERE subject_id IN ($subject_ids) and object_id != ($current_post_id)
             GROUP BY object_id;
 EOF;
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-		$entities = $wpdb->get_results( $query, OBJECT );
+		$entities = $wpdb->get_results($query, OBJECT);
 
-		wl_write_log( "Entities found " . count( $entities ) );
+		wl_write_log("Entities found ".count($entities));
 
-		foreach ( $entities as $obj ) {
+		foreach ($entities as $obj) {
 
-			$entity = get_post( $obj->ID );
+			$entity = get_post($obj->ID);
 			// Ensure only valid and published entities are returned
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+			if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-				$serialized_entity              = wl_serialize_entity( $entity );
+				$serialized_entity              = wl_serialize_entity($entity);
 				$serialized_entity['counter']   = $obj->counter;
 				$serialized_entity['createdAt'] = $entity->post_date;
 
@@ -198,10 +195,10 @@ 
 
 	}
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
-add_action( 'wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
+add_action('wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
+add_action('wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
 

src/admin/class-wordlift-admin.php

Indentation +131 added lines, -131 removed lines

@@ -22,136 +22,136 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @param   string                           $plugin_name           The name of this plugin.
-	 * @param   string                           $version               The version of this plugin.
-	 * @param    \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param    \Wordlift_Notice_Service        $notice_service        The notice service.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			if ( empty( $key ) ) {
-				$error = __( 'WordLift\'s key is unset: WordLift requires a key.', 'wordlift' );
-			} else {
-				$error = __( 'WordLift\'s dataset URI is unset: please retry WordLift\'s configuration.', 'wordlift' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'        => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'          => 'entity_by_title',
-			'datasetUri'      => $configuration_service->get_dataset_uri(),
-			'language'        => $configuration_service->get_language_code(),
-			'link_by_default' => $configuration_service->is_link_by_default(),
-			'l10n'            => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-			),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && Wordlift_Entity_Service::TYPE_NAME == $entity_being_edited->post_type && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since    1.0.0
+     *
+     * @param   string                           $plugin_name           The name of this plugin.
+     * @param   string                           $version               The version of this plugin.
+     * @param    \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param    \Wordlift_Notice_Service        $notice_service        The notice service.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            if ( empty( $key ) ) {
+                $error = __( 'WordLift\'s key is unset: WordLift requires a key.', 'wordlift' );
+            } else {
+                $error = __( 'WordLift\'s dataset URI is unset: please retry WordLift\'s configuration.', 'wordlift' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'        => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'          => 'entity_by_title',
+            'datasetUri'      => $configuration_service->get_dataset_uri(),
+            'language'        => $configuration_service->get_language_code(),
+            'link_by_default' => $configuration_service->is_link_by_default(),
+            'l10n'            => array(
+                'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+            ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && Wordlift_Entity_Service::TYPE_NAME == $entity_being_edited->post_type && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param    \Wordlift_Configuration_Service $configuration_service The configuration service.
 	 * @param    \Wordlift_Notice_Service        $notice_service        The notice service.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -58,13 +58,13 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
-			if ( empty( $key ) ) {
-				$error = __( 'WordLift\'s key is unset: WordLift requires a key.', 'wordlift' );
+		if (empty($dataset_uri)) {
+			if (empty($key)) {
+				$error = __('WordLift\'s key is unset: WordLift requires a key.', 'wordlift');
 			} else {
-				$error = __( 'WordLift\'s dataset URI is unset: please retry WordLift\'s configuration.', 'wordlift' );
+				$error = __('WordLift\'s dataset URI is unset: please retry WordLift\'s configuration.', 'wordlift');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 	}
@@ -88,7 +88,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -114,43 +114,43 @@ 
 		$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/wordlift-admin.bundle.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'        => admin_url( 'admin-ajax.php' ),
+			'ajax_url'        => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'          => 'entity_by_title',
 			'datasetUri'      => $configuration_service->get_dataset_uri(),
 			'language'        => $configuration_service->get_language_code(),
 			'link_by_default' => $configuration_service->is_link_by_default(),
 			'l10n'            => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+				'You already published an entity with the same name' => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                              => array('text' => __('Choose Logo', 'wordlift')),
 			),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && Wordlift_Entity_Service::TYPE_NAME == $entity_being_edited->post_type && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && Wordlift_Entity_Service::TYPE_NAME == $entity_being_edited->post_type && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

src/admin/class-wordlift-admin-input-radio-element.php

Indentation +38 added lines, -38 removed lines

@@ -18,49 +18,49 @@ 
  */
 class Wordlift_Admin_Radio_Input_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * Output the HTML for an input box type settings_page.
-	 *
-	 * @since      3.13.0
-	 *
-	 * @param array $args        {
-	 *                           An array of arguments.
-	 *
-	 * @type string $name        The name attribute of the input element. Mandatory.
-	 * @type string $id          The id attribute of the input element. Optional,
-	 *                           randomly generated one is used if not supplied.
-	 * @type string $value       The value of the input element. Optional, defaults
-	 *                           to empty string.
-	 * @type string $css_class   The class attribute for the input element. If empty
-	 *                           string no class attribute will be added. Optional,
-	 *                           defaults to empty string.
-	 * @type string $description The description text to be displayed below the element.
-	 *                           Can include some HTML element. If empty string no
-	 *                           description will be displayed. Optional, defaults to
-	 *                           empty string.
-	 * }
-	 * @return $this|Wordlift_Admin_Element
-	 */
-	public function render( $args ) {
+    /**
+     * Output the HTML for an input box type settings_page.
+     *
+     * @since      3.13.0
+     *
+     * @param array $args        {
+     *                           An array of arguments.
+     *
+     * @type string $name        The name attribute of the input element. Mandatory.
+     * @type string $id          The id attribute of the input element. Optional,
+     *                           randomly generated one is used if not supplied.
+     * @type string $value       The value of the input element. Optional, defaults
+     *                           to empty string.
+     * @type string $css_class   The class attribute for the input element. If empty
+     *                           string no class attribute will be added. Optional,
+     *                           defaults to empty string.
+     * @type string $description The description text to be displayed below the element.
+     *                           Can include some HTML element. If empty string no
+     *                           description will be displayed. Optional, defaults to
+     *                           empty string.
+     * }
+     * @return $this|Wordlift_Admin_Element
+     */
+    public function render( $args ) {
 
-		/*
+        /*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'value'       => '',
-			'css_class'   => '',
-			'description' => '',
-		) );
+        $params = wp_parse_args( $args, array(
+            'id'          => uniqid( 'wl-input-' ),
+            'value'       => '',
+            'css_class'   => '',
+            'description' => '',
+        ) );
 
-		// Set the readonly and class attributes and the description.
-		$value       = $params['value'];
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        // Set the readonly and class attributes and the description.
+        $value       = $params['value'];
+        $css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
+        $description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		?>
+        ?>
 
 		<input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
 		       name="<?php echo esc_attr( $params['name'] ); ?>"
@@ -74,7 +74,7 @@ 
 		<?php echo $description; ?>
 
 		<?php
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -41,35 +41,35 @@
 	 * }
 	 * @return $this|Wordlift_Admin_Element
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		/*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'          => uniqid('wl-input-'),
 			'value'       => '',
 			'css_class'   => '',
 			'description' => '',
-		) );
+		));
 
 		// Set the readonly and class attributes and the description.
 		$value       = $params['value'];
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$css_class   = ! empty($params['css_class']) ? ' class="'.esc_attr($params['css_class']).'"' : '';
+		$description = ! empty($params['description']) ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		?>
 
-		<input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
-		       name="<?php echo esc_attr( $params['name'] ); ?>"
+		<input type="radio" id="<?php echo esc_attr($params['id']); ?>"
+		       name="<?php echo esc_attr($params['name']); ?>"
 		       value="yes" <?php echo $css_class; ?>
-			<?php checked( $value, 'yes' ); ?> /> Yes
-		<input type="radio" id="<?php echo esc_attr( $params['id'] ); ?>"
-		       name="<?php echo esc_attr( $params['name'] ); ?>"
+			<?php checked($value, 'yes'); ?> /> Yes
+		<input type="radio" id="<?php echo esc_attr($params['id']); ?>"
+		       name="<?php echo esc_attr($params['name']); ?>"
 		       value="no" <?php echo $css_class; ?>
-			<?php checked( $value, 'no' ); ?>/> No
+			<?php checked($value, 'no'); ?>/> No
 
 		<?php echo $description; ?>
 

src/admin/class-wordlift-admin-settings-page.php

Indentation +295 added lines, -295 removed lines

@@ -18,300 +18,300 @@
  */
 class Wordlift_Admin_Settings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	private $input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	private $radio_input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	private $publisher_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service         $configuration_service
-	 * @param \Wordlift_Entity_Service                $entity_service
-	 * @param \Wordlift_Admin_Input_Element           $input_element
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element
-	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
-	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
-	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_service        = $entity_service;
-
-		// Set a reference to the UI elements.
-		$this->input_element           = $input_element;
-		$this->radio_input_element     = $radio_input_element;
-		$this->language_select_element = $language_select_element;
-		$this->publisher_element       = $publisher_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
-
-		return 'WorldLift Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
-
-		return 'Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
-
-		return 'wl_configuration_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
-
-		return 'wordlift-admin-settings-page.php';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the media scripts to be used for the publisher's logo selection.
-		wp_enqueue_media();
-
-		// JavaScript required for the settings page.
-		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-settings-page.bundle.js', array( 'wp-util' ) );
-
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_init() {
-
-		// Register WordLift's general settings, providing our own sanitize callback
-		// which will also check whether the user filled the WL Publisher form.
-		register_setting(
-			'wl_general_settings',
-			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
-		);
-
-		// Add the general settings section.
-		add_settings_section(
-			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
-			'wl_general_settings'          // Page on which to add this section of options.
-		);
-
-		$key_args = array(
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
-			'value'       => $this->configuration_service->get_key(),
-			'description' => _x( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
-		);
-
-		// Set the class for the key field based on the validity of the key.
-		// Class should be "untouched" for an empty (virgin) value, "valid"
-		// if the key is valid, or "invalid" otherwise.
-		$validation_service = new Wordlift_Key_Validation_Service();
-
-		if ( empty( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'valid';
-		} else {
-			$key_args['css_class'] = 'invalid';
-		}
-
-		// Add the `key` field.
-		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
-			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
-			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
-		);
-
-		// Entity Base Path input.
-		$entity_base_path_args = array(
-			// The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
-			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
-		);
-
-		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
-
-		// Add the `wl_entity_base_path` field.
-		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
-			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
-			$entity_base_path_args
-		);
-
-		// Add the `language_name` field.
-		add_settings_field(
-			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				// The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
-				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
-			)
-		);
-
-		// Add the `publisher` field.
-		add_settings_field(
-			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
-			)
-		);
-
-		// Add the `link by default` field.
-		add_settings_field(
-			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
-				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 */
-	function sanitize_callback( $input ) {
-
-		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
-			$name         = $_POST['wl_publisher']['name'];
-			$type         = $_POST['wl_publisher']['type'];
-			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
-
-			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
-
-			// Create an entity for the publisher and assign it to the input
-			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
-		}
-
-		return $input;
-	}
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    private $input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    private $radio_input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    private $publisher_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service         $configuration_service
+     * @param \Wordlift_Entity_Service                $entity_service
+     * @param \Wordlift_Admin_Input_Element           $input_element
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element
+     * @param \Wordlift_Admin_Publisher_Element       $publisher_element
+     * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
+     */
+    function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_service        = $entity_service;
+
+        // Set a reference to the UI elements.
+        $this->input_element           = $input_element;
+        $this->radio_input_element     = $radio_input_element;
+        $this->language_select_element = $language_select_element;
+        $this->publisher_element       = $publisher_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
+
+        return 'WorldLift Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
+
+        return 'Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
+
+        return 'wl_configuration_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
+
+        return 'wordlift-admin-settings-page.php';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the media scripts to be used for the publisher's logo selection.
+        wp_enqueue_media();
+
+        // JavaScript required for the settings page.
+        // @todo: try to move to the `wordlift-admin.bundle.js`.
+        wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-settings-page.bundle.js', array( 'wp-util' ) );
+
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.11.0
+     */
+    function admin_init() {
+
+        // Register WordLift's general settings, providing our own sanitize callback
+        // which will also check whether the user filled the WL Publisher form.
+        register_setting(
+            'wl_general_settings',
+            'wl_general_settings',
+            array( $this, 'sanitize_callback', )
+        );
+
+        // Add the general settings section.
+        add_settings_section(
+            'wl_general_settings_section', // ID used to identify this section and with which to register options.
+            '',                            // Section header.
+            '',                            // Callback used to render the description of the section.
+            'wl_general_settings'          // Page on which to add this section of options.
+        );
+
+        $key_args = array(
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+            'value'       => $this->configuration_service->get_key(),
+            'description' => _x( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+        );
+
+        // Set the class for the key field based on the validity of the key.
+        // Class should be "untouched" for an empty (virgin) value, "valid"
+        // if the key is valid, or "invalid" otherwise.
+        $validation_service = new Wordlift_Key_Validation_Service();
+
+        if ( empty( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'untouched';
+        } elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'valid';
+        } else {
+            $key_args['css_class'] = 'invalid';
+        }
+
+        // Add the `key` field.
+        add_settings_field(
+            'wl-key',                                       // Element id used to identify the field throughout the theme.
+            _x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+            // The name of the function responsible for rendering the option interface.
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                          // The page on which this option will be displayed.
+            'wl_general_settings_section',                  // The name of the section to which this field belongs.
+            $key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
+        );
+
+        // Entity Base Path input.
+        $entity_base_path_args = array(
+            // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-entity-base-path',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+            'value'       => $this->configuration_service->get_entity_base_path(),
+            'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+        );
+
+        $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
+
+        // Add the `wl_entity_base_path` field.
+        add_settings_field(
+            'wl-entity-base-path',                                // ID used to identify the field throughout the theme
+            _x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+            // The name of the function responsible for rendering the option interface
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                                // The page on which this option will be displayed
+            'wl_general_settings_section',                        // The name of the section to which this field belongs
+            $entity_base_path_args
+        );
+
+        // Add the `language_name` field.
+        add_settings_field(
+            'wl-site-language',
+            _x( 'Site Language', 'wordlift' ),
+            array( $this->language_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-site-language',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+                'value'       => $this->configuration_service->get_language_code(),
+                'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+            )
+        );
+
+        // Add the `publisher` field.
+        add_settings_field(
+            'wl-publisher-id',
+            _x( 'Publisher', 'wordlift' ),
+            array( $this->publisher_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'   => 'wl-publisher-id',
+                'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+            )
+        );
+
+        // Add the `link by default` field.
+        add_settings_field(
+            'wl-link-by-default',
+            _x( 'Link by Default', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-link-by-default',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+                'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
+                'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @since 3.11.0
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     */
+    function sanitize_callback( $input ) {
+
+        // Check whether a publisher name has been set.
+        if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+            $name         = $_POST['wl_publisher']['name'];
+            $type         = $_POST['wl_publisher']['type'];
+            $thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
+
+            // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+            $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+
+            // Create an entity for the publisher and assign it to the input
+            // parameter which WordPress automatically saves into the settings.
+            $input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+        }
+
+        return $input;
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -84,7 +84,7 @@ 
 	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
 	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
 	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+	function __construct($configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element) {
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_service        = $entity_service;
@@ -155,7 +155,7 @@ 
 
 		// JavaScript required for the settings page.
 		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-settings-page.bundle.js', array( 'wp-util' ) );
+		wp_enqueue_script('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift-admin-settings-page.bundle.js', array('wp-util'));
 
 	}
 
@@ -173,22 +173,22 @@ 
 		register_setting(
 			'wl_general_settings',
 			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
+			array($this, 'sanitize_callback',)
 		);
 
 		// Add the general settings section.
 		add_settings_section(
 			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
+			'', // Section header.
+			'', // Callback used to render the description of the section.
 			'wl_general_settings'          // Page on which to add this section of options.
 		);
 
 		$key_args = array(
 			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::KEY.']',
 			'value'       => $this->configuration_service->get_key(),
-			'description' => _x( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+			'description' => _x('Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift'),
 		);
 
 		// Set the class for the key field based on the validity of the key.
@@ -196,9 +196,9 @@ 
 		// if the key is valid, or "invalid" otherwise.
 		$validation_service = new Wordlift_Key_Validation_Service();
 
-		if ( empty( $key_args['value'] ) ) {
+		if (empty($key_args['value'])) {
 			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+		} elseif ($validation_service->is_valid($key_args['value'])) {
 			$key_args['css_class'] = 'valid';
 		} else {
 			$key_args['css_class'] = 'invalid';
@@ -206,12 +206,12 @@ 
 
 		// Add the `key` field.
 		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+			'wl-key', // Element id used to identify the field throughout the theme.
+			_x('WordLift Key', 'wordlift'), // The label to the left of the option interface element.
 			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed.
+			'wl_general_settings_section', // The name of the section to which this field belongs.
 			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
 		);
 
@@ -219,65 +219,65 @@ 
 		$entity_base_path_args = array(
 			// The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY.']',
 			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+			'description' => sprintf(_x('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift'), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary'),
 		);
 
 		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
 
 		// Add the `wl_entity_base_path` field.
 		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+			'wl-entity-base-path', // ID used to identify the field throughout the theme
+			_x('Entity Base Path', 'wordlift'), // The label to the left of the option interface element
 			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed
+			'wl_general_settings_section', // The name of the section to which this field belongs
 			$entity_base_path_args
 		);
 
 		// Add the `language_name` field.
 		add_settings_field(
 			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
+			_x('Site Language', 'wordlift'),
+			array($this->language_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				// The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LANGUAGE.']',
 				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+				'description' => __('Each WordLift Key can be used only in one language. Pick yours.', 'wordlift'),
 			)
 		);
 
 		// Add the `publisher` field.
 		add_settings_field(
 			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
+			_x('Publisher', 'wordlift'),
+			array($this->publisher_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+				'name' => 'wl_general_settings['.Wordlift_Configuration_Service::PUBLISHER_ID.']',
 			)
 		);
 
 		// Add the `link by default` field.
 		add_settings_field(
 			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			_x('Link by Default', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LINK_BY_DEFAULT.']',
 				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+				'description' => _x('Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift'),
 			)
 		);
 
@@ -295,20 +295,20 @@ 
 	 *
 	 * @return array The sanitized input array.
 	 */
-	function sanitize_callback( $input ) {
+	function sanitize_callback($input) {
 
 		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+		if (isset($_POST['wl_publisher']) && ! empty($_POST['wl_publisher']['name'])) {
 			$name         = $_POST['wl_publisher']['name'];
 			$type         = $_POST['wl_publisher']['type'];
 			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
 
 			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+			$type_uri = sprintf('http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person');
 
 			// Create an entity for the publisher and assign it to the input
 			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+			$input['publisher_id'] = $this->entity_service->create($name, $type_uri, $thumbnail_id, 'publish');
 		}
 
 		return $input;

src/admin/class-wordlift-admin-input-element.php

Indentation +41 added lines, -41 removed lines

@@ -18,52 +18,52 @@ 
  */
 class Wordlift_Admin_Input_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * Output the HTML for an input box type settings_page
-	 *
-	 * @param array $args An array with the following keys:
-	 *                    Parameters controlling the result.
-	 *
-	 * @type string name The name attribute of the input element. Mandatory.
-	 *
-	 * @type string id    The id attribute of the input element. Optional.
-	 * @type string id    The id attribute of the input element.
-	 *                            Optional, randomly generated one is used if not supplied.
-	 * @type string value    The value of the input element.
-	 *                            Optional, defaults to empty string.
-	 * @type bool readonly    Indicates whether the input is read only.
-	 *                            Optional, defaults to read-write
-	 * @type string css_class    The class attribute for the input element.
-	 *                            If empty string no class attribute will be added.
-	 *                            Optional, defaults to empty string.
-	 * @type string description    The descriptio text to be displayed below the element.
-	 *                            Can include some HTML element.
-	 *                            If empty string no description will be displayed.
-	 *                            Optional, defaults to empty string.
-	 *
-	 * @return $this|Wordlift_Admin_Element
-	 */
-	public function render( $args ) {
+    /**
+     * Output the HTML for an input box type settings_page
+     *
+     * @param array $args An array with the following keys:
+     *                    Parameters controlling the result.
+     *
+     * @type string name The name attribute of the input element. Mandatory.
+     *
+     * @type string id    The id attribute of the input element. Optional.
+     * @type string id    The id attribute of the input element.
+     *                            Optional, randomly generated one is used if not supplied.
+     * @type string value    The value of the input element.
+     *                            Optional, defaults to empty string.
+     * @type bool readonly    Indicates whether the input is read only.
+     *                            Optional, defaults to read-write
+     * @type string css_class    The class attribute for the input element.
+     *                            If empty string no class attribute will be added.
+     *                            Optional, defaults to empty string.
+     * @type string description    The descriptio text to be displayed below the element.
+     *                            Can include some HTML element.
+     *                            If empty string no description will be displayed.
+     *                            Optional, defaults to empty string.
+     *
+     * @return $this|Wordlift_Admin_Element
+     */
+    public function render( $args ) {
 
-		/*
+        /*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'value'       => '',
-			'readonly'    => false,
-			'css_class'   => '',
-			'description' => '',
-		) );
+        $params = wp_parse_args( $args, array(
+            'id'          => uniqid( 'wl-input-' ),
+            'value'       => '',
+            'readonly'    => false,
+            'css_class'   => '',
+            'description' => '',
+        ) );
 
-		// Set the readonly and class attributes and the description.
-		$readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        // Set the readonly and class attributes and the description.
+        $readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
+        $css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
+        $description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		?>
+        ?>
 
 		<input type="text"
 		       id="<?php echo esc_attr( $params['id'] ); ?>"
@@ -76,7 +76,7 @@ 
 
 		<?php
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -43,32 +43,32 @@
 	 *
 	 * @return $this|Wordlift_Admin_Element
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		/*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'          => uniqid('wl-input-'),
 			'value'       => '',
 			'readonly'    => false,
 			'css_class'   => '',
 			'description' => '',
-		) );
+		));
 
 		// Set the readonly and class attributes and the description.
 		$readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$css_class   = ! empty($params['css_class']) ? ' class="'.esc_attr($params['css_class']).'"' : '';
+		$description = ! empty($params['description']) ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		?>
 
 		<input type="text"
-		       id="<?php echo esc_attr( $params['id'] ); ?>"
-		       name="<?php echo esc_attr( $params['name'] ); ?>"
-		       value="<?php echo esc_attr( $params['value'] ); ?>"
+		       id="<?php echo esc_attr($params['id']); ?>"
+		       name="<?php echo esc_attr($params['name']); ?>"
+		       value="<?php echo esc_attr($params['value']); ?>"
 			<?php echo $readonly; ?>
 			<?php echo $css_class; ?>
 		/>

src/wordlift_constants.php

Indentation +31 added lines, -31 removed lines

@@ -5,14 +5,14 @@ 
 
 // Define the basic options for HTTP calls to REDLINK.
 define( 'WL_REDLINK_API_HTTP_OPTIONS', serialize( array(
-	'timeout'         => 300,
-	'redirection'     => 5,
-	'httpversion'     => '1.1',
-	'blocking'        => true,
-	'cookies'         => array(),
-	'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
-	'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
-	'decompress'      => false,
+    'timeout'         => 300,
+    'redirection'     => 5,
+    'httpversion'     => '1.1',
+    'blocking'        => true,
+    'cookies'         => array(),
+    'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
+    'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
+    'decompress'      => false,
 ) ) );
 
 // Create a unique ID for this request, useful to hook async HTTP requests.
@@ -43,14 +43,14 @@ 
  */
 function wl_prefixes() {
 
-	$items    = wl_prefixes_list();
-	$prefixes = array();
+    $items    = wl_prefixes_list();
+    $prefixes = array();
 
-	foreach ( $items as $item ) {
-		$prefixes[ $item['prefix'] ] = $item['namespace'];
-	}
+    foreach ( $items as $item ) {
+        $prefixes[ $item['prefix'] ] = $item['namespace'];
+    }
 
-	return $prefixes;
+    return $prefixes;
 
 }
 
@@ -63,22 +63,22 @@ 
  */
 function wl_predicates() {
 
-	return array(
-		'a',
-		'dct:references',
-		'dct:relation',
-		'dct:title',
-		'dct:subject',
-		'owl:sameAs',
-		'rdfs:label',
-		'schema:author',
-		'schema:dateModified',
-		'schema:datePublished',
-		'schema:locationCreated',
-		'schema:description',
-		'schema:image',
-		'schema:interactionCount',
-		'schema:url',
-	);
+    return array(
+        'a',
+        'dct:references',
+        'dct:relation',
+        'dct:title',
+        'dct:subject',
+        'owl:sameAs',
+        'rdfs:label',
+        'schema:author',
+        'schema:dateModified',
+        'schema:datePublished',
+        'schema:locationCreated',
+        'schema:description',
+        'schema:image',
+        'schema:interactionCount',
+        'schema:url',
+    );
 
 }

Spacing +13 added lines, -13 removed lines

@@ -4,36 +4,36 @@ 
  */
 
 // Define the basic options for HTTP calls to REDLINK.
-define( 'WL_REDLINK_API_HTTP_OPTIONS', serialize( array(
+define('WL_REDLINK_API_HTTP_OPTIONS', serialize(array(
 	'timeout'         => 300,
 	'redirection'     => 5,
 	'httpversion'     => '1.1',
 	'blocking'        => true,
 	'cookies'         => array(),
-	'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
-	'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
+	'sslverify'       => ('false' === getenv('WL_SSL_VERIFY_ENABLED')) ? false : true,
+	'sslcertificates' => dirname(__FILE__).'/ssl/ca-bundle.crt',
 	'decompress'      => false,
-) ) );
+)));
 
 // Create a unique ID for this request, useful to hook async HTTP requests.
-define( 'WL_REQUEST_ID', uniqid() );
+define('WL_REQUEST_ID', uniqid());
 
 // Set the temporary files folder.
-defined( 'WL_TEMP_DIR' ) || define( 'WL_TEMP_DIR', get_temp_dir() );
+defined('WL_TEMP_DIR') || define('WL_TEMP_DIR', get_temp_dir());
 
-define( 'WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv( 'WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING' ) );
+define('WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv('WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING'));
 
 // Define the meta name used to store the entity URL.
-define( 'WL_ENTITY_URL_META_NAME', 'entity_url' );
+define('WL_ENTITY_URL_META_NAME', 'entity_url');
 
 // Max number of recursions when printing microdata
-define( 'WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3 );
+define('WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3);
 
 // 3.13.0, we use by default WLS 1.11 which provides us with the new, faster
 // chunked analysis.
-define( 'WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined( 'WORDLIFT_API_URL' ) ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/1.11/' );
+define('WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined('WORDLIFT_API_URL') ? WORDLIFT_API_URL.'/' : 'https://api.wordlift.it/1.11/');
 
-define( 'WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=' );
+define('WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=');
 
 
 /**
@@ -46,8 +46,8 @@ 
 	$items    = wl_prefixes_list();
 	$prefixes = array();
 
-	foreach ( $items as $item ) {
-		$prefixes[ $item['prefix'] ] = $item['namespace'];
+	foreach ($items as $item) {
+		$prefixes[$item['prefix']] = $item['namespace'];
 	}
 
 	return $prefixes;