insideout10 / wordlift-plugin

src/modules/configuration/wordlift_configuration.php

Doc Comments +1 added lines, -1 removed lines

@@ -445,7 +445,7 @@
  *
  * @since 3.0.0
  *
- * @return bool True if the configuration is set otherwise false.
+ * @return boolean|null True if the configuration is set otherwise false.
  */
 function wl_configuration_validate() {
 

Indentation +250 added lines, -250 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,163 +108,163 @@ 
  */
 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_ENABLE_COLOR_CODING_ON_FRONTEND_NAME,
-		__( 'Enable color coding on front-end', 'wordlift' ),
-		'wl_configuration_checkbox',
-		'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-enable-color-coding',
-			'name'        => 'wl_general_settings[enable_color_coding]',
-			'value'       => wl_configuration_get_enable_color_coding(),
-			'description' => __( 'Enable color coding', '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_ENABLE_COLOR_CODING_ON_FRONTEND_NAME,
+        __( 'Enable color coding on front-end', 'wordlift' ),
+        'wl_configuration_checkbox',
+        '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-enable-color-coding',
+            'name'        => 'wl_general_settings[enable_color_coding]',
+            'value'       => wl_configuration_get_enable_color_coding(),
+            'description' => __( 'Enable color coding', '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' );
@@ -276,8 +276,8 @@ 
  */
 function wl_configuration_general_settings_section_callback() {
 
-	// TODO: set the following text.
-	?>
+    // TODO: set the following text.
+    ?>
 	Configure WordLift general options.
 	<?php
 }
@@ -289,8 +289,8 @@ 
  */
 function wl_configuration_advanced_settings_section_callback() {
 
-	// TODO: set the following text.
-	?>
+    // TODO: set the following text.
+    ?>
 	Configure WordLift advanced options.
 	<?php
 }
@@ -306,8 +306,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 );
 
 }
 
@@ -319,7 +319,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'] ); ?>"
@@ -336,15 +336,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>
 
@@ -359,7 +359,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'] ); ?>"
@@ -379,10 +379,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.
@@ -398,27 +398,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;
 
 }
 
@@ -430,13 +430,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 );
 }
 
 
@@ -449,13 +449,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' ) );
 
 }
 
@@ -471,37 +471,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 +123 added lines, -123 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_ENABLE_COLOR_CODING_ON_FRONTEND_NAME,
-		__( 'Enable color coding on front-end', 'wordlift' ),
+		__('Enable color coding on front-end', 'wordlift'),
 		'wl_configuration_checkbox',
 		'wl_general_settings',
 		'wl_general_settings_section',
@@ -145,14 +145,14 @@ 
 			'id'          => 'wl-enable-color-coding',
 			'name'        => 'wl_general_settings[enable_color_coding]',
 			'value'       => wl_configuration_get_enable_color_coding(),
-			'description' => __( 'Enable color coding', 'wordlift' )
+			'description' => __('Enable color coding', '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',
@@ -160,13 +160,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',
@@ -175,99 +175,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*.
@@ -304,10 +304,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);
 
 }
 
@@ -318,12 +318,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
 }
@@ -335,16 +335,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>
 
@@ -358,12 +358,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
 }
@@ -377,16 +377,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');
 
 
 /**
@@ -402,21 +402,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;
 
@@ -431,12 +431,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);
 }
 
 
@@ -450,16 +450,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.
@@ -469,40 +469,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/admin/class-wordlift-notice-service.php

Indentation +137 added lines, -137 removed lines

@@ -7,142 +7,142 @@
  */
 class Wordlift_Notice_Service {
 
-	/**
-	 * The template used to display notices. The <em>notice dismissible</em> style classes make this notice dismissible
-	 * on the WordPress UI (via a small X button on the right side of the notice).
-	 *
-	 * @since 3.2.0
-	 */
-	const TEMPLATE = '<div class="wl-notice notice is-dismissible %s"><p>%s</p></div>';
-
-	/**
-	 * The standard WordPress <em>update</em> style class.
-	 *
-	 * @since 3.2.0
-	 */
-	const UPDATE = 'update';
-
-	/**
-	 * The standard WordPress <em>update-nag</em> style class.
-	 *
-	 * @since 3.2.0
-	 */
-	const UPDATE_NAG = 'update-nag';
-
-	/**
-	 * The standard WordPress <em>error</em> style class.
-	 *
-	 * @since 3.2.0
-	 */
-	const ERROR = 'error';
-
-	/**
-	 * The array of notices.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var array $notices The array of notices.
-	 */
-	private $notices = array();
-
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of the Notice service.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct() {
-
-		// Hook to be called when to display notices.
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @since 3.2.0
-	 * @return \Wordlift_Notice_Service The singleton instance of the Notice service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Add a notice.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $class The css class.
-	 * @param string $message The message.
-	 */
-	public function add( $class, $message ) {
-
-		$this->notices[] = sprintf( self::TEMPLATE, $class, $message );
-
-	}
-
-	/**
-	 * Add an update notice (message with a white background and a green left border).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $message The message to display.
-	 */
-	public function add_update( $message ) {
-
-		$this->add( self::UPDATE, $message );
-
-	}
-
-	/**
-	 * Add an update nag notice (message with a white background and a yellow left border).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $message The message to display.
-	 */
-	public function add_update_nag( $message ) {
-
-		$this->add( self::UPDATE_NAG, $message );
-
-	}
-
-	/**
-	 * Add an error notice (message with a white background and a red left border).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $message The message to display.
-	 */
-	public function add_error( $message ) {
-
-		$this->add( self::ERROR, $message );
-
-	}
-
-	/**
-	 * Print out the notices when the admin_notices action is called.
-	 *
-	 * @since 3.2.0
-	 */
-	public function admin_notices() {
-
-		foreach ( $this->notices as $notice ) {
-			echo( $notice );
-		}
-
-	}
+    /**
+     * The template used to display notices. The <em>notice dismissible</em> style classes make this notice dismissible
+     * on the WordPress UI (via a small X button on the right side of the notice).
+     *
+     * @since 3.2.0
+     */
+    const TEMPLATE = '<div class="wl-notice notice is-dismissible %s"><p>%s</p></div>';
+
+    /**
+     * The standard WordPress <em>update</em> style class.
+     *
+     * @since 3.2.0
+     */
+    const UPDATE = 'update';
+
+    /**
+     * The standard WordPress <em>update-nag</em> style class.
+     *
+     * @since 3.2.0
+     */
+    const UPDATE_NAG = 'update-nag';
+
+    /**
+     * The standard WordPress <em>error</em> style class.
+     *
+     * @since 3.2.0
+     */
+    const ERROR = 'error';
+
+    /**
+     * The array of notices.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var array $notices The array of notices.
+     */
+    private $notices = array();
+
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of the Notice service.
+     *
+     * @since 3.2.0
+     */
+    public function __construct() {
+
+        // Hook to be called when to display notices.
+        add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @since 3.2.0
+     * @return \Wordlift_Notice_Service The singleton instance of the Notice service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Add a notice.
+     *
+     * @since 3.2.0
+     *
+     * @param string $class The css class.
+     * @param string $message The message.
+     */
+    public function add( $class, $message ) {
+
+        $this->notices[] = sprintf( self::TEMPLATE, $class, $message );
+
+    }
+
+    /**
+     * Add an update notice (message with a white background and a green left border).
+     *
+     * @since 3.2.0
+     *
+     * @param string $message The message to display.
+     */
+    public function add_update( $message ) {
+
+        $this->add( self::UPDATE, $message );
+
+    }
+
+    /**
+     * Add an update nag notice (message with a white background and a yellow left border).
+     *
+     * @since 3.2.0
+     *
+     * @param string $message The message to display.
+     */
+    public function add_update_nag( $message ) {
+
+        $this->add( self::UPDATE_NAG, $message );
+
+    }
+
+    /**
+     * Add an error notice (message with a white background and a red left border).
+     *
+     * @since 3.2.0
+     *
+     * @param string $message The message to display.
+     */
+    public function add_error( $message ) {
+
+        $this->add( self::ERROR, $message );
+
+    }
+
+    /**
+     * Print out the notices when the admin_notices action is called.
+     *
+     * @since 3.2.0
+     */
+    public function admin_notices() {
+
+        foreach ( $this->notices as $notice ) {
+            echo( $notice );
+        }
+
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -62,7 +62,7 @@ 
 	public function __construct() {
 
 		// Hook to be called when to display notices.
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
 
 		self::$instance = $this;
 
@@ -87,9 +87,9 @@ 
 	 * @param string $class The css class.
 	 * @param string $message The message.
 	 */
-	public function add( $class, $message ) {
+	public function add($class, $message) {
 
-		$this->notices[] = sprintf( self::TEMPLATE, $class, $message );
+		$this->notices[] = sprintf(self::TEMPLATE, $class, $message);
 
 	}
 
@@ -100,9 +100,9 @@ 
 	 *
 	 * @param string $message The message to display.
 	 */
-	public function add_update( $message ) {
+	public function add_update($message) {
 
-		$this->add( self::UPDATE, $message );
+		$this->add(self::UPDATE, $message);
 
 	}
 
@@ -113,9 +113,9 @@ 
 	 *
 	 * @param string $message The message to display.
 	 */
-	public function add_update_nag( $message ) {
+	public function add_update_nag($message) {
 
-		$this->add( self::UPDATE_NAG, $message );
+		$this->add(self::UPDATE_NAG, $message);
 
 	}
 
@@ -126,9 +126,9 @@ 
 	 *
 	 * @param string $message The message to display.
 	 */
-	public function add_error( $message ) {
+	public function add_error($message) {
 
-		$this->add( self::ERROR, $message );
+		$this->add(self::ERROR, $message);
 
 	}
 
@@ -139,8 +139,8 @@ 
 	 */
 	public function admin_notices() {
 
-		foreach ( $this->notices as $notice ) {
-			echo( $notice );
+		foreach ($this->notices as $notice) {
+			echo($notice);
 		}
 
 	}

src/includes/class-wordlift.php

Indentation +346 added lines, -346 removed lines

@@ -29,351 +29,351 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since 3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-
-		$this->version = '3.2.0-dev';
-
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		$this->loader = new Wordlift_Loader();
-
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
-
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
-
-		// Create an instance of the Schema service.
-		new Wordlift_Schema_Service();
-
-		$this->entity_service = new Wordlift_Entity_Service();
-
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
-
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
-
-		// Create an instance of the Timeline shortcode.
-		new Wordlift_Timeline_Shortcode();
-
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
-
-		// Create an instance of the Notice service.
-		$notice_service = new Wordlift_Notice_Service();
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
-
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
-
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
-
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since 3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+
+        $this->version = '3.2.0-dev';
+
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+
+        $this->loader = new Wordlift_Loader();
+
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
+
+        // Create an instance of the Schema service.
+        new Wordlift_Schema_Service();
+
+        $this->entity_service = new Wordlift_Entity_Service();
+
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
+
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+
+        // Create an instance of the Timeline shortcode.
+        new Wordlift_Timeline_Shortcode();
+
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
+
+        // Create an instance of the Notice service.
+        $notice_service = new Wordlift_Notice_Service();
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
+
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -155,90 +155,90 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
 		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
@@ -252,7 +252,7 @@ 
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
@@ -278,9 +278,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -293,24 +293,24 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 	}
 
@@ -323,17 +323,17 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 	}
 
 	/**