insideout10 / wordlift-plugin

src/admin/WL_Metabox/WL_Metabox_Field_coordinates.php

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
 
 class WL_Metabox_Field_coordinates extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
+	public function __construct($args) {
 
 		// Just set up the necessary info without calling the parent constructor.
 		// TODO: write a parent class for grouped properties
@@ -15,7 +15,7 @@ 
 
 	public function get_data() {
 		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
+		$this->data = wl_get_coordinates($entity_id);
 	}
 
 	public function html() {
@@ -33,20 +33,20 @@ 
 		$data        = $this->data;
 		// TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
 		// want to use the current user location for the marker.
-		$coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
+		$coordinates = ( ! empty($data['latitude']) && ! empty($data['longitude']) ? sprintf('[%f,%f]', $data['latitude'], $data['longitude']) : '[0,0]');
 		$map_init    = '[0,0]' === $coordinates
 			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+			: sprintf("setView( [%f,%f], 9 )", $data['latitude'], $data['longitude']);
 
 		// Print input fields
-		$html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lat">'.__('Latitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="'.$data['latitude'].'" style="width:100%" />';
 
-		$html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lon">'.__('Longitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="'.$data['longitude'].'" style="width:100%" />';
 
 		// Show Leaflet map to pick coordinates
-		$element_id = uniqid( 'wl-gep-map-' );
+		$element_id = uniqid('wl-gep-map-');
 		$html .= <<<EOF
 
 <div id="$element_id"></div>
@@ -84,23 +84,23 @@ 
 		return $html;
 	}
 
-	public function save_data( $coords ) {
+	public function save_data($coords) {
 
-		$this->sanitize_data( $coords );
+		$this->sanitize_data($coords);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE);
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE);
 
 		$latitude  = $this->data[0];
 		$longitude = $this->data[1];
 
 		// insert new coordinate values
-		if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
+		if ( ! empty($latitude) && ! empty($longitude)) {
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true);
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true);
 		}
 
 	}
@@ -108,11 +108,11 @@ 
 	/**
 	 * Only accept float numbers
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 		// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-		if ( ! is_numeric( $value ) ) {
+		if ( ! is_numeric($value)) {
 			return '';
 		}
 

src/admin/wordlift_admin_ajax_related_posts.php

Spacing +20 added lines, -20 removed lines

@@ -1,54 +1,54 @@
 <?php
 
-function wordlift_ajax_related_posts( $http_raw_data = null ) {
+function wordlift_ajax_related_posts($http_raw_data = null) {
     
     // Extract filtering conditions
-    if( !isset( $_GET["post_id"] ) || !is_numeric( $_GET["post_id"] ) ) {
+    if ( ! isset($_GET["post_id"]) || ! is_numeric($_GET["post_id"])) {
         wp_die('Post id missing or invalid!');
         return;
     }
 
     $post_id = $_GET["post_id"]; 
     // Get the current post
-    $post = get_post( $post_id );
+    $post = get_post($post_id);
 
-    wl_write_log( "Going to find posts related to current with post id: $post_id ..." );
+    wl_write_log("Going to find posts related to current with post id: $post_id ...");
     
     // Extract filtering conditions
-    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents("php://input") : $http_raw_data;
-    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+    $filtering_entity_uris = (null == $http_raw_data) ? file_get_contents("php://input") : $http_raw_data;
+    $filtering_entity_uris = json_decode($filtering_entity_uris);
    
-    $filtering_entity_ids = wl_get_entity_post_ids_by_uris( $filtering_entity_uris );
+    $filtering_entity_ids = wl_get_entity_post_ids_by_uris($filtering_entity_uris);
     $related_posts = array();
     
     // If the current post is an antity 
     // related posts to the current entity are returned
-    if ( Wordlift_Entity_Service::TYPE_NAME == $post->post_type ) {
-        $filtering_entity_ids = array( $post_id );        
+    if (Wordlift_Entity_Service::TYPE_NAME == $post->post_type) {
+        $filtering_entity_ids = array($post_id);        
     }
 
-    if ( !empty( $filtering_entity_ids ) ) {
+    if ( ! empty($filtering_entity_ids)) {
     
-        $related_posts = wl_core_get_posts( array(
+        $related_posts = wl_core_get_posts(array(
             'get'             =>    'posts',  
             'related_to__in'  =>    $filtering_entity_ids,
-            'post__not_in'    =>    array( $post_id ),
+            'post__not_in'    =>    array($post_id),
             'post_type'       =>    'post',
             'post_status'     =>    'publish',
             'as'              =>    'subject',
-        ) );
+        ));
         
-        foreach ( $related_posts as $post_obj ) {
+        foreach ($related_posts as $post_obj) {
                 
-            $thumbnail = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-            $post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH; 
-            $post_obj->link = get_edit_post_link( $post_obj->ID, 'none' );  
-            $post_obj->permalink = get_post_permalink( $post_obj->ID );  
+            $thumbnail = wp_get_attachment_url(get_post_thumbnail_id($post_obj->ID, 'thumbnail'));
+            $post_obj->thumbnail = ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH; 
+            $post_obj->link = get_edit_post_link($post_obj->ID, 'none');  
+            $post_obj->permalink = get_post_permalink($post_obj->ID);  
         
         }
     }
 
-    wl_core_send_json( $related_posts );
+    wl_core_send_json($related_posts);
 }
 
-add_action( 'wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts' );
+add_action('wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts');

src/admin/wordlift_admin_save_post.php

Spacing +36 added lines, -36 removed lines

@@ -21,25 +21,25 @@ 
  * @param string $old_status The old post status
  * @param array $post An array with the post data
  */
-function wl_transition_post_status( $new_status, $old_status, $post ) {
+function wl_transition_post_status($new_status, $old_status, $post) {
 
 	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
 
 	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
-		rl_delete_post( $post );
+	if ('publish' === $old_status && 'publish' !== $new_status) {
+		rl_delete_post($post);
 	}
 
 	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
+	if ('publish' !== $old_status && 'publish' === $new_status) {
+		foreach (wl_core_get_related_entity_ids($post->ID) as $entity_id) {
+			wl_update_post_status($entity_id, 'publish');
 		}
 	}
 }
 
 // hook save events.
-add_action( 'transition_post_status', 'wl_transition_post_status', 10, 3 );
+add_action('transition_post_status', 'wl_transition_post_status', 10, 3);
 
 
 /**
@@ -47,51 +47,51 @@ 
  *
  * @param array|int $post An array of post data
  */
-function rl_delete_post( $post ) {
+function rl_delete_post($post) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+	$post_id = (is_numeric($post) ? $post : $post->ID);
 
 	// hide all entities that are not referenced by any published post.
-	foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
+	foreach (wl_core_get_related_entity_ids($post_id) as $entity_id) {
 
 		// check if there is at least one referencing post published.
-		$is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
-                    $post = get_post( $item );
-                    return ( $carry || ( 'publish' === $post->post_status ) );
+		$is_published = array_reduce(wl_core_get_related_post_ids($entity_id), function($carry, $item) {
+                    $post = get_post($item);
+                    return ($carry || ('publish' === $post->post_status));
 		} );
 		// set the entity to draft if no referencing posts are published.
-		if ( ! $is_published ) {
-			wl_update_post_status( $entity_id, 'draft' );
+		if ( ! $is_published) {
+			wl_update_post_status($entity_id, 'draft');
 		}
 	}
 
 	// get the entity URI (valid also for posts)
-	$uri_esc = wl_sparql_escape_uri( wl_get_entity_uri( $post_id ) );
+	$uri_esc = wl_sparql_escape_uri(wl_get_entity_uri($post_id));
 
-	wl_write_log( "rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]" );
+	wl_write_log("rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]");
 
 	// create the SPARQL statement by joining the SPARQL prefixes and deleting any known predicate.
 	$stmt = rl_sparql_prefixes();
-	foreach ( wl_predicates() as $predicate ) {
-		$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n" .
+	foreach (wl_predicates() as $predicate) {
+		$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n".
 		         "DELETE { ?s $predicate <$uri_esc> . } WHERE { ?s $predicate <$uri_esc> . };\n";
 	}
 
 	// if the post is an entity and has exported properties, delete the related predicates.
-	if ( Wordlift_Entity_Service::TYPE_NAME === $post->post_type ) {
-		$type = wl_entity_type_taxonomy_get_type( $post->ID );
+	if (Wordlift_Entity_Service::TYPE_NAME === $post->post_type) {
+		$type = wl_entity_type_taxonomy_get_type($post->ID);
 
-		if ( isset( $type['custom_fields'] ) ) {
-			foreach ( $type['custom_fields'] as $field => $params ) {
+		if (isset($type['custom_fields'])) {
+			foreach ($type['custom_fields'] as $field => $params) {
 				// TODO: enclose in <> only if predicate starts with http(s)://
-				$predicate = '<' . $params['predicate'] . '>';
+				$predicate = '<'.$params['predicate'].'>';
 				$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n";
 			}
 		}
 	}
 
 	// finally execute the query.
-	rl_execute_sparql_update_query( $stmt );
+	rl_execute_sparql_update_query($stmt);
 }
 
 /**
@@ -100,36 +100,36 @@ 
  * @param int $post_id The post ID
  * @param string $status The new status
  */
-function wl_update_post_status( $post_id, $status ) {
+function wl_update_post_status($post_id, $status) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+	wl_write_log("wl_update_post_status [ post ID :: $post_id ][ status :: $status ]");
 
 	global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return;
 	}
 
-	if ( $status === $post->post_status ) {
+	if ($status === $post->post_status) {
 		return;
 	}
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => $status), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status        = $post->post_status;
 	$post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+	wp_transition_post_status($status, $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
+	do_action('wl_linked_data_save_post', $post->ID);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }
 

src/admin/wordlift_admin_shortcodes.php

Spacing +16 added lines, -16 removed lines

@@ -10,10 +10,10 @@ 
  */
 function wl_admin_shortcode_buttons() {
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
-		add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
-		add_action( 'admin_footer', 'wl_admin_inject_chord_dialog_dependencies' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript');
+		add_filter('mce_buttons', 'wl_admin_shortcode_register_buttons');
+		add_action('admin_footer', 'wl_admin_inject_chord_dialog_dependencies');
 	}
 }
 
@@ -24,9 +24,9 @@ 
  *
  * @return array The TinyMCE plugins array including WordLift shortcodes plugin.
  */
-function wl_admin_shortcode_buttons_register_tinymce_javascript( $plugin_array ) {
+function wl_admin_shortcode_buttons_register_tinymce_javascript($plugin_array) {
 
-	$plugin_array['wl_shortcodes'] = plugin_dir_url( __FILE__ ) . 'js/wordlift_shortcode_tinymce_plugin.js';
+	$plugin_array['wl_shortcodes'] = plugin_dir_url(__FILE__).'js/wordlift_shortcode_tinymce_plugin.js';
 
 	return $plugin_array;
 }
@@ -38,14 +38,14 @@ 
  *
  * @return array The buttons array including the *wl_shortcodes_menu*.
  */
-function wl_admin_shortcode_register_buttons( $buttons ) {
-	array_push( $buttons, 'wl_shortcodes_menu' );
+function wl_admin_shortcode_register_buttons($buttons) {
+	array_push($buttons, 'wl_shortcodes_menu');
 
 	return $buttons;
 }
 
 // init process for button control
-add_action( 'admin_init', 'wl_admin_shortcode_buttons' );
+add_action('admin_init', 'wl_admin_shortcode_buttons');
 
 
 /**
@@ -55,16 +55,16 @@ 
  */
 function wl_admin_inject_chord_dialog_dependencies() {
 
-	wp_enqueue_style( 'wp-color-picker' );
-	wp_enqueue_script( 'wp-color-picker' );
-	wp_enqueue_style( 'jquery-ui-slider' );
+	wp_enqueue_style('wp-color-picker');
+	wp_enqueue_script('wp-color-picker');
+	wp_enqueue_style('jquery-ui-slider');
 	// Not included by default :|
 	// TODO include jquery ui css from the plugin creates css issues on the slider
 	// wp_enqueue_style('jquery-ui-css', plugins_url( 'css/jquery-ui/jquery-ui.min.css', __FILE__ ) );
-	wp_enqueue_style( 'wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css' );
+	wp_enqueue_style('wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css');
 
-	wp_enqueue_script( 'jquery' );
-	wp_enqueue_script( 'jquery-ui-core' );
-	wp_enqueue_script( 'jquery-ui-slider' );
+	wp_enqueue_script('jquery');
+	wp_enqueue_script('jquery-ui-core');
+	wp_enqueue_script('jquery-ui-slider');
 
 }

src/admin/wordlift_admin_sync.php

Spacing +8 added lines, -8 removed lines

@@ -9,16 +9,16 @@ 
  */
 function wl_admin_sync_to_redlink() {
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'any',
-		'posts_per_page' => - 1
-	) );
+		'posts_per_page' => -1
+	));
 
-	wl_write_log( "wl_admin_sync_to_redlink [ post count :: " . sizeof( $posts ) . " ]" );
+	wl_write_log("wl_admin_sync_to_redlink [ post count :: ".sizeof($posts)." ]");
 
-	foreach ( $posts as $post ) {
-		echo esc_html( $post->post_title ) . '<br/>';
-		wl_linked_data_push_to_redlink( $post->ID );
+	foreach ($posts as $post) {
+		echo esc_html($post->post_title).'<br/>';
+		wl_linked_data_push_to_redlink($post->ID);
 	}
 
 	// Schedule the execution of SPARQL.
@@ -36,4 +36,4 @@ 
 
 }
 
-add_action( 'wp_ajax_wl_sync_to_redlink', 'wl_admin_ajax_sync_to_redlink' );
+add_action('wp_ajax_wl_sync_to_redlink', 'wl_admin_ajax_sync_to_redlink');

src/includes/class-wordlift-i18n.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		load_plugin_textdomain(
 			$this->domain,
 			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
+			dirname(dirname(plugin_basename(__FILE__))).'/languages/'
 		);
 
 	}
@@ -56,7 +56,7 @@ 
 	 * @since    1.0.0
 	 * @param    string    $domain    The domain that represents the locale of this plugin.
 	 */
-	public function set_domain( $domain ) {
+	public function set_domain($domain) {
 		$this->domain = $domain;
 	}
 

src/includes/class-wordlift-loader.php

Spacing +9 added lines, -9 removed lines

@@ -63,8 +63,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
 	 */
-	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_action($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->actions = $this->add($this->actions, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -77,8 +77,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
 	 */
-	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_filter($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->filters = $this->add($this->filters, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
 	 * @return   array                                  The collection of actions and filters registered with WordPress.
 	 */
-	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {
+	private function add($hooks, $hook, $component, $callback, $priority, $accepted_args) {
 
 		$hooks[] = array(
 			'hook'          => $hook,
@@ -116,12 +116,12 @@ 
 	 */
 	public function run() {
 
-		foreach ( $this->filters as $hook ) {
-			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->filters as $hook) {
+			add_filter($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
-		foreach ( $this->actions as $hook ) {
-			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->actions as $hook) {
+			add_action($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
 	}

src/includes/class-wordlift-log-service.php

Spacing +16 added lines, -16 removed lines

@@ -31,15 +31,15 @@ 
 	 *
 	 * @param string $class_name The class related to the logs.
 	 */
-	public function __construct( $class_name ) {
+	public function __construct($class_name) {
 
 		$this->class_name = $class_name;
 
 	}
 
-	public static function get_logger( $class_name ) {
+	public static function get_logger($class_name) {
 
-		return new Wordlift_Log_Service( $class_name );
+		return new Wordlift_Log_Service($class_name);
 
 	}
 
@@ -51,44 +51,44 @@ 
 	 * @param string $level The log level.
 	 * @param string $message The message to log.
 	 */
-	public function log( $level, $message ) {
+	public function log($level, $message) {
 
 		// If we're tracing or debugging, but the debug flag isn't set, then we don't log.
-		if ( ( self::TRACE === $level || self::DEBUG === $level ) && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
+		if ((self::TRACE === $level || self::DEBUG === $level) && ( ! defined('WP_DEBUG') || ! WP_DEBUG)) {
 			return;
 		}
 
-		error_log( sprintf( self::MESSAGE_TEMPLATE, $level, $this->class_name, $message ) );
+		error_log(sprintf(self::MESSAGE_TEMPLATE, $level, $this->class_name, $message));
 
 	}
 
-	public function error( $message ) {
+	public function error($message) {
 
-		$this->log( self::ERROR, $message );
+		$this->log(self::ERROR, $message);
 
 	}
 
-	public function warn( $message ) {
+	public function warn($message) {
 
-		$this->log( self::WARN, $message );
+		$this->log(self::WARN, $message);
 
 	}
 
-	public function info( $message ) {
+	public function info($message) {
 
-		$this->log( self::INFO, $message );
+		$this->log(self::INFO, $message);
 
 	}
 
-	public function debug( $message ) {
+	public function debug($message) {
 
-		$this->log( self::DEBUG, $message );
+		$this->log(self::DEBUG, $message);
 
 	}
 
-	public function trace( $message ) {
+	public function trace($message) {
 
-		$this->log( self::TRACE, $message );
+		$this->log(self::TRACE, $message);
 
 	}
 

src/modules/caching/wordlift_caching.php

Spacing +38 added lines, -38 removed lines

@@ -26,28 +26,28 @@ 
  * @param int $expires_in_seconds How many seconds the cache is valid.
  * @return array The remote response.
  */
-function wl_caching_remote_request( $url, $args, $refresh = false, $expires_in_seconds = 3600 ) {
+function wl_caching_remote_request($url, $args, $refresh = false, $expires_in_seconds = 3600) {
 
 	// Merge the default settings for remote queries.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), $args );
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), $args);
 
 //	echo $url . "\n";
 //	print_r( $args );
 
     // Create an hash of the request.
-    $hash = wl_caching_hash( $url, $args );
+    $hash = wl_caching_hash($url, $args);
 
     // If the document is cached, return the cached copy.
-    if ( ! $refresh && false !== ( $response = wl_caching_get( $hash ) ) ) {
+    if ( ! $refresh && false !== ($response = wl_caching_get($hash))) {
         return $response;
     }
 
     // Make the request, put the response in the cache and return it to the client.
-    $response = wp_remote_request( $url, $args );
+    $response = wp_remote_request($url, $args);
 
     // Cache only valid responses.
-    if ( ! is_wp_error( $response ) && 200 === (int)$response['response']['code'] ) {
-        wl_caching_put( $hash, $response, $expires_in_seconds );
+    if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
+        wl_caching_put($hash, $response, $expires_in_seconds);
     }
 
     return $response;
@@ -63,9 +63,9 @@ 
  * @param string $args The request parameters.
  * @return string The hash.
  */
-function wl_caching_hash( $url, $args ) {
+function wl_caching_hash($url, $args) {
 
-    return hash( 'md5', $url ) . '-' . hash( 'md5', serialize( $args ) );
+    return hash('md5', $url).'-'.hash('md5', serialize($args));
 
 }
 
@@ -81,10 +81,10 @@ 
  * @param string $hash The hash.
  * @return string|false The cache filename or false if not found.
  */
-function wl_caching_get_filename( $hash ) {
+function wl_caching_get_filename($hash) {
 
-    $files = glob( wl_caching_get_temp_path( $hash ) . '_*' );
-    if ( ! is_array( $files ) || 0 === sizeof( $files ) ) {
+    $files = glob(wl_caching_get_temp_path($hash).'_*');
+    if ( ! is_array($files) || 0 === sizeof($files)) {
         return false;
     }
 
@@ -93,19 +93,19 @@ 
 
     // Return false if the filename doesn't conform.
     $matches = array();
-    if ( 1 !== preg_match( '/_(\d+)$/', $filename, $matches ) ) {
+    if (1 !== preg_match('/_(\d+)$/', $filename, $matches)) {
         return false;
     }
 
     // echo 'time: ' . time() . ' > expires at: ' . (int)$matches[1] . "\n";
 
     // Delete the file and return false if it's expired.
-    if ( time() >= (int)$matches[1] ) {
-        wl_caching_delete_file( $filename );
+    if (time() >= (int) $matches[1]) {
+        wl_caching_delete_file($filename);
         return false;
     }
 
-    wl_write_log( "[ wl_caching ] Found a cached response [ filename :: $filename ]" );
+    wl_write_log("[ wl_caching ] Found a cached response [ filename :: $filename ]");
 
     return $filename;
 
@@ -123,10 +123,10 @@ 
  * @param string $hash The document hash
  * @return array|false The cached response or false if the document is not found in the cache.
  */
-function wl_caching_get( $hash ) {
+function wl_caching_get($hash) {
 
-    if ( false !== ( $filename = wl_caching_get_filename( $hash ) ) ) {
-        return json_decode( file_get_contents( $filename ), true );
+    if (false !== ($filename = wl_caching_get_filename($hash))) {
+        return json_decode(file_get_contents($filename), true);
     }
 
     return false;
@@ -143,7 +143,7 @@ 
  * @param array $response The response.
  * @param int $expires_in_seconds How many seconds the cache is valid.
  */
-function wl_caching_put( $hash, $response, $expires_in_seconds = 3600 ) {
+function wl_caching_put($hash, $response, $expires_in_seconds = 3600) {
 
     // Add the cached flag.
     $now                       = time();
@@ -155,14 +155,14 @@ 
 
     // According to http://stackoverflow.com/questions/804045/preferred-method-to-store-php-arrays-json-encode-vs-serialize
     // the fastest serialization/deserialization function is json_encode/json_decode
-    $filename = wl_caching_get_temp_path( $hash ) . '_' . $expires_at;
-    $pathname = dirname( $filename );
+    $filename = wl_caching_get_temp_path($hash).'_'.$expires_at;
+    $pathname = dirname($filename);
 
-    if ( ! file_exists( dirname( $pathname ) ) ) {
+    if ( ! file_exists(dirname($pathname))) {
         mkdir($pathname, 0777, true);
     }
 
-    file_put_contents( $filename, json_encode( $response ) );
+    file_put_contents($filename, json_encode($response));
 
 }
 
@@ -177,8 +177,8 @@ 
 function wl_caching_get_cache_folder() {
 
     $temp_dir = sys_get_temp_dir();
-    $temp_dir .= ( '/' === substr( $temp_dir, -1, 1 ) ? '' : '/' ); // add a trailing slash
-    return $temp_dir . 'wordlift.tmp/cache/';
+    $temp_dir .= ('/' === substr($temp_dir, -1, 1) ? '' : '/'); // add a trailing slash
+    return $temp_dir.'wordlift.tmp/cache/';
 
 }
 
@@ -193,10 +193,10 @@ 
  * @param string $hash The hash.
  * @return string The full path to the file.
  */
-function wl_caching_get_temp_path( $hash ) {
+function wl_caching_get_temp_path($hash) {
 
     // By chunking the hash we ensure we don't put too many files in the same folder
-    return wl_caching_get_cache_folder() . chunk_split( substr( $hash, 0, 15 ), 3, '/' ) . $hash;
+    return wl_caching_get_cache_folder().chunk_split(substr($hash, 0, 15), 3, '/').$hash;
 
 }
 
@@ -210,11 +210,11 @@ 
  *
  * @param string $hash The hash file.
  */
-function wl_caching_delete( $hash ) {
+function wl_caching_delete($hash) {
 
     // Delete all cached versions of the provided hash.
-    while ( false !== ( $filename = wl_caching_get_filename( $hash ) ) ) {
-        wl_caching_delete_file( $filename );
+    while (false !== ($filename = wl_caching_get_filename($hash))) {
+        wl_caching_delete_file($filename);
     }
 
 }
@@ -226,17 +226,17 @@ 
  *
  * @param string $filename The cache file to delete.
  */
-function wl_caching_delete_file( $filename ) {
+function wl_caching_delete_file($filename) {
 
     $cache_folder = wl_caching_get_cache_folder();
 
-    if ( file_exists( $filename ) ) {
-        unlink( $filename );
+    if (file_exists($filename)) {
+        unlink($filename);
     }
 
     // Delete folders contained in the cache folder - rmdir is safe: it doesn't delete non-empty folders.
-    while ( 0 === strpos( $filename = dirname( $filename ), $cache_folder ) ) {
-        @rmdir( $filename );
+    while (0 === strpos($filename = dirname($filename), $cache_folder)) {
+        @rmdir($filename);
     }
 
 }
@@ -250,8 +250,8 @@ 
  * @param array $response The response structure.
  * @return bool True if cached otherwise false.
  */
-function wl_caching_response_is_cached( $response ) {
+function wl_caching_response_is_cached($response) {
 
-    return ( is_array( $response ) && isset( $response['wl_cached'] ) && true === $response['wl_cached'] );
+    return (is_array($response) && isset($response['wl_cached']) && true === $response['wl_cached']);
 
 }
\ No newline at end of file