insideout10 / wordlift-plugin

src/modules/configuration/wordlift_configuration.php

Indentation +235 added lines, -235 removed lines

@@ -18,15 +18,15 @@ 
  */
 function wl_configuration_admin_menu( $parent_slug, $capability ) {
 
-	// see http://codex.wordpress.org/Function_Reference/add_submenu_page
-	add_submenu_page(
-		$parent_slug, // The parent menu slug, provided by the calling hook.
-		__( 'Settings', 'wordlift' ),  // page title
-		__( 'Settings', 'wordlift' ),  // menu title
-		$capability,                   // The required capability, provided by the calling hook.
-		'wl_configuration_admin_menu',      // the menu slug
-		'wl_configuration_admin_menu_callback' // the menu callback for displaying the page content
-	);
+    // see http://codex.wordpress.org/Function_Reference/add_submenu_page
+    add_submenu_page(
+        $parent_slug, // The parent menu slug, provided by the calling hook.
+        __( 'Settings', 'wordlift' ),  // page title
+        __( 'Settings', 'wordlift' ),  // menu title
+        $capability,                   // The required capability, provided by the calling hook.
+        'wl_configuration_admin_menu',      // the menu slug
+        'wl_configuration_admin_menu_callback' // the menu callback for displaying the page content
+    );
 
 }
 
@@ -41,14 +41,14 @@ 
  */
 function wl_configuration_admin_menu_callback( $display_page_title = true ) {
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
-	}
+    if ( ! current_user_can( 'manage_options' ) ) {
+        wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
+    }
 
-	// Ony show advanced settings tab if the relative constant exists and is set to true.
-	$can_show_advanced_settings = defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION;
+    // Ony show advanced settings tab if the relative constant exists and is set to true.
+    $can_show_advanced_settings = defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION;
 
-	?>
+    ?>
 
 	<div class="wrap">
 
@@ -60,8 +60,8 @@ 
 		<?php settings_errors(); ?>
 
 		<?php
-		$active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general_settings';
-		?>
+        $active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general_settings';
+        ?>
 
 		<h2 class="nav-tab-wrapper">
 			<a href="?page=<?php echo( $_GET['page'] ); ?>&tab=general_settings"
@@ -75,17 +75,17 @@ 
 
 		<form action="options.php" method="post">
 			<?php
-			if ( 'general_settings' === $active_tab ) {
-				settings_fields( 'wl_general_settings' );
-				do_settings_sections( 'wl_general_settings' );
+            if ( 'general_settings' === $active_tab ) {
+                settings_fields( 'wl_general_settings' );
+                do_settings_sections( 'wl_general_settings' );
 
-			} else if ( $can_show_advanced_settings && 'advanced_settings' === $active_tab ) {
-				settings_fields( 'wl_advanced_settings' );
-				do_settings_sections( 'wl_advanced_settings' );
-			}
+            } else if ( $can_show_advanced_settings && 'advanced_settings' === $active_tab ) {
+                settings_fields( 'wl_advanced_settings' );
+                do_settings_sections( 'wl_advanced_settings' );
+            }
 
-			submit_button();
-			?>
+            submit_button();
+            ?>
 		</form>
 
 		<div style="margin-top: 100px; font-size: 10px;">The entities blocks are designed by Lukasz M. Pogoda from the
@@ -108,148 +108,148 @@ 
  */
 function wl_configuration_settings() {
 
-	register_setting(
-		'wl_general_settings',
-		'wl_general_settings',
-		'wl_configuration_sanitize_settings'
-	);
-
-	add_settings_section(
-		'wl_general_settings_section',          // ID used to identify this section and with which to register options
-		'General Settings',                              // Title to be displayed on the administration page
-		'wl_configuration_general_settings_section_callback', // Callback used to render the description of the section
-		'wl_general_settings'              // Page on which to add this section of options
-	);
-
-	add_settings_field(
-		WL_CONFIG_WORDLIFT_KEY,             // ID used to identify the field throughout the theme
-		__( 'WordLift Key', 'wordlift' ),   // The label to the left of the option interface element
-		'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-		'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(                              // The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[key]',
-			'value'       => wl_configuration_get_key(),
-			'description' => __( 'Insert the WordLift Key', 'wordlift' )
-		)
-	);
-
-	add_settings_field(
-		WL_CONFIG_SITE_LANGUAGE_NAME,
-		__( 'Site Language', 'wordlift' ),
-		'wl_configuration_select',
-		'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[site_language]',
-			'value'       => wl_configuration_get_site_language(),
-			'description' => __( 'The site language', 'wordlift' ),
-			'options'     => wl_configuration_get_languages()
-		)
-	);
-
-
-	if ( defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION ) {
-
-		register_setting(
-			'wl_advanced_settings',
-			'wl_advanced_settings',
-			'wl_configuration_sanitize_settings'
-		);
-
-		add_settings_section(
-			'wl_advanced_settings_section',          // ID used to identify this section and with which to register options
-			'Advanced',                              // Title to be displayed on the administration page
-			'wl_configuration_advanced_settings_section_callback', // Callback used to render the description of the section
-			'wl_advanced_settings'              // Page on which to add this section of options
-		);
-
-		add_settings_field(
-			WL_CONFIG_API_URL,             // ID used to identify the field throughout the theme
-			__( 'API URL', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-api-url',
-				'name'        => 'wl_advanced_settings[api_url]',
-				'value'       => wl_configuration_get_api_url(),
-				'description' => __( 'The API URL', 'wordlift' )
-			)
-		);
-
-		add_settings_field(
-			WL_CONFIG_APPLICATION_KEY_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Key', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-redlink-key',
-				'name'        => 'wl_advanced_settings[redlink_key]',
-				'value'       => wl_configuration_get_redlink_key(),
-				'description' => __( 'The Redlink key', 'wordlift' )
-			)
-		);
-
-		add_settings_field(
-			WL_CONFIG_USER_ID_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink User Id', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-redlink-user-id',
-				'name'        => 'wl_advanced_settings[redlink_user_id]',
-				'value'       => wl_configuration_get_redlink_user_id(),
-				'description' => __( 'The Redlink User Id', 'wordlift' )
-			)
-		);
-
-		add_settings_field(
-			WL_CONFIG_DATASET_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Dataset name', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-redlink-dataset-name',
-				'name'        => 'wl_advanced_settings[redlink_dataset_name]',
-				'value'       => wl_configuration_get_redlink_dataset_name(),
-				'description' => __( 'The Redlink Dataset Name', 'wordlift' )
-			)
-		);
-
-		add_settings_field(
-			WL_CONFIG_DATASET_BASE_URI_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Dataset URI', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-redlink-dataset-uri',
-				'name'        => 'wl_advanced_settings[redlink_dataset_uri]',
-				'value'       => wl_configuration_get_redlink_dataset_uri(),
-				'description' => __( 'The Redlink Dataset URI', 'wordlift' )
-			)
-		);
-
-		add_settings_field(
-			WL_CONFIG_ANALYSIS_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Application Name', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
-			array(                              // The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-redlink-application-name',
-				'name'        => 'wl_advanced_settings[redlink_application_name]',
-				'value'       => wl_configuration_get_redlink_application_name(),
-				'description' => __( 'The Redlink Application Name', 'wordlift' )
-			)
-		);
-	}
+    register_setting(
+        'wl_general_settings',
+        'wl_general_settings',
+        'wl_configuration_sanitize_settings'
+    );
+
+    add_settings_section(
+        'wl_general_settings_section',          // ID used to identify this section and with which to register options
+        'General Settings',                              // Title to be displayed on the administration page
+        'wl_configuration_general_settings_section_callback', // Callback used to render the description of the section
+        'wl_general_settings'              // Page on which to add this section of options
+    );
+
+    add_settings_field(
+        WL_CONFIG_WORDLIFT_KEY,             // ID used to identify the field throughout the theme
+        __( 'WordLift Key', 'wordlift' ),   // The label to the left of the option interface element
+        'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+        '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(                              // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[key]',
+            'value'       => wl_configuration_get_key(),
+            'description' => __( 'Insert the WordLift Key', 'wordlift' )
+        )
+    );
+
+    add_settings_field(
+        WL_CONFIG_SITE_LANGUAGE_NAME,
+        __( 'Site Language', 'wordlift' ),
+        'wl_configuration_select',
+        '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[site_language]',
+            'value'       => wl_configuration_get_site_language(),
+            'description' => __( 'The site language', 'wordlift' ),
+            'options'     => wl_configuration_get_languages()
+        )
+    );
+
+
+    if ( defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION ) {
+
+        register_setting(
+            'wl_advanced_settings',
+            'wl_advanced_settings',
+            'wl_configuration_sanitize_settings'
+        );
+
+        add_settings_section(
+            'wl_advanced_settings_section',          // ID used to identify this section and with which to register options
+            'Advanced',                              // Title to be displayed on the administration page
+            'wl_configuration_advanced_settings_section_callback', // Callback used to render the description of the section
+            'wl_advanced_settings'              // Page on which to add this section of options
+        );
+
+        add_settings_field(
+            WL_CONFIG_API_URL,             // ID used to identify the field throughout the theme
+            __( 'API URL', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-api-url',
+                'name'        => 'wl_advanced_settings[api_url]',
+                'value'       => wl_configuration_get_api_url(),
+                'description' => __( 'The API URL', 'wordlift' )
+            )
+        );
+
+        add_settings_field(
+            WL_CONFIG_APPLICATION_KEY_NAME,             // ID used to identify the field throughout the theme
+            __( 'Redlink Key', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-redlink-key',
+                'name'        => 'wl_advanced_settings[redlink_key]',
+                'value'       => wl_configuration_get_redlink_key(),
+                'description' => __( 'The Redlink key', 'wordlift' )
+            )
+        );
+
+        add_settings_field(
+            WL_CONFIG_USER_ID_NAME,             // ID used to identify the field throughout the theme
+            __( 'Redlink User Id', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-redlink-user-id',
+                'name'        => 'wl_advanced_settings[redlink_user_id]',
+                'value'       => wl_configuration_get_redlink_user_id(),
+                'description' => __( 'The Redlink User Id', 'wordlift' )
+            )
+        );
+
+        add_settings_field(
+            WL_CONFIG_DATASET_NAME,             // ID used to identify the field throughout the theme
+            __( 'Redlink Dataset name', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-redlink-dataset-name',
+                'name'        => 'wl_advanced_settings[redlink_dataset_name]',
+                'value'       => wl_configuration_get_redlink_dataset_name(),
+                'description' => __( 'The Redlink Dataset Name', 'wordlift' )
+            )
+        );
+
+        add_settings_field(
+            WL_CONFIG_DATASET_BASE_URI_NAME,             // ID used to identify the field throughout the theme
+            __( 'Redlink Dataset URI', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-redlink-dataset-uri',
+                'name'        => 'wl_advanced_settings[redlink_dataset_uri]',
+                'value'       => wl_configuration_get_redlink_dataset_uri(),
+                'description' => __( 'The Redlink Dataset URI', 'wordlift' )
+            )
+        );
+
+        add_settings_field(
+            WL_CONFIG_ANALYSIS_NAME,             // ID used to identify the field throughout the theme
+            __( 'Redlink Application Name', 'wordlift' ),   // The label to the left of the option interface element
+            'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
+            'wl_advanced_settings',         // The page on which this option will be displayed
+            'wl_advanced_settings_section',      // The name of the section to which this field belongs
+            array(                              // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-redlink-application-name',
+                'name'        => 'wl_advanced_settings[redlink_application_name]',
+                'value'       => wl_configuration_get_redlink_application_name(),
+                'description' => __( 'The Redlink Application Name', 'wordlift' )
+            )
+        );
+    }
 }
 
 add_action( 'admin_init', 'wl_configuration_settings' );
@@ -261,8 +261,8 @@ 
  */
 function wl_configuration_general_settings_section_callback() {
 
-	// TODO: set the following text.
-	?>
+    // TODO: set the following text.
+    ?>
 	Configure WordLift general options.
 	<?php
 }
@@ -274,8 +274,8 @@ 
  */
 function wl_configuration_advanced_settings_section_callback() {
 
-	// TODO: set the following text.
-	?>
+    // TODO: set the following text.
+    ?>
 	Configure WordLift advanced options.
 	<?php
 }
@@ -291,8 +291,8 @@ 
  */
 function wl_configuration_sanitize_settings( $input ) {
 
-	// TODO: add sanitization checks.
-	return apply_filters( 'wl_configuration_sanitize_settings', $input, $input );
+    // TODO: add sanitization checks.
+    return apply_filters( 'wl_configuration_sanitize_settings', $input, $input );
 
 }
 
@@ -304,7 +304,7 @@ 
  * @param array $args An array of configuration parameters.
  */
 function wl_configuration_input_box( $args ) {
-	?>
+    ?>
 
 	<input type="text" id="<?php echo esc_attr( $args['id'] ); ?>"
 	       name="<?php echo esc_attr( $args['name'] ); ?>"
@@ -321,15 +321,15 @@ 
  * @param array $args The select configuration parameters.
  */
 function wl_configuration_select( $args ) {
-	?>
+    ?>
 
 	<select id="<?php echo esc_attr( $args['id'] ); ?>"
 	        name="<?php echo esc_attr( $args['name'] ); ?>">
 		<?php foreach ( $args['options'] as $value => $label ) { ?>
 			<option value="<?php echo esc_attr( $value ); ?>" <?php if ( $args['value'] === $value ) {
-				echo 'selected';
-			}
-			?>><?php echo esc_html( $label ); ?></option>
+                echo 'selected';
+            }
+            ?>><?php echo esc_html( $label ); ?></option>
 		<?php } ?>
 	</select>
 
@@ -344,7 +344,7 @@ 
  * @param array $args The checkbox parameters.
  */
 function wl_configuration_checkbox( $args ) {
-	?>
+    ?>
 
 	<input type="checkbox" id="<?php echo esc_attr( $args['id'] ); ?>"
 	       name="<?php echo esc_attr( $args['name'] ); ?>"
@@ -364,10 +364,10 @@ 
  */
 function wl_configuration_settings_links( $links ) {
 
-	// TODO: this link is different within SEO Ultimate.
-	array_push( $links, '<a href="' . get_admin_url( null, 'admin.php?page=wl_configuration_admin_menu' ) . '">Settings</a>' );
+    // TODO: this link is different within SEO Ultimate.
+    array_push( $links, '<a href="' . get_admin_url( null, 'admin.php?page=wl_configuration_admin_menu' ) . '">Settings</a>' );
 
-	return $links;
+    return $links;
 }
 
 // add the settings link for the plugin.
@@ -383,27 +383,27 @@ 
  */
 function wl_configuration_get_languages() {
 
-	// prepare the language array.
-	$langs = array();
+    // prepare the language array.
+    $langs = array();
 
-	// set the path to the language file.
-	$filename = dirname( __FILE__ ) . '/ISO-639-2_utf-8.txt';
+    // set the path to the language file.
+    $filename = dirname( __FILE__ ) . '/ISO-639-2_utf-8.txt';
 
-	if ( ( $handle = fopen( $filename, 'r' ) ) !== false ) {
-		while ( ( $data = fgetcsv( $handle, 1000, '|' ) ) !== false ) {
-			if ( ! empty( $data[2] ) ) {
-				$code           = $data[2];
-				$label          = htmlentities( $data[3] );
-				$langs[ $code ] = $label;
-			}
-		}
-		fclose( $handle );
-	}
+    if ( ( $handle = fopen( $filename, 'r' ) ) !== false ) {
+        while ( ( $data = fgetcsv( $handle, 1000, '|' ) ) !== false ) {
+            if ( ! empty( $data[2] ) ) {
+                $code           = $data[2];
+                $label          = htmlentities( $data[3] );
+                $langs[ $code ] = $label;
+            }
+        }
+        fclose( $handle );
+    }
 
-	// sort the languages;
-	asort( $langs );
+    // sort the languages;
+    asort( $langs );
 
-	return $langs;
+    return $langs;
 
 }
 
@@ -415,13 +415,13 @@ 
  */
 function wl_config_get_recursion_depth() {
 
-	// get the plugin options.
-	$options = get_option( WL_OPTIONS_NAME );
+    // get the plugin options.
+    $options = get_option( WL_OPTIONS_NAME );
 
-	return ( isset( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
-	         && is_numeric( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
-		? $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ]
-		: WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING );
+    return ( isset( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
+             && is_numeric( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
+        ? $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ]
+        : WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING );
 }
 
 
@@ -434,13 +434,13 @@ 
  */
 function wl_configuration_validate() {
 
-	// Check that the WordLift key has been set or show a notice.
-	if ( '' !== wl_configuration_get_key() ) {
-		return;
-	}
+    // Check that the WordLift key has been set or show a notice.
+    if ( '' !== wl_configuration_get_key() ) {
+        return;
+    }
 
-	Wordlift_Notice_Service::get_instance()
-	                       ->add_error( sprintf( __( 'application-key-not-set', 'wordlift' ), 'http://join.wordlift.it' ) );
+    Wordlift_Notice_Service::get_instance()
+                            ->add_error( sprintf( __( 'application-key-not-set', 'wordlift' ), 'http://join.wordlift.it' ) );
 
 }
 
@@ -456,37 +456,37 @@ 
  */
 function wl_configuration_update_key( $old_value, $new_value ) {
 
-	// wl_write_log( "Going to request set redlink dataset uri if needed" );
+    // wl_write_log( "Going to request set redlink dataset uri if needed" );
 
-	// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-	$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-	$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+    // Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
+    $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+    $new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
 
-	// wl_write_log( "[ old value :: $old_key ][ new value :: $new_key ]" );
+    // wl_write_log( "[ old value :: $old_key ][ new value :: $new_key ]" );
 
-	// If the key hasn't changed, don't do anything.
-	// WARN The 'update_option' hook is fired only if the new and old value are not equal
-	if ( $old_key === $new_key ) {
-		return;
-	}
+    // If the key hasn't changed, don't do anything.
+    // WARN The 'update_option' hook is fired only if the new and old value are not equal
+    if ( $old_key === $new_key ) {
+        return;
+    }
 
-	// If the key is empty, empty the dataset URI.
-	if ( '' === $new_key ) {
-		wl_configuration_set_redlink_dataset_uri( '' );
-	}
+    // If the key is empty, empty the dataset URI.
+    if ( '' === $new_key ) {
+        wl_configuration_set_redlink_dataset_uri( '' );
+    }
 
-	// Request the dataset URI.
-	$response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+    // Request the dataset URI.
+    $response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
 
-	// If the response is valid, then set the value.
-	if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+    // If the response is valid, then set the value.
+    if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
 
-		// wl_write_log( "[ Retrieved dataset :: " . $response['body'] . " ]" );
-		wl_configuration_set_redlink_dataset_uri( $response['body'] );
+        // wl_write_log( "[ Retrieved dataset :: " . $response['body'] . " ]" );
+        wl_configuration_set_redlink_dataset_uri( $response['body'] );
 
-	} else {
-		wl_write_log( "Error on dataset uri remote retrieving [ " . var_export( $response, true ) . " ]" );
-	}
+    } else {
+        wl_write_log( "Error on dataset uri remote retrieving [ " . var_export( $response, true ) . " ]" );
+    }
 
 }
 

Spacing +121 added lines, -121 removed lines

@@ -5,8 +5,8 @@ 
  *  * methods for retrieving configuration data
  */
 
-require_once( 'wordlift_configuration_constants.php' );
-require_once( 'wordlift_configuration_settings.php' );
+require_once('wordlift_configuration_constants.php');
+require_once('wordlift_configuration_settings.php');
 
 /**
  * This function is called by the *wl_admin_menu* hook which is raised when WordLift builds the admin_menu.
@@ -16,21 +16,21 @@ 
  * @param string $parent_slug The parent slug for the menu.
  * @param string $capability The required capability to access the page.
  */
-function wl_configuration_admin_menu( $parent_slug, $capability ) {
+function wl_configuration_admin_menu($parent_slug, $capability) {
 
 	// see http://codex.wordpress.org/Function_Reference/add_submenu_page
 	add_submenu_page(
 		$parent_slug, // The parent menu slug, provided by the calling hook.
-		__( 'Settings', 'wordlift' ),  // page title
-		__( 'Settings', 'wordlift' ),  // menu title
-		$capability,                   // The required capability, provided by the calling hook.
-		'wl_configuration_admin_menu',      // the menu slug
+		__('Settings', 'wordlift'), // page title
+		__('Settings', 'wordlift'), // menu title
+		$capability, // The required capability, provided by the calling hook.
+		'wl_configuration_admin_menu', // the menu slug
 		'wl_configuration_admin_menu_callback' // the menu callback for displaying the page content
 	);
 
 }
 
-add_action( 'wl_admin_menu', 'wl_configuration_admin_menu', 10, 2 );
+add_action('wl_admin_menu', 'wl_configuration_admin_menu', 10, 2);
 
 /**
  * Displays the page content.
@@ -39,20 +39,20 @@ 
  *
  * @param boolean $display_page_title If true, prints out the page title.
  */
-function wl_configuration_admin_menu_callback( $display_page_title = true ) {
+function wl_configuration_admin_menu_callback($display_page_title = true) {
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
+	if ( ! current_user_can('manage_options')) {
+		wp_die(__('You do not have sufficient permissions to access this page.'));
 	}
 
 	// Ony show advanced settings tab if the relative constant exists and is set to true.
-	$can_show_advanced_settings = defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION;
+	$can_show_advanced_settings = defined('WL_ENABLE_ADVANCED_CONFIGURATION') && WL_ENABLE_ADVANCED_CONFIGURATION;
 
 	?>
 
 	<div class="wrap">
 
-		<?php if ( $display_page_title ) { ?>
+		<?php if ($display_page_title) { ?>
 			<div id="icon-themes" class="icon32"></div>
 			<h2>WordLift</h2>
 		<?php } ?>
@@ -60,28 +60,28 @@ 
 		<?php settings_errors(); ?>
 
 		<?php
-		$active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general_settings';
+		$active_tab = isset($_GET['tab']) ? $_GET['tab'] : 'general_settings';
 		?>
 
 		<h2 class="nav-tab-wrapper">
-			<a href="?page=<?php echo( $_GET['page'] ); ?>&tab=general_settings"
-			   class="nav-tab <?php echo $active_tab == 'general_settings' ? 'nav-tab-active' : ''; ?>"><?php esc_attr_e( 'General', 'wordlift' ); ?></a>
+			<a href="?page=<?php echo($_GET['page']); ?>&tab=general_settings"
+			   class="nav-tab <?php echo $active_tab == 'general_settings' ? 'nav-tab-active' : ''; ?>"><?php esc_attr_e('General', 'wordlift'); ?></a>
 
-			<?php if ( $can_show_advanced_settings ): ?>
-				<a href="?page=<?php echo( $_GET['page'] ); ?>&tab=advanced_settings"
-				   class="nav-tab <?php echo $active_tab == 'advanced_settings' ? 'nav-tab-active' : ''; ?>"><?php esc_attr_e( 'Advanced', 'wordlift' ); ?></a>
+			<?php if ($can_show_advanced_settings): ?>
+				<a href="?page=<?php echo($_GET['page']); ?>&tab=advanced_settings"
+				   class="nav-tab <?php echo $active_tab == 'advanced_settings' ? 'nav-tab-active' : ''; ?>"><?php esc_attr_e('Advanced', 'wordlift'); ?></a>
 			<?php endif; ?>
 		</h2>
 
 		<form action="options.php" method="post">
 			<?php
-			if ( 'general_settings' === $active_tab ) {
-				settings_fields( 'wl_general_settings' );
-				do_settings_sections( 'wl_general_settings' );
+			if ('general_settings' === $active_tab) {
+				settings_fields('wl_general_settings');
+				do_settings_sections('wl_general_settings');
 
-			} else if ( $can_show_advanced_settings && 'advanced_settings' === $active_tab ) {
-				settings_fields( 'wl_advanced_settings' );
-				do_settings_sections( 'wl_advanced_settings' );
+			} else if ($can_show_advanced_settings && 'advanced_settings' === $active_tab) {
+				settings_fields('wl_advanced_settings');
+				do_settings_sections('wl_advanced_settings');
 			}
 
 			submit_button();
@@ -115,29 +115,29 @@ 
 	);
 
 	add_settings_section(
-		'wl_general_settings_section',          // ID used to identify this section and with which to register options
-		'General Settings',                              // Title to be displayed on the administration page
+		'wl_general_settings_section', // ID used to identify this section and with which to register options
+		'General Settings', // Title to be displayed on the administration page
 		'wl_configuration_general_settings_section_callback', // Callback used to render the description of the section
 		'wl_general_settings'              // Page on which to add this section of options
 	);
 
 	add_settings_field(
-		WL_CONFIG_WORDLIFT_KEY,             // ID used to identify the field throughout the theme
-		__( 'WordLift Key', 'wordlift' ),   // The label to the left of the option interface element
-		'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-		'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
+		WL_CONFIG_WORDLIFT_KEY, // ID used to identify the field throughout the theme
+		__('WordLift Key', 'wordlift'), // The label to the left of the option interface element
+		'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+		'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(                              // The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-key',
 			'name'        => 'wl_general_settings[key]',
 			'value'       => wl_configuration_get_key(),
-			'description' => __( 'Insert the WordLift Key', 'wordlift' )
+			'description' => __('Insert the WordLift Key', 'wordlift')
 		)
 	);
 
 	add_settings_field(
 		WL_CONFIG_SITE_LANGUAGE_NAME,
-		__( 'Site Language', 'wordlift' ),
+		__('Site Language', 'wordlift'),
 		'wl_configuration_select',
 		'wl_general_settings',
 		'wl_general_settings_section',
@@ -145,13 +145,13 @@ 
 			'id'          => 'wl-site-language',
 			'name'        => 'wl_general_settings[site_language]',
 			'value'       => wl_configuration_get_site_language(),
-			'description' => __( 'The site language', 'wordlift' ),
+			'description' => __('The site language', 'wordlift'),
 			'options'     => wl_configuration_get_languages()
 		)
 	);
 
 
-	if ( defined( 'WL_ENABLE_ADVANCED_CONFIGURATION' ) && WL_ENABLE_ADVANCED_CONFIGURATION ) {
+	if (defined('WL_ENABLE_ADVANCED_CONFIGURATION') && WL_ENABLE_ADVANCED_CONFIGURATION) {
 
 		register_setting(
 			'wl_advanced_settings',
@@ -160,99 +160,99 @@ 
 		);
 
 		add_settings_section(
-			'wl_advanced_settings_section',          // ID used to identify this section and with which to register options
-			'Advanced',                              // Title to be displayed on the administration page
+			'wl_advanced_settings_section', // ID used to identify this section and with which to register options
+			'Advanced', // Title to be displayed on the administration page
 			'wl_configuration_advanced_settings_section_callback', // Callback used to render the description of the section
 			'wl_advanced_settings'              // Page on which to add this section of options
 		);
 
 		add_settings_field(
-			WL_CONFIG_API_URL,             // ID used to identify the field throughout the theme
-			__( 'API URL', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_API_URL, // ID used to identify the field throughout the theme
+			__('API URL', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-api-url',
 				'name'        => 'wl_advanced_settings[api_url]',
 				'value'       => wl_configuration_get_api_url(),
-				'description' => __( 'The API URL', 'wordlift' )
+				'description' => __('The API URL', 'wordlift')
 			)
 		);
 
 		add_settings_field(
-			WL_CONFIG_APPLICATION_KEY_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Key', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_APPLICATION_KEY_NAME, // ID used to identify the field throughout the theme
+			__('Redlink Key', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-redlink-key',
 				'name'        => 'wl_advanced_settings[redlink_key]',
 				'value'       => wl_configuration_get_redlink_key(),
-				'description' => __( 'The Redlink key', 'wordlift' )
+				'description' => __('The Redlink key', 'wordlift')
 			)
 		);
 
 		add_settings_field(
-			WL_CONFIG_USER_ID_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink User Id', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_USER_ID_NAME, // ID used to identify the field throughout the theme
+			__('Redlink User Id', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-redlink-user-id',
 				'name'        => 'wl_advanced_settings[redlink_user_id]',
 				'value'       => wl_configuration_get_redlink_user_id(),
-				'description' => __( 'The Redlink User Id', 'wordlift' )
+				'description' => __('The Redlink User Id', 'wordlift')
 			)
 		);
 
 		add_settings_field(
-			WL_CONFIG_DATASET_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Dataset name', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_DATASET_NAME, // ID used to identify the field throughout the theme
+			__('Redlink Dataset name', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-redlink-dataset-name',
 				'name'        => 'wl_advanced_settings[redlink_dataset_name]',
 				'value'       => wl_configuration_get_redlink_dataset_name(),
-				'description' => __( 'The Redlink Dataset Name', 'wordlift' )
+				'description' => __('The Redlink Dataset Name', 'wordlift')
 			)
 		);
 
 		add_settings_field(
-			WL_CONFIG_DATASET_BASE_URI_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Dataset URI', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_DATASET_BASE_URI_NAME, // ID used to identify the field throughout the theme
+			__('Redlink Dataset URI', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-redlink-dataset-uri',
 				'name'        => 'wl_advanced_settings[redlink_dataset_uri]',
 				'value'       => wl_configuration_get_redlink_dataset_uri(),
-				'description' => __( 'The Redlink Dataset URI', 'wordlift' )
+				'description' => __('The Redlink Dataset URI', 'wordlift')
 			)
 		);
 
 		add_settings_field(
-			WL_CONFIG_ANALYSIS_NAME,             // ID used to identify the field throughout the theme
-			__( 'Redlink Application Name', 'wordlift' ),   // The label to the left of the option interface element
-			'wl_configuration_input_box',       // The name of the function responsible for rendering the option interface
-			'wl_advanced_settings',         // The page on which this option will be displayed
-			'wl_advanced_settings_section',      // The name of the section to which this field belongs
+			WL_CONFIG_ANALYSIS_NAME, // ID used to identify the field throughout the theme
+			__('Redlink Application Name', 'wordlift'), // The label to the left of the option interface element
+			'wl_configuration_input_box', // The name of the function responsible for rendering the option interface
+			'wl_advanced_settings', // The page on which this option will be displayed
+			'wl_advanced_settings_section', // The name of the section to which this field belongs
 			array(                              // The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-redlink-application-name',
 				'name'        => 'wl_advanced_settings[redlink_application_name]',
 				'value'       => wl_configuration_get_redlink_application_name(),
-				'description' => __( 'The Redlink Application Name', 'wordlift' )
+				'description' => __('The Redlink Application Name', 'wordlift')
 			)
 		);
 	}
 }
 
-add_action( 'admin_init', 'wl_configuration_settings' );
+add_action('admin_init', 'wl_configuration_settings');
 
 /**
  * Display the general settings description. Called from a hook set by *wl_configuration_settings*.
@@ -289,10 +289,10 @@ 
  *
  * @return mixed
  */
-function wl_configuration_sanitize_settings( $input ) {
+function wl_configuration_sanitize_settings($input) {
 
 	// TODO: add sanitization checks.
-	return apply_filters( 'wl_configuration_sanitize_settings', $input, $input );
+	return apply_filters('wl_configuration_sanitize_settings', $input, $input);
 
 }
 
@@ -303,12 +303,12 @@ 
  *
  * @param array $args An array of configuration parameters.
  */
-function wl_configuration_input_box( $args ) {
+function wl_configuration_input_box($args) {
 	?>
 
-	<input type="text" id="<?php echo esc_attr( $args['id'] ); ?>"
-	       name="<?php echo esc_attr( $args['name'] ); ?>"
-	       value="<?php echo esc_attr( $args['value'] ); ?>"/>
+	<input type="text" id="<?php echo esc_attr($args['id']); ?>"
+	       name="<?php echo esc_attr($args['name']); ?>"
+	       value="<?php echo esc_attr($args['value']); ?>"/>
 
 	<?php
 }
@@ -320,16 +320,16 @@ 
  *
  * @param array $args The select configuration parameters.
  */
-function wl_configuration_select( $args ) {
+function wl_configuration_select($args) {
 	?>
 
-	<select id="<?php echo esc_attr( $args['id'] ); ?>"
-	        name="<?php echo esc_attr( $args['name'] ); ?>">
-		<?php foreach ( $args['options'] as $value => $label ) { ?>
-			<option value="<?php echo esc_attr( $value ); ?>" <?php if ( $args['value'] === $value ) {
+	<select id="<?php echo esc_attr($args['id']); ?>"
+	        name="<?php echo esc_attr($args['name']); ?>">
+		<?php foreach ($args['options'] as $value => $label) { ?>
+			<option value="<?php echo esc_attr($value); ?>" <?php if ($args['value'] === $value) {
 				echo 'selected';
 			}
-			?>><?php echo esc_html( $label ); ?></option>
+			?>><?php echo esc_html($label); ?></option>
 		<?php } ?>
 	</select>
 
@@ -343,12 +343,12 @@ 
  *
  * @param array $args The checkbox parameters.
  */
-function wl_configuration_checkbox( $args ) {
+function wl_configuration_checkbox($args) {
 	?>
 
-	<input type="checkbox" id="<?php echo esc_attr( $args['id'] ); ?>"
-	       name="<?php echo esc_attr( $args['name'] ); ?>"
-	       value="1" <?php checked( 1, $args['value'], true ); ?>/>
+	<input type="checkbox" id="<?php echo esc_attr($args['id']); ?>"
+	       name="<?php echo esc_attr($args['name']); ?>"
+	       value="1" <?php checked(1, $args['value'], true); ?>/>
 
 	<?php
 }
@@ -362,16 +362,16 @@ 
  *
  * @return array An array of links including those added by the plugin.
  */
-function wl_configuration_settings_links( $links ) {
+function wl_configuration_settings_links($links) {
 
 	// TODO: this link is different within SEO Ultimate.
-	array_push( $links, '<a href="' . get_admin_url( null, 'admin.php?page=wl_configuration_admin_menu' ) . '">Settings</a>' );
+	array_push($links, '<a href="'.get_admin_url(null, 'admin.php?page=wl_configuration_admin_menu').'">Settings</a>');
 
 	return $links;
 }
 
 // add the settings link for the plugin.
-add_filter( "plugin_action_links_wordlift/wordlift.php", 'wl_configuration_settings_links' );
+add_filter("plugin_action_links_wordlift/wordlift.php", 'wl_configuration_settings_links');
 
 
 /**
@@ -387,21 +387,21 @@ 
 	$langs = array();
 
 	// set the path to the language file.
-	$filename = dirname( __FILE__ ) . '/ISO-639-2_utf-8.txt';
+	$filename = dirname(__FILE__).'/ISO-639-2_utf-8.txt';
 
-	if ( ( $handle = fopen( $filename, 'r' ) ) !== false ) {
-		while ( ( $data = fgetcsv( $handle, 1000, '|' ) ) !== false ) {
-			if ( ! empty( $data[2] ) ) {
+	if (($handle = fopen($filename, 'r')) !== false) {
+		while (($data = fgetcsv($handle, 1000, '|')) !== false) {
+			if ( ! empty($data[2])) {
 				$code           = $data[2];
-				$label          = htmlentities( $data[3] );
-				$langs[ $code ] = $label;
+				$label          = htmlentities($data[3]);
+				$langs[$code] = $label;
 			}
 		}
-		fclose( $handle );
+		fclose($handle);
 	}
 
 	// sort the languages;
-	asort( $langs );
+	asort($langs);
 
 	return $langs;
 
@@ -416,12 +416,12 @@ 
 function wl_config_get_recursion_depth() {
 
 	// get the plugin options.
-	$options = get_option( WL_OPTIONS_NAME );
+	$options = get_option(WL_OPTIONS_NAME);
 
-	return ( isset( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
-	         && is_numeric( $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ] )
-		? $options[ WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING ]
-		: WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING );
+	return (isset($options[WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING])
+	         && is_numeric($options[WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING])
+		? $options[WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING]
+		: WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING);
 }
 
 
@@ -435,16 +435,16 @@ 
 function wl_configuration_validate() {
 
 	// Check that the WordLift key has been set or show a notice.
-	if ( '' !== wl_configuration_get_key() ) {
+	if ('' !== wl_configuration_get_key()) {
 		return;
 	}
 
 	Wordlift_Notice_Service::get_instance()
-	                       ->add_error( sprintf( __( 'application-key-not-set', 'wordlift' ), 'http://join.wordlift.it' ) );
+	                       ->add_error(sprintf(__('application-key-not-set', 'wordlift'), 'http://join.wordlift.it'));
 
 }
 
-add_action( 'admin_init', 'wl_configuration_validate' );
+add_action('admin_init', 'wl_configuration_validate');
 
 /**
  * Intercept the change of the WordLift key in order to set the dataset URI.
@@ -454,40 +454,40 @@ 
  * @param array $old_value The old settings.
  * @param array $new_value The new settings.
  */
-function wl_configuration_update_key( $old_value, $new_value ) {
+function wl_configuration_update_key($old_value, $new_value) {
 
 	// wl_write_log( "Going to request set redlink dataset uri if needed" );
 
 	// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-	$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-	$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+	$old_key = isset($old_value['key']) ? $old_value['key'] : '';
+	$new_key = isset($new_value['key']) ? $new_value['key'] : '';
 
 	// wl_write_log( "[ old value :: $old_key ][ new value :: $new_key ]" );
 
 	// If the key hasn't changed, don't do anything.
 	// WARN The 'update_option' hook is fired only if the new and old value are not equal
-	if ( $old_key === $new_key ) {
+	if ($old_key === $new_key) {
 		return;
 	}
 
 	// If the key is empty, empty the dataset URI.
-	if ( '' === $new_key ) {
-		wl_configuration_set_redlink_dataset_uri( '' );
+	if ('' === $new_key) {
+		wl_configuration_set_redlink_dataset_uri('');
 	}
 
 	// Request the dataset URI.
-	$response = wp_remote_get( wl_configuration_get_accounts_by_key_dataset_uri( $new_key ), unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+	$response = wp_remote_get(wl_configuration_get_accounts_by_key_dataset_uri($new_key), unserialize(WL_REDLINK_API_HTTP_OPTIONS));
 
 	// If the response is valid, then set the value.
-	if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+	if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 
 		// wl_write_log( "[ Retrieved dataset :: " . $response['body'] . " ]" );
-		wl_configuration_set_redlink_dataset_uri( $response['body'] );
+		wl_configuration_set_redlink_dataset_uri($response['body']);
 
 	} else {
-		wl_write_log( "Error on dataset uri remote retrieving [ " . var_export( $response, true ) . " ]" );
+		wl_write_log("Error on dataset uri remote retrieving [ ".var_export($response, true)." ]");
 	}
 
 }
 
-add_action( 'update_option_wl_general_settings', 'wl_configuration_update_key', 10, 2 );
\ No newline at end of file
+add_action('update_option_wl_general_settings', 'wl_configuration_update_key', 10, 2);
\ No newline at end of file

src/modules/configuration/wordlift_configuration_constants.php

Spacing +13 added lines, -13 removed lines

@@ -1,28 +1,28 @@
 <?php
 // the WordLift options identifier.
-define( 'WL_OPTIONS_NAME', 'wordlift_options' );
+define('WL_OPTIONS_NAME', 'wordlift_options');
 
 // The WordLift key.
-define( 'WL_CONFIG_WORDLIFT_KEY', 'wl_key' );
+define('WL_CONFIG_WORDLIFT_KEY', 'wl_key');
 
 // Define the field name for the dataset base URI.
-define( 'WL_CONFIG_DATASET_BASE_URI_NAME', 'dataset_base_uri' );
+define('WL_CONFIG_DATASET_BASE_URI_NAME', 'dataset_base_uri');
 
-define( 'WL_CONFIG_API_URL', 'api_url' );
-define( 'WL_CONFIG_APPLICATION_KEY_NAME', 'application_key' );
+define('WL_CONFIG_API_URL', 'api_url');
+define('WL_CONFIG_APPLICATION_KEY_NAME', 'application_key');
 
-define( 'WL_CONFIG_USER_ID_NAME', 'user_id' );
+define('WL_CONFIG_USER_ID_NAME', 'user_id');
 
-define( 'WL_CONFIG_DATASET_NAME', 'dataset_name' );
+define('WL_CONFIG_DATASET_NAME', 'dataset_name');
 
-define( 'WL_CONFIG_ANALYSIS_NAME', 'analysis_name' );
+define('WL_CONFIG_ANALYSIS_NAME', 'analysis_name');
 
-define( 'WL_CONFIG_SITE_LANGUAGE_NAME', 'site_language' );
+define('WL_CONFIG_SITE_LANGUAGE_NAME', 'site_language');
 
-define( 'WL_CONFIG_DEFAULT_SITE_LANGUAGE', 'en' );
+define('WL_CONFIG_DEFAULT_SITE_LANGUAGE', 'en');
 
-define( 'WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 'recursion_depth_on_metadata_printing' );
+define('WL_CONFIG_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 'recursion_depth_on_metadata_printing');
 
-define( 'WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined( 'WORDLIFT_API_URL' ) ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/' );
+define('WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined('WORDLIFT_API_URL') ? WORDLIFT_API_URL.'/' : 'https://api.wordlift.it/');
 
-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=');

src/modules/configuration/wordlift_configuration_settings.php

Indentation +74 added lines, -74 removed lines

@@ -9,10 +9,10 @@ 
  */
 function wl_configuration_set( $settings, $key, $value ) {
 
-	$options         = get_option( $settings );
-	$options         = isset( $options ) ? $options : array();
-	$options[ $key ] = $value;
-	update_option( $settings, $options );
+    $options         = get_option( $settings );
+    $options         = isset( $options ) ? $options : array();
+    $options[ $key ] = $value;
+    update_option( $settings, $options );
 }
 
 
@@ -24,13 +24,13 @@ 
  * @return string The configured WordLift key or an empty string.
  */
 function wl_configuration_get_key() {
-	$options = get_option( 'wl_general_settings' );
+    $options = get_option( 'wl_general_settings' );
 
-	if ( isset( $options['key'] ) ) {
-		return $options['key'];
-	}
+    if ( isset( $options['key'] ) ) {
+        return $options['key'];
+    }
 
-	return '';
+    return '';
 }
 
 
@@ -43,7 +43,7 @@ 
  */
 function wl_configuration_set_key( $value ) {
 
-	wl_configuration_set( 'wl_general_settings', 'key', $value );
+    wl_configuration_set( 'wl_general_settings', 'key', $value );
 
 }
 
@@ -56,9 +56,9 @@ 
  */
 function wl_configuration_get_site_language() {
 
-	$options = get_option( 'wl_general_settings' );
+    $options = get_option( 'wl_general_settings' );
 
-	return ( empty( $options['site_language'] ) ? 'en' : $options['site_language'] );
+    return ( empty( $options['site_language'] ) ? 'en' : $options['site_language'] );
 }
 
 /**
@@ -70,7 +70,7 @@ 
  */
 function wl_configuration_set_site_language( $value ) {
 
-	wl_configuration_set( 'wl_general_settings', 'site_language', $value );
+    wl_configuration_set( 'wl_general_settings', 'site_language', $value );
 }
 
 /**
@@ -82,9 +82,9 @@ 
  */
 function wl_configuration_get_api_url() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
+    return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
 
 }
 
@@ -97,7 +97,7 @@ 
  */
 function wl_configuration_set_api_url( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
 }
 
 /**
@@ -109,9 +109,9 @@ 
  */
 function wl_configuration_get_redlink_key() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
+    return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
 
 }
 
@@ -124,7 +124,7 @@ 
  */
 function wl_configuration_set_redlink_key( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
 }
 
 /**
@@ -136,9 +136,9 @@ 
  */
 function wl_configuration_get_redlink_user_id() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
+    return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
 
 }
 
@@ -151,7 +151,7 @@ 
  */
 function wl_configuration_set_redlink_user_id( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
 }
 
 /**
@@ -163,9 +163,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
+    return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
 }
 
 
@@ -178,7 +178,7 @@ 
  */
 function wl_configuration_set_redlink_dataset_name( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
 }
 
 
@@ -191,9 +191,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_uri() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_dataset_uri'] ) ? '' : $options['redlink_dataset_uri'] );
+    return ( empty( $options['redlink_dataset_uri'] ) ? '' : $options['redlink_dataset_uri'] );
 }
 
 
@@ -206,7 +206,7 @@ 
  */
 function wl_configuration_set_redlink_dataset_uri( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_uri', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_uri', $value );
 }
 
 /**
@@ -218,9 +218,9 @@ 
  */
 function wl_configuration_get_redlink_application_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
+    return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
 }
 
 
@@ -233,7 +233,7 @@ 
  */
 function wl_configuration_set_redlink_application_name( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
 }
 
 /**
@@ -250,17 +250,17 @@ 
  */
 function wl_configuration_get_analyzer_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key";
+    }
 
-	// Otherwise use Redlink.
-	$app_key       = wl_configuration_get_redlink_key();
-	$analysis_name = wl_configuration_get_redlink_application_name();
+    // Otherwise use Redlink.
+    $app_key       = wl_configuration_get_redlink_key();
+    $analysis_name = wl_configuration_get_redlink_application_name();
 
-	$ldpath = <<<EOF
+    $ldpath = <<<EOF
         @prefix ex: <http://example.org/>;
         @prefix cal: <http://www.w3.org/2002/12/cal#>;
         @prefix gn: <http://www.geonames.org/ontology#>;
@@ -269,8 +269,8 @@ 
         vcard:locality = lode:atPlace/gn:name :: xsd:string;
 EOF;
 
-	return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
-	       '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
+    return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
+            '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
 
 }
 
@@ -285,7 +285,7 @@ 
  */
 function wl_configuration_get_accounts_by_key_dataset_uri( $key ) {
 
-	return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+    return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
 }
 
 
@@ -301,19 +301,19 @@ 
  */
 function wl_configuration_get_query_select_url( $output, $dataset = null ) {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		// TODO: handle the output format for WordLift.
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        // TODO: handle the output format for WordLift.
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
+    }
 
-	// If no dataset has been specified then use the default configured, otherwise use the one provided.
-	$redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // If no dataset has been specified then use the default configured, otherwise use the one provided.
+    $redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
 
 }
 
@@ -326,18 +326,18 @@ 
  */
 function wl_configuration_get_query_update_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
+    }
 
-	// get the configuration.
-	$redlink_dataset = wl_configuration_get_redlink_dataset_name();
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // get the configuration.
+    $redlink_dataset = wl_configuration_get_redlink_dataset_name();
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
 
 }
 
@@ -351,17 +351,17 @@ 
  */
 function wl_configuration_get_dataset_index_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
+    }
 
-	// get the configuration.
-	$redlink_dataset = wl_configuration_get_redlink_dataset_name();
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // get the configuration.
+    $redlink_dataset = wl_configuration_get_redlink_dataset_name();
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
 
 }
\ No newline at end of file

Spacing +54 added lines, -54 removed lines

@@ -7,12 +7,12 @@ 
  * @param string $key The setting name.
  * @param string $value The setting value.
  */
-function wl_configuration_set( $settings, $key, $value ) {
+function wl_configuration_set($settings, $key, $value) {
 
-	$options         = get_option( $settings );
-	$options         = isset( $options ) ? $options : array();
-	$options[ $key ] = $value;
-	update_option( $settings, $options );
+	$options         = get_option($settings);
+	$options         = isset($options) ? $options : array();
+	$options[$key] = $value;
+	update_option($settings, $options);
 }
 
 
@@ -24,9 +24,9 @@ 
  * @return string The configured WordLift key or an empty string.
  */
 function wl_configuration_get_key() {
-	$options = get_option( 'wl_general_settings' );
+	$options = get_option('wl_general_settings');
 
-	if ( isset( $options['key'] ) ) {
+	if (isset($options['key'])) {
 		return $options['key'];
 	}
 
@@ -41,9 +41,9 @@ 
  *
  * @param string $value The WordLift key.
  */
-function wl_configuration_set_key( $value ) {
+function wl_configuration_set_key($value) {
 
-	wl_configuration_set( 'wl_general_settings', 'key', $value );
+	wl_configuration_set('wl_general_settings', 'key', $value);
 
 }
 
@@ -56,9 +56,9 @@ 
  */
 function wl_configuration_get_site_language() {
 
-	$options = get_option( 'wl_general_settings' );
+	$options = get_option('wl_general_settings');
 
-	return ( empty( $options['site_language'] ) ? 'en' : $options['site_language'] );
+	return (empty($options['site_language']) ? 'en' : $options['site_language']);
 }
 
 /**
@@ -68,9 +68,9 @@ 
  *
  * @param string $value The two-letter language code.
  */
-function wl_configuration_set_site_language( $value ) {
+function wl_configuration_set_site_language($value) {
 
-	wl_configuration_set( 'wl_general_settings', 'site_language', $value );
+	wl_configuration_set('wl_general_settings', 'site_language', $value);
 }
 
 /**
@@ -82,9 +82,9 @@ 
  */
 function wl_configuration_get_api_url() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
+	return (empty($options['api_url']) ? '' : $options['api_url']);
 
 }
 
@@ -95,9 +95,9 @@ 
  *
  * @param string $value The API URL.
  */
-function wl_configuration_set_api_url( $value ) {
+function wl_configuration_set_api_url($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
+	wl_configuration_set('wl_advanced_settings', 'api_url', $value);
 }
 
 /**
@@ -109,9 +109,9 @@ 
  */
 function wl_configuration_get_redlink_key() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
+	return (empty($options['redlink_key']) ? '' : $options['redlink_key']);
 
 }
 
@@ -122,9 +122,9 @@ 
  *
  * @param string $value The Redlink application key.
  */
-function wl_configuration_set_redlink_key( $value ) {
+function wl_configuration_set_redlink_key($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_key', $value);
 }
 
 /**
@@ -136,9 +136,9 @@ 
  */
 function wl_configuration_get_redlink_user_id() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
+	return (empty($options['redlink_user_id']) ? '' : $options['redlink_user_id']);
 
 }
 
@@ -149,9 +149,9 @@ 
  *
  * @param string $value The Redlink user id.
  */
-function wl_configuration_set_redlink_user_id( $value ) {
+function wl_configuration_set_redlink_user_id($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_user_id', $value);
 }
 
 /**
@@ -163,9 +163,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
+	return (empty($options['redlink_dataset_name']) ? '' : $options['redlink_dataset_name']);
 }
 
 
@@ -176,9 +176,9 @@ 
  *
  * @param string $value The Redlink dataset name.
  */
-function wl_configuration_set_redlink_dataset_name( $value ) {
+function wl_configuration_set_redlink_dataset_name($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_dataset_name', $value);
 }
 
 
@@ -191,9 +191,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_uri() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_dataset_uri'] ) ? '' : $options['redlink_dataset_uri'] );
+	return (empty($options['redlink_dataset_uri']) ? '' : $options['redlink_dataset_uri']);
 }
 
 
@@ -204,9 +204,9 @@ 
  *
  * @param string $value The Redlink dataset URI.
  */
-function wl_configuration_set_redlink_dataset_uri( $value ) {
+function wl_configuration_set_redlink_dataset_uri($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_uri', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_dataset_uri', $value);
 }
 
 /**
@@ -218,9 +218,9 @@ 
  */
 function wl_configuration_get_redlink_application_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
+	return (empty($options['redlink_application_name']) ? '' : $options['redlink_application_name']);
 }
 
 
@@ -231,9 +231,9 @@ 
  *
  * @param string $value The Redlink application name.
  */
-function wl_configuration_set_redlink_application_name( $value ) {
+function wl_configuration_set_redlink_application_name($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_application_name', $value);
 }
 
 /**
@@ -252,8 +252,8 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key";
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."analyses?key=$key";
 	}
 
 	// Otherwise use Redlink.
@@ -269,8 +269,8 @@ 
         vcard:locality = lode:atPlace/gn:name :: xsd:string;
 EOF;
 
-	return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
-	       '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
+	return wl_configuration_get_api_url()."/analysis/$analysis_name/enhance?key=$app_key".
+	       '&enhancer.engines.dereference.ldpath='.urlencode($ldpath);
 
 }
 
@@ -283,9 +283,9 @@ 
  *
  * @return string The API URI.
  */
-function wl_configuration_get_accounts_by_key_dataset_uri( $key ) {
+function wl_configuration_get_accounts_by_key_dataset_uri($key) {
 
-	return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+	return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."accounts/key=$key/dataset_uri";
 }
 
 
@@ -299,21 +299,21 @@ 
  *
  * @return string The URL to call to perform the SELECT query.
  */
-function wl_configuration_get_query_select_url( $output, $dataset = null ) {
+function wl_configuration_get_query_select_url($output, $dataset = null) {
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
+	if ( ! empty($key)) {
 		// TODO: handle the output format for WordLift.
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/queries?q=";
 	}
 
 	// If no dataset has been specified then use the default configured, otherwise use the one provided.
-	$redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
+	$redlink_dataset = (empty($dataset) ? wl_configuration_get_redlink_dataset_name() : $dataset);
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
 
 }
 
@@ -328,8 +328,8 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/queries";
 	}
 
 	// get the configuration.
@@ -337,7 +337,7 @@ 
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/sparql/update?key=$redlink_key";
 
 }
 
@@ -353,8 +353,8 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/index";
 	}
 
 	// get the configuration.
@@ -362,6 +362,6 @@ 
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/release?key=$redlink_key";
 
 }
\ No newline at end of file

src/wordlift_content_filter.php

Indentation +159 added lines, -159 removed lines

@@ -10,7 +10,7 @@ 
  * @param string $uri Uri of the entity to search in the post content.
  */
 function wl_content_embed_build_regex_from_uri( $uri ) {
-	return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
+    return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
 }
 
 /**
@@ -22,8 +22,8 @@ 
  */
 function wl_content_embed_microdata( $content ) {
 
-	// Apply microdata only to single pages.
-	/*if ( ! is_single() ) {
+    // Apply microdata only to single pages.
+    /*if ( ! is_single() ) {
 		wl_write_log( "wl_content_embed_microdata : is not single" );
 
 		return $content;
@@ -31,7 +31,7 @@ 
 
 	global $post;
         */
-	return _wl_content_embed_microdata( get_the_ID(), $content );
+    return _wl_content_embed_microdata( get_the_ID(), $content );
 }
 
 /**
@@ -44,31 +44,31 @@ 
  */
 function _wl_content_embed_microdata( $post_id, $content ) {
 
-	// If it is an entity, add its own microdata to the content.
-	if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
-		$own_uri = wl_get_entity_uri( $post_id );
-		$content .= '<span itemid="' . $own_uri . '"></span>';
-	}
+    // If it is an entity, add its own microdata to the content.
+    if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
+        $own_uri = wl_get_entity_uri( $post_id );
+        $content .= '<span itemid="' . $own_uri . '"></span>';
+    }
 
-	// Now search in the text entity mentions
-	$regex   = '/<(\\w+)[^<]* itemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
-	$matches = array();
+    // Now search in the text entity mentions
+    $regex   = '/<(\\w+)[^<]* itemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
+    $matches = array();
 
-	// Return the content if not item IDs have been found.
-	if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
-		return $content;
-	}
+    // Return the content if not item IDs have been found.
+    if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
+        return $content;
+    }
 
-	// TODO: Retrieve here just one time entities type structure to avoid multiple queries.
-	foreach ( $matches as $match ) {
-		$item_id = $match[2];
+    // TODO: Retrieve here just one time entities type structure to avoid multiple queries.
+    foreach ( $matches as $match ) {
+        $item_id = $match[2];
 
-		// wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
+        // wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
 
-		$content = wl_content_embed_item_microdata( $content, $item_id );
-	}
+        $content = wl_content_embed_item_microdata( $content, $item_id );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -82,68 +82,68 @@ 
  */
 function wl_content_embed_item_microdata( $content, $uri, $itemprop = null, $recursion_level = 0 ) {
 
-	if ( $recursion_level > wl_config_get_recursion_depth() ) {
-		wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
+    if ( $recursion_level > wl_config_get_recursion_depth() ) {
+        wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
 
-		return '';
-	}
+        return '';
+    }
 
-	$post = wl_get_entity_post_by_uri( $uri );
+    $post = wl_get_entity_post_by_uri( $uri );
 
-	// Entity not found or not published. Delete <span> tags but leave their content on page.
-	if ( null === $post || $post->post_status !== 'publish' ) {
+    // Entity not found or not published. Delete <span> tags but leave their content on page.
+    if ( null === $post || $post->post_status !== 'publish' ) {
 
-		// wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
+        // wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
 
-		// Replace the original tagging with the new tagging.
-		$regex   = wl_content_embed_build_regex_from_uri( $uri );
-		$content = preg_replace( $regex, '$2', $content );
+        // Replace the original tagging with the new tagging.
+        $regex   = wl_content_embed_build_regex_from_uri( $uri );
+        $content = preg_replace( $regex, '$2', $content );
 
-		return $content;
-	}
+        return $content;
+    }
 
-	// Get the entity URI and its escaped version for the regex.
-	$entity_uri = wl_get_entity_uri( $post->ID );
-	// Get the main type.
-	$main_type = wl_entity_type_taxonomy_get_type( $post->ID );
+    // Get the entity URI and its escaped version for the regex.
+    $entity_uri = wl_get_entity_uri( $post->ID );
+    // Get the main type.
+    $main_type = wl_entity_type_taxonomy_get_type( $post->ID );
 
-	// Set the item type if available.
-	$item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
+    // Set the item type if available.
+    $item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
 
-	// Define attribute itemprop if this entity is nested.
-	if ( ! is_null( $itemprop ) ) {
-		$itemprop = ' itemprop="' . $itemprop . '"';
-	}
+    // Define attribute itemprop if this entity is nested.
+    if ( ! is_null( $itemprop ) ) {
+        $itemprop = ' itemprop="' . $itemprop . '"';
+    }
 
-	// Get additional properties (this may imply a recursion of this method on a sub-entity).
-	$additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
+    // Get additional properties (this may imply a recursion of this method on a sub-entity).
+    $additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
 
-	$same_as = '';
-	// Get the array of sameAs uris.
-	$same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
-	// Prepare the sameAs fragment.
-	foreach ( $same_as_uris as $same_as_uri ) {
-		$same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
-	}
+    $same_as = '';
+    // Get the array of sameAs uris.
+    $same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
+    // Prepare the sameAs fragment.
+    foreach ( $same_as_uris as $same_as_uri ) {
+        $same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
+    }
 
-	// Get the entity URL.
-	$permalink = get_permalink( $post->ID );
-	$url       = '<link itemprop="url" href="' . $permalink . '" />';
+    // Get the entity URL.
+    $permalink = get_permalink( $post->ID );
+    $url       = '<link itemprop="url" href="' . $permalink . '" />';
 
-	// Replace the original tagging with the new tagging.
-	$regex   = wl_content_embed_build_regex_from_uri( $uri );
-	$content = preg_replace( $regex,
-		'<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
-		. $same_as
-		. $additional_properties
-		. $url
-		. '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
-		$content
-	);
+    // Replace the original tagging with the new tagging.
+    $regex   = wl_content_embed_build_regex_from_uri( $uri );
+    $content = preg_replace( $regex,
+        '<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
+        . $same_as
+        . $additional_properties
+        . $url
+        . '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
+        $content
+    );
 
-	// wl_write_log( "wl_content_embed_item_microdata [ uri :: $uri ][ regex :: $regex ]" );
+    // wl_write_log( "wl_content_embed_item_microdata [ uri :: $uri ][ regex :: $regex ]" );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'the_content', 'wl_content_embed_microdata' );
@@ -158,93 +158,93 @@ 
  * @return string The content with embedded microdata.
  */
 function wl_content_embed_compile_microdata_template( $entity_id, $entity_type, $recursion_level = 0 ) {
-	global $wl_logger;
-
-	if ( WP_DEBUG ) {
-		$wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
-	}
-
-	$regex   = '/{{(.*?)}}/';
-	$matches = array();
-
-	if ( null === $entity_type ) {
-		return '';
-	}
-
-	$template = $entity_type['microdata_template'];
-	// Return empty string if template fields have not been found.
-	if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
-		return '';
-	}
-
-	foreach ( $matches as $match ) {
-
-		$placeholder = $match[0];
-		$field_name  = $match[1];
-
-		// Get property value.
-		$meta_collection = wl_schema_get_value( $entity_id, $field_name );
-
-		// If no value is given, just remove the placeholder from the template
-		if ( null == $meta_collection ) {
-			$template = str_replace( $placeholder, '', $template );
-			continue;
-		}
-
-		// What kind of value is it?
-		// TODO: Performance issue here: meta type retrieving should be centralized
-		$expected_type = wl_get_meta_type( $field_name );
-
-		if ( WP_DEBUG ) {
-			$wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
-		}
-
-		foreach ( $meta_collection as $field_value ) {
-
-			// Quick and dirty patch for #163:
-			//  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
-			//  - check that $field_value is actually a number,
-			//  - check that the referenced post is published.
-			//  OR
-			//  - if the value is empty then we don't display it.
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
-			     || empty( $field_value )
-			) {
-
-				if ( WP_DEBUG ) {
-					$wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
-				}
-
-				// Remove the placeholder.
-				$template = str_replace( $placeholder, '', $template );
-				continue;
-			}
-
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
-				// If is a numeric value we assume it is an ID referencing for an internal entity.
-				if ( is_numeric( $field_value ) ) {
-					// Found id, get uri.
-					$field_value = wl_get_entity_uri( $field_value );
-				}
-				// Just if the linked entity does exist I can go further with template compiling
-				$nested_entity = wl_get_entity_post_by_uri( $field_value );
-				if ( ! is_null( $nested_entity ) ) {
-					$content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
-					$compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
-					$template          = str_replace( $placeholder, $compiled_template, $template );
-				} else {
-					$template = str_replace( $placeholder, '', $template );
-				}
-				continue;
-			}
-
-			// Standard condition: field containing a raw value
-			// For non visible test, schema.org dictates to use the *meta* tag.
-			// see http://schema.org/docs/gs.html#advanced_missing
-			$value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
-			$template = str_replace( $placeholder, $value, $template );
-		}
-	}
-
-	return $template;
+    global $wl_logger;
+
+    if ( WP_DEBUG ) {
+        $wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
+    }
+
+    $regex   = '/{{(.*?)}}/';
+    $matches = array();
+
+    if ( null === $entity_type ) {
+        return '';
+    }
+
+    $template = $entity_type['microdata_template'];
+    // Return empty string if template fields have not been found.
+    if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
+        return '';
+    }
+
+    foreach ( $matches as $match ) {
+
+        $placeholder = $match[0];
+        $field_name  = $match[1];
+
+        // Get property value.
+        $meta_collection = wl_schema_get_value( $entity_id, $field_name );
+
+        // If no value is given, just remove the placeholder from the template
+        if ( null == $meta_collection ) {
+            $template = str_replace( $placeholder, '', $template );
+            continue;
+        }
+
+        // What kind of value is it?
+        // TODO: Performance issue here: meta type retrieving should be centralized
+        $expected_type = wl_get_meta_type( $field_name );
+
+        if ( WP_DEBUG ) {
+            $wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
+        }
+
+        foreach ( $meta_collection as $field_value ) {
+
+            // Quick and dirty patch for #163:
+            //  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
+            //  - check that $field_value is actually a number,
+            //  - check that the referenced post is published.
+            //  OR
+            //  - if the value is empty then we don't display it.
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
+                 || empty( $field_value )
+            ) {
+
+                if ( WP_DEBUG ) {
+                    $wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
+                }
+
+                // Remove the placeholder.
+                $template = str_replace( $placeholder, '', $template );
+                continue;
+            }
+
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
+                // If is a numeric value we assume it is an ID referencing for an internal entity.
+                if ( is_numeric( $field_value ) ) {
+                    // Found id, get uri.
+                    $field_value = wl_get_entity_uri( $field_value );
+                }
+                // Just if the linked entity does exist I can go further with template compiling
+                $nested_entity = wl_get_entity_post_by_uri( $field_value );
+                if ( ! is_null( $nested_entity ) ) {
+                    $content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
+                    $compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
+                    $template          = str_replace( $placeholder, $compiled_template, $template );
+                } else {
+                    $template = str_replace( $placeholder, '', $template );
+                }
+                continue;
+            }
+
+            // Standard condition: field containing a raw value
+            // For non visible test, schema.org dictates to use the *meta* tag.
+            // see http://schema.org/docs/gs.html#advanced_missing
+            $value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
+            $template = str_replace( $placeholder, $value, $template );
+        }
+    }
+
+    return $template;
 }
\ No newline at end of file

Spacing +62 added lines, -62 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param string $uri Uri of the entity to search in the post content.
  */
-function wl_content_embed_build_regex_from_uri( $uri ) {
-	return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
+function wl_content_embed_build_regex_from_uri($uri) {
+	return '|<(\\w+)[^<]* itemid=\"'.esc_attr($uri).'\"[^>]*>([^<]*)<\\/\\1>|i';
 }
 
 /**
@@ -20,7 +20,7 @@ 
  *
  * @return string The updated post content.
  */
-function wl_content_embed_microdata( $content ) {
+function wl_content_embed_microdata($content) {
 
 	// Apply microdata only to single pages.
 	/*if ( ! is_single() ) {
@@ -31,7 +31,7 @@ 
 
 	global $post;
         */
-	return _wl_content_embed_microdata( get_the_ID(), $content );
+	return _wl_content_embed_microdata(get_the_ID(), $content);
 }
 
 /**
@@ -42,12 +42,12 @@ 
  *
  * @return string The updated post content.
  */
-function _wl_content_embed_microdata( $post_id, $content ) {
+function _wl_content_embed_microdata($post_id, $content) {
 
 	// If it is an entity, add its own microdata to the content.
-	if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
-		$own_uri = wl_get_entity_uri( $post_id );
-		$content .= '<span itemid="' . $own_uri . '"></span>';
+	if (get_post_type($post_id) == Wordlift_Entity_Service::TYPE_NAME) {
+		$own_uri = wl_get_entity_uri($post_id);
+		$content .= '<span itemid="'.$own_uri.'"></span>';
 	}
 
 	// Now search in the text entity mentions
@@ -55,17 +55,17 @@ 
 	$matches = array();
 
 	// Return the content if not item IDs have been found.
-	if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
+	if (false === preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
 		return $content;
 	}
 
 	// TODO: Retrieve here just one time entities type structure to avoid multiple queries.
-	foreach ( $matches as $match ) {
+	foreach ($matches as $match) {
 		$item_id = $match[2];
 
 		// wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
 
-		$content = wl_content_embed_item_microdata( $content, $item_id );
+		$content = wl_content_embed_item_microdata($content, $item_id);
 	}
 
 	return $content;
@@ -80,64 +80,64 @@ 
  *
  * @return string The content with embedded microdata.
  */
-function wl_content_embed_item_microdata( $content, $uri, $itemprop = null, $recursion_level = 0 ) {
+function wl_content_embed_item_microdata($content, $uri, $itemprop = null, $recursion_level = 0) {
 
-	if ( $recursion_level > wl_config_get_recursion_depth() ) {
-		wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
+	if ($recursion_level > wl_config_get_recursion_depth()) {
+		wl_write_log("recursion depth limit exceeded [ level :: $recursion_level ][ max :: ".wl_config_get_recursion_depth()." ]");
 
 		return '';
 	}
 
-	$post = wl_get_entity_post_by_uri( $uri );
+	$post = wl_get_entity_post_by_uri($uri);
 
 	// Entity not found or not published. Delete <span> tags but leave their content on page.
-	if ( null === $post || $post->post_status !== 'publish' ) {
+	if (null === $post || $post->post_status !== 'publish') {
 
 		// wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
 
 		// Replace the original tagging with the new tagging.
-		$regex   = wl_content_embed_build_regex_from_uri( $uri );
-		$content = preg_replace( $regex, '$2', $content );
+		$regex   = wl_content_embed_build_regex_from_uri($uri);
+		$content = preg_replace($regex, '$2', $content);
 
 		return $content;
 	}
 
 	// Get the entity URI and its escaped version for the regex.
-	$entity_uri = wl_get_entity_uri( $post->ID );
+	$entity_uri = wl_get_entity_uri($post->ID);
 	// Get the main type.
-	$main_type = wl_entity_type_taxonomy_get_type( $post->ID );
+	$main_type = wl_entity_type_taxonomy_get_type($post->ID);
 
 	// Set the item type if available.
-	$item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
+	$item_type = (null === $main_type ? '' : ' itemtype="'.esc_attr($main_type['uri']).'"');
 
 	// Define attribute itemprop if this entity is nested.
-	if ( ! is_null( $itemprop ) ) {
-		$itemprop = ' itemprop="' . $itemprop . '"';
+	if ( ! is_null($itemprop)) {
+		$itemprop = ' itemprop="'.$itemprop.'"';
 	}
 
 	// Get additional properties (this may imply a recursion of this method on a sub-entity).
-	$additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
+	$additional_properties = wl_content_embed_compile_microdata_template($post->ID, $main_type, $recursion_level);
 
 	$same_as = '';
 	// Get the array of sameAs uris.
-	$same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
+	$same_as_uris = wl_schema_get_value($post->ID, 'sameAs');
 	// Prepare the sameAs fragment.
-	foreach ( $same_as_uris as $same_as_uri ) {
+	foreach ($same_as_uris as $same_as_uri) {
 		$same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
 	}
 
 	// Get the entity URL.
-	$permalink = get_permalink( $post->ID );
-	$url       = '<link itemprop="url" href="' . $permalink . '" />';
+	$permalink = get_permalink($post->ID);
+	$url       = '<link itemprop="url" href="'.$permalink.'" />';
 
 	// Replace the original tagging with the new tagging.
-	$regex   = wl_content_embed_build_regex_from_uri( $uri );
-	$content = preg_replace( $regex,
-		'<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
+	$regex   = wl_content_embed_build_regex_from_uri($uri);
+	$content = preg_replace($regex,
+		'<$1'.$itemprop.' itemscope'.$item_type.' itemid="'.esc_attr($entity_uri).'">'
 		. $same_as
 		. $additional_properties
 		. $url
-		. '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
+		. '<a class="wl-entity-page-link" href="'.$permalink.'" itemprop="name" content="'.$post->post_title.'">'.(is_null($itemprop) ? '$2' : '').'</a></$1>', //Only print name inside <span> for top-level entities
 		$content
 	);
 
@@ -146,7 +146,7 @@ 
 	return $content;
 }
 
-add_filter( 'the_content', 'wl_content_embed_microdata' );
+add_filter('the_content', 'wl_content_embed_microdata');
 
 /**
  * Fills up the microdata_template with entity's values.
@@ -157,49 +157,49 @@ 
  *
  * @return string The content with embedded microdata.
  */
-function wl_content_embed_compile_microdata_template( $entity_id, $entity_type, $recursion_level = 0 ) {
+function wl_content_embed_compile_microdata_template($entity_id, $entity_type, $recursion_level = 0) {
 	global $wl_logger;
 
-	if ( WP_DEBUG ) {
-		$wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
+	if (WP_DEBUG) {
+		$wl_logger->trace("Embedding microdata [ entity id :: $entity_id ][ entity type :: ".var_export($entity_type, true)." ][ recursion level :: $recursion_level ]");
 	}
 
 	$regex   = '/{{(.*?)}}/';
 	$matches = array();
 
-	if ( null === $entity_type ) {
+	if (null === $entity_type) {
 		return '';
 	}
 
 	$template = $entity_type['microdata_template'];
 	// Return empty string if template fields have not been found.
-	if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
+	if (false === preg_match_all($regex, $template, $matches, PREG_SET_ORDER)) {
 		return '';
 	}
 
-	foreach ( $matches as $match ) {
+	foreach ($matches as $match) {
 
 		$placeholder = $match[0];
 		$field_name  = $match[1];
 
 		// Get property value.
-		$meta_collection = wl_schema_get_value( $entity_id, $field_name );
+		$meta_collection = wl_schema_get_value($entity_id, $field_name);
 
 		// If no value is given, just remove the placeholder from the template
-		if ( null == $meta_collection ) {
-			$template = str_replace( $placeholder, '', $template );
+		if (null == $meta_collection) {
+			$template = str_replace($placeholder, '', $template);
 			continue;
 		}
 
 		// What kind of value is it?
 		// TODO: Performance issue here: meta type retrieving should be centralized
-		$expected_type = wl_get_meta_type( $field_name );
+		$expected_type = wl_get_meta_type($field_name);
 
-		if ( WP_DEBUG ) {
-			$wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
+		if (WP_DEBUG) {
+			$wl_logger->trace("Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: ".(is_array($meta_collection) ? var_export($meta_collection, true) : $meta_collection)." ][ expected type :: $expected_type ]");
 		}
 
-		foreach ( $meta_collection as $field_value ) {
+		foreach ($meta_collection as $field_value) {
 
 			// Quick and dirty patch for #163:
 			//  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
@@ -207,33 +207,33 @@ 
 			//  - check that the referenced post is published.
 			//  OR
 			//  - if the value is empty then we don't display it.
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
-			     || empty( $field_value )
+			if (Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric($field_value) && 'publish' !== ($post_status = get_post_status($field_value))
+			     || empty($field_value)
 			) {
 
-				if ( WP_DEBUG ) {
-					$wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
+				if (WP_DEBUG) {
+					$wl_logger->trace("Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]");
 				}
 
 				// Remove the placeholder.
-				$template = str_replace( $placeholder, '', $template );
+				$template = str_replace($placeholder, '', $template);
 				continue;
 			}
 
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
+			if (Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type) {
 				// If is a numeric value we assume it is an ID referencing for an internal entity.
-				if ( is_numeric( $field_value ) ) {
+				if (is_numeric($field_value)) {
 					// Found id, get uri.
-					$field_value = wl_get_entity_uri( $field_value );
+					$field_value = wl_get_entity_uri($field_value);
 				}
 				// Just if the linked entity does exist I can go further with template compiling
-				$nested_entity = wl_get_entity_post_by_uri( $field_value );
-				if ( ! is_null( $nested_entity ) ) {
-					$content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
-					$compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
-					$template          = str_replace( $placeholder, $compiled_template, $template );
+				$nested_entity = wl_get_entity_post_by_uri($field_value);
+				if ( ! is_null($nested_entity)) {
+					$content           = '<span itemid="'.esc_attr($field_value).'">'.$nested_entity->post_title.'</span>';
+					$compiled_template = wl_content_embed_item_microdata($content, $field_value, $field_name, ++ $recursion_level);
+					$template          = str_replace($placeholder, $compiled_template, $template);
 				} else {
-					$template = str_replace( $placeholder, '', $template );
+					$template = str_replace($placeholder, '', $template);
 				}
 				continue;
 			}
@@ -241,8 +241,8 @@ 
 			// Standard condition: field containing a raw value
 			// For non visible test, schema.org dictates to use the *meta* tag.
 			// see http://schema.org/docs/gs.html#advanced_missing
-			$value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
-			$template = str_replace( $placeholder, $value, $template );
+			$value    = '<meta itemprop="'.esc_attr($field_name).'" content="'.esc_attr($field_value).'" />';
+			$template = str_replace($placeholder, $value, $template);
 		}
 	}