insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_geomap.php

Doc Comments -1 removed lines

@@ -160,7 +160,6 @@
  * @uses wl_shortcode_geomap_get_places() in order to retrieve places
  * @uses wl_shortcode_geomap_prepare_map() in order to encode retireved places in a Leaflet friendly format
  *
- * @param array $places An array of place posts.
  *
  * @return array An array of place posts.
  */

Indentation +124 added lines, -124 removed lines

@@ -18,58 +18,58 @@ 
  */
 function wl_shortcode_geomap_get_places( $post_id = null ) {
 
-	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+    // If $post_id is null or is not numeric it means this is a global geomap
+    $is_global = is_null( $post_id ) || ! is_numeric( $post_id );
 
-	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
-		$related_ids = array();
-	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
-			'status' => 'publish',
-		) );
+    // If the current one is not a global geomap, retrieve related entities ids
+    if ( $is_global ) {
+        $related_ids = array();
+    } else {
+        $related_ids = wl_core_get_related_entity_ids( $post_id, array(
+            'status' => 'publish',
+        ) );
 
-		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$related_ids[] = $post_id;
-		}
-	}
+        // Also include current entity
+        if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $related_ids[] = $post_id;
+        }
+    }
 
-	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
-	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
-		return array();
-	}
+    // If is not a global geomap, an empty $related_ids means that no entities are related to the post
+    // An empty array can be returned in this case
+    if ( ! $is_global && empty( $related_ids ) ) {
+        return array();
+    }
 
-	// Retrieve all 'published' places with geo coordinates defined
-	// If $related_ids is not empty, it's used to limit query results to the current post related places
-	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
-		'post__in'    => $related_ids,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'nopaging'    => true,
-		'post_status' => 'publish',
-		'meta_query'  => array(
-			'relation' => 'AND',
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-		),
-		'tax_query'   => array(
-			array(
-				'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'place',
-			),
-		),
-	) );
+    // Retrieve all 'published' places with geo coordinates defined
+    // If $related_ids is not empty, it's used to limit query results to the current post related places
+    // Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
+    return get_posts( array(
+        'post__in'    => $related_ids,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'nopaging'    => true,
+        'post_status' => 'publish',
+        'meta_query'  => array(
+            'relation' => 'AND',
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+        ),
+        'tax_query'   => array(
+            array(
+                'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'place',
+            ),
+        ),
+    ) );
 }
 
 /**
@@ -84,91 +84,91 @@ 
  */
 function wl_shortcode_geomap_prepare_map( $places ) {
 
-	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
-	$min_latitude  = PHP_INT_MAX;
-	$min_longitude = PHP_INT_MAX;
-	$max_latitude  = ~PHP_INT_MAX;
-	$max_longitude = ~PHP_INT_MAX;
+    // Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
+    $min_latitude  = PHP_INT_MAX;
+    $min_longitude = PHP_INT_MAX;
+    $max_latitude  = ~PHP_INT_MAX;
+    $max_longitude = ~PHP_INT_MAX;
 
-	// Prepare an empty array of POIs in geoJSON format.
-	$pois = array();
-	// And store list of points to allow Leaflet compute the optimal bounding box.
-	// The main reason for this is that geoJSON has swapped coordinates (lon. lat)
-	$boundaries = array();
+    // Prepare an empty array of POIs in geoJSON format.
+    $pois = array();
+    // And store list of points to allow Leaflet compute the optimal bounding box.
+    // The main reason for this is that geoJSON has swapped coordinates (lon. lat)
+    $boundaries = array();
 
-	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+    // Add a POI for each entity that has coordinates.
+    foreach ( $places as $entity ) {
 
-		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+        // Get the coordinates.
+        $coordinates = wl_get_coordinates( $entity->ID );
 
-		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
-			continue;
-		}
+        // Don't show the widget if the coordinates aren't set.
+        if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+            continue;
+        }
 
-		// TODO Map html rendering should be delegated to the wordlift js ui layer
-		// This function should be focused on returning pure data instead
+        // TODO Map html rendering should be delegated to the wordlift js ui layer
+        // This function should be focused on returning pure data instead
 
-		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-		) {
-			$img_src = esc_attr( $attachment[0] );
-		}
+        // Get the title, URL and thumb of the entity.
+        $title = esc_attr( $entity->post_title );
+        $link  = esc_attr( get_permalink( $entity->ID ) );
+        if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
+             false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+        ) {
+            $img_src = esc_attr( $attachment[0] );
+        }
 
-		// Build HTML popup. TODO: move thumb width in css
-		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
-		}
-		$content = $content . "</a><ul>";
-		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
-			'status' => 'publish',
-		) );
-		foreach ( $related_posts as $rp_id ) {
+        // Build HTML popup. TODO: move thumb width in css
+        $content = "<a href=$link><h6>$title</h6>";
+        if ( isset( $img_src ) ) {
+            $content = $content . "<img src=$img_src style='width:100%'/>";
+        }
+        $content = $content . "</a><ul>";
+        // Get the related posts (published) and print them in the popup.
+        $related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+            'status' => 'publish',
+        ) );
+        foreach ( $related_posts as $rp_id ) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
-		}
-		$content = $content . "</ul>";
+            $rp      = get_post( $rp_id );
+            $title   = esc_attr( $rp->post_title );
+            $link    = esc_attr( get_permalink( $rp->ID ) );
+            $content = $content . "<li><a href=$link>$title</a></li>";
+        }
+        $content = $content . "</ul>";
 
-		// Formatting POI in geoJSON.
-		// http://leafletjs.com/examples/geojson.html
-		$poi = array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
-			'geometry'   => array(
-				'type'        => 'Point',
-				'coordinates' => array(
-					// Leaflet geoJSON wants them swapped
-					$coordinates['longitude'],
-					$coordinates['latitude'],
-				),
-			),
-		);
+        // Formatting POI in geoJSON.
+        // http://leafletjs.com/examples/geojson.html
+        $poi = array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $content ),
+            'geometry'   => array(
+                'type'        => 'Point',
+                'coordinates' => array(
+                    // Leaflet geoJSON wants them swapped
+                    $coordinates['longitude'],
+                    $coordinates['latitude'],
+                ),
+            ),
+        );
 
-		$pois[] = $poi;
+        $pois[] = $poi;
 
-		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
-		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array(
-			$coordinates['latitude'],
-			$coordinates['longitude'],
-		);
+        // Formatting boundaries in a Leaflet-like format (see LatLngBounds).
+        // http://leafletjs.com/reference.html#latlngbounds
+        $boundaries[] = array(
+            $coordinates['latitude'],
+            $coordinates['longitude'],
+        );
 
-	}
+    }
 
-	$map_data               = array();
-	$map_data['features']   = $pois;
-	$map_data['boundaries'] = $boundaries;
+    $map_data               = array();
+    $map_data['features']   = $pois;
+    $map_data['boundaries'] = $boundaries;
 
-	return $map_data;
+    return $map_data;
 }
 
 /**
@@ -182,13 +182,13 @@ 
  * @return array An array of place posts.
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+    $places   = wl_shortcode_geomap_get_places( $post_id );
+    $map_data = wl_shortcode_geomap_prepare_map( $places );
 
-	wl_core_send_json( $map_data );
+    wl_core_send_json( $map_data );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +36 added lines, -36 removed lines

@@ -16,35 +16,35 @@ 
  *
  * @return array An array of place posts.
  */
-function wl_shortcode_geomap_get_places( $post_id = null ) {
+function wl_shortcode_geomap_get_places($post_id = null) {
 
 	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+	$is_global = is_null($post_id) || ! is_numeric($post_id);
 
 	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
+	if ($is_global) {
 		$related_ids = array();
 	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
+		$related_ids = wl_core_get_related_entity_ids($post_id, array(
 			'status' => 'publish',
-		) );
+		));
 
 		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$related_ids[] = $post_id;
 		}
 	}
 
 	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
 	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
+	if ( ! $is_global && empty($related_ids)) {
 		return array();
 	}
 
 	// Retrieve all 'published' places with geo coordinates defined
 	// If $related_ids is not empty, it's used to limit query results to the current post related places
 	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
+	return get_posts(array(
 		'post__in'    => $related_ids,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'nopaging'    => true,
@@ -69,7 +69,7 @@ 
 				'terms'    => 'place',
 			),
 		),
-	) );
+	));
 }
 
 /**
@@ -82,7 +82,7 @@ 
  *
  * @return array An array of markers and boundaries for Leaflet.
  */
-function wl_shortcode_geomap_prepare_map( $places ) {
+function wl_shortcode_geomap_prepare_map($places) {
 
 	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
 	$min_latitude  = PHP_INT_MAX;
@@ -97,13 +97,13 @@ 
 	$boundaries = array();
 
 	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+	foreach ($places as $entity) {
 
 		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+		$coordinates = wl_get_coordinates($entity->ID);
 
 		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+		if ($coordinates['latitude'] == 0 || $coordinates['longitude'] == 0) {
 			continue;
 		}
 
@@ -111,38 +111,38 @@ 
 		// This function should be focused on returning pure data instead
 
 		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+		$title = esc_attr($entity->post_title);
+		$link  = esc_attr(get_permalink($entity->ID));
+		if ('' !== ($thumbnail_id = get_post_thumbnail_id($entity->ID)) &&
+		     false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 		) {
-			$img_src = esc_attr( $attachment[0] );
+			$img_src = esc_attr($attachment[0]);
 		}
 
 		// Build HTML popup. TODO: move thumb width in css
 		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
+		if (isset($img_src)) {
+			$content = $content."<img src=$img_src style='width:100%'/>";
 		}
-		$content = $content . "</a><ul>";
+		$content = $content."</a><ul>";
 		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+		$related_posts = wl_core_get_related_post_ids($entity->ID, array(
 			'status' => 'publish',
-		) );
-		foreach ( $related_posts as $rp_id ) {
+		));
+		foreach ($related_posts as $rp_id) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
+			$rp      = get_post($rp_id);
+			$title   = esc_attr($rp->post_title);
+			$link    = esc_attr(get_permalink($rp->ID));
+			$content = $content."<li><a href=$link>$title</a></li>";
 		}
-		$content = $content . "</ul>";
+		$content = $content."</ul>";
 
 		// Formatting POI in geoJSON.
 		// http://leafletjs.com/examples/geojson.html
 		$poi = array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
+			'properties' => array('popupContent' => $content),
 			'geometry'   => array(
 				'type'        => 'Point',
 				'coordinates' => array(
@@ -183,16 +183,16 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+	$places   = wl_shortcode_geomap_get_places($post_id);
+	$map_data = wl_shortcode_geomap_prepare_map($places);
 
-	wl_core_send_json( $map_data );
+	wl_core_send_json($map_data);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 ///**
 // * Print geomap shortcode

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 '';
 		}
 

Indentation +62 added lines, -62 removed lines

@@ -3,51 +3,51 @@ 
 
 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
+        // Just set up the necessary info without calling the parent constructor.
+        // TODO: write a parent class for grouped properties
 
-		// we use 'coordinates' to namespace the Field in $_POST data.
-		// In  the DB the correct meta names will be used.
-		$this->meta_name = 'coordinates';
-	}
+        // we use 'coordinates' to namespace the Field in $_POST data.
+        // In  the DB the correct meta names will be used.
+        $this->meta_name = 'coordinates';
+    }
 
-	public function get_data() {
-		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
-	}
+    public function get_data() {
+        $entity_id  = get_the_ID();
+        $this->data = wl_get_coordinates( $entity_id );
+    }
 
-	public function html() {
+    public function html() {
 
-		// Open main <div> for the Field
-		$html = $this->html_wrapper_open();
+        // Open main <div> for the Field
+        $html = $this->html_wrapper_open();
 
-		// Label
-		$html .= '<h3>coordinates</h3>';
+        // Label
+        $html .= '<h3>coordinates</h3>';
 
-		// print nonce
-		$html .= $this->html_nonce();
+        // print nonce
+        $html .= $this->html_nonce();
 
-		// Get coordinates
-		$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]' );
-		$map_init    = '[0,0]' === $coordinates
-			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+        // Get coordinates
+        $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]' );
+        $map_init    = '[0,0]' === $coordinates
+            ? 'locate( {setView: true, maxZoom: 16} )'
+            : 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%" />';
+        // 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_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-' );
-		$html .= <<<EOF
+        // Show Leaflet map to pick coordinates
+        $element_id = uniqid( 'wl-gep-map-' );
+        $html .= <<<EOF
 
 <div id="$element_id"></div>
 
@@ -79,44 +79,44 @@ 
 EOF;
 
 
-		$html .= $this->html_wrapper_close();
+        $html .= $this->html_wrapper_close();
 
-		return $html;
-	}
+        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();
+        $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 );
+        // 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 );
 
-		$latitude  = $this->data[0];
-		$longitude = $this->data[1];
+        $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 );
-		}
+        // 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 );
+        }
 
-	}
+    }
 
-	/**
-	 * Only accept float numbers
-	 */
-	public function sanitize_data_filter( $value ) {
+    /**
+     * Only accept float numbers
+     */
+    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 ) ) {
-			return '';
-		}
+        // 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 ) ) {
+            return '';
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }
 

src/includes/class-wordlift-entity-types-taxonomy-service.php

Indentation +1 added lines, -1 removed lines

@@ -7,6 +7,6 @@
  */
 class Wordlift_Entity_Types_Taxonomy_Service {
 
-	const TAXONOMY_NAME = 'wl_entity_type';
+    const TAXONOMY_NAME = 'wl_entity_type';
 
 }

src/includes/class-wordlift-i18n.php

Indentation +33 added lines, -33 removed lines

@@ -26,38 +26,38 @@
  */
 class Wordlift_i18n {
 
-	/**
-	 * The domain specified for this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string    $domain    The domain identifier for this plugin.
-	 */
-	private $domain;
-
-	/**
-	 * Load the plugin text domain for translation.
-	 *
-	 * @since    1.0.0
-	 */
-	public function load_plugin_textdomain() {
-
-		load_plugin_textdomain(
-			$this->domain,
-			false,
-			dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
-		);
-
-	}
-
-	/**
-	 * Set the domain equal to that of the specified domain.
-	 *
-	 * @since    1.0.0
-	 * @param    string    $domain    The domain that represents the locale of this plugin.
-	 */
-	public function set_domain( $domain ) {
-		$this->domain = $domain;
-	}
+    /**
+     * The domain specified for this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string    $domain    The domain identifier for this plugin.
+     */
+    private $domain;
+
+    /**
+     * Load the plugin text domain for translation.
+     *
+     * @since    1.0.0
+     */
+    public function load_plugin_textdomain() {
+
+        load_plugin_textdomain(
+            $this->domain,
+            false,
+            dirname( dirname( plugin_basename( __FILE__ ) ) ) . '/languages/'
+        );
+
+    }
+
+    /**
+     * Set the domain equal to that of the specified domain.
+     *
+     * @since    1.0.0
+     * @param    string    $domain    The domain that represents the locale of this plugin.
+     */
+    public function set_domain( $domain ) {
+        $this->domain = $domain;
+    }
 
 }

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

Indentation +102 added lines, -102 removed lines

@@ -23,107 +23,107 @@
  */
 class Wordlift_Loader {
 
-	/**
-	 * The array of actions registered with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      array    $actions    The actions registered with WordPress to fire when the plugin loads.
-	 */
-	protected $actions;
-
-	/**
-	 * The array of filters registered with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      array    $filters    The filters registered with WordPress to fire when the plugin loads.
-	 */
-	protected $filters;
-
-	/**
-	 * Initialize the collections used to maintain the actions and filters.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->actions = array();
-		$this->filters = array();
-
-	}
-
-	/**
-	 * Add a new action to the collection to be registered with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @param    string               $hook             The name of the WordPress action that is being registered.
-	 * @param    object               $component        A reference to the instance of the object on which the action is defined.
-	 * @param    string               $callback         The name of the function definition on the $component.
-	 * @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 );
-	}
-
-	/**
-	 * Add a new filter to the collection to be registered with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @param    string               $hook             The name of the WordPress filter that is being registered.
-	 * @param    object               $component        A reference to the instance of the object on which the filter is defined.
-	 * @param    string               $callback         The name of the function definition on the $component.
-	 * @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 );
-	}
-
-	/**
-	 * A utility function that is used to register the actions and hooks into a single
-	 * collection.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @param    array                $hooks            The collection of hooks that is being registered (that is, actions or filters).
-	 * @param    string               $hook             The name of the WordPress filter that is being registered.
-	 * @param    object               $component        A reference to the instance of the object on which the filter is defined.
-	 * @param    string               $callback         The name of the function definition on the $component.
-	 * @param    int                  $priority         The priority at which the function should be fired.
-	 * @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 ) {
-
-		$hooks[] = array(
-			'hook'          => $hook,
-			'component'     => $component,
-			'callback'      => $callback,
-			'priority'      => $priority,
-			'accepted_args' => $accepted_args
-		);
-
-		return $hooks;
-
-	}
-
-	/**
-	 * Register the filters and actions with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-
-		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'] );
-		}
-
-	}
+    /**
+     * The array of actions registered with WordPress.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      array    $actions    The actions registered with WordPress to fire when the plugin loads.
+     */
+    protected $actions;
+
+    /**
+     * The array of filters registered with WordPress.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      array    $filters    The filters registered with WordPress to fire when the plugin loads.
+     */
+    protected $filters;
+
+    /**
+     * Initialize the collections used to maintain the actions and filters.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->actions = array();
+        $this->filters = array();
+
+    }
+
+    /**
+     * Add a new action to the collection to be registered with WordPress.
+     *
+     * @since    1.0.0
+     * @param    string               $hook             The name of the WordPress action that is being registered.
+     * @param    object               $component        A reference to the instance of the object on which the action is defined.
+     * @param    string               $callback         The name of the function definition on the $component.
+     * @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 );
+    }
+
+    /**
+     * Add a new filter to the collection to be registered with WordPress.
+     *
+     * @since    1.0.0
+     * @param    string               $hook             The name of the WordPress filter that is being registered.
+     * @param    object               $component        A reference to the instance of the object on which the filter is defined.
+     * @param    string               $callback         The name of the function definition on the $component.
+     * @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 );
+    }
+
+    /**
+     * A utility function that is used to register the actions and hooks into a single
+     * collection.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @param    array                $hooks            The collection of hooks that is being registered (that is, actions or filters).
+     * @param    string               $hook             The name of the WordPress filter that is being registered.
+     * @param    object               $component        A reference to the instance of the object on which the filter is defined.
+     * @param    string               $callback         The name of the function definition on the $component.
+     * @param    int                  $priority         The priority at which the function should be fired.
+     * @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 ) {
+
+        $hooks[] = array(
+            'hook'          => $hook,
+            'component'     => $component,
+            'callback'      => $callback,
+            'priority'      => $priority,
+            'accepted_args' => $accepted_args
+        );
+
+        return $hooks;
+
+    }
+
+    /**
+     * Register the filters and actions with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+
+        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'] );
+        }
+
+    }
 
 }

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/modules/core/wordlift_core.php

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@
 <?php
 
 // Include constants
-require_once( 'wordlift_core_constants.php' );
+require_once('wordlift_core_constants.php');
 
 // Include methods that deal with post/entity relations
-require_once( 'wordlift_core_post_entity_relations.php' );
+require_once('wordlift_core_post_entity_relations.php');
 
 // Include wl_schema api
-require_once( 'wordlift_core_schema_api.php' );
+require_once('wordlift_core_schema_api.php');
 
 // Include the Entity API which allow to query for entity posts.
-require_once( 'wordlift_core_entity_api.php' );
+require_once('wordlift_core_entity_api.php');
 
 // Include methods for Wordlift plugin install
-require_once( 'wordlift_core_install.php' );
+require_once('wordlift_core_install.php');
 
 // Include utility global functions 
-require_once( 'wordlift_core_functions.php' );
\ No newline at end of file
+require_once('wordlift_core_functions.php');
\ No newline at end of file

src/modules/linked_data/wordlift_linked_data_images.php

Spacing +16 added lines, -16 removed lines

@@ -9,18 +9,18 @@ 
  * @return array An array with information about the saved image (*path*: the local path to the image, *url*: the local
  * url, *content_type*: the image content type)
  */
-function wl_save_image( $url ) {
+function wl_save_image($url) {
 
-	$parts = parse_url( $url );
+	$parts = parse_url($url);
 	$path  = $parts['path'];
 
 	// Get the bare filename (filename w/o the extension).
 	// Sanitize filename before saving the current image as attachment
 	// See https://codex.wordpress.org/Function_Reference/sanitize_file_name
-	$basename = sanitize_file_name( pathinfo( $path, PATHINFO_FILENAME ) . '-' . uniqid( date( 'YmdH-' ) ) );
+	$basename = sanitize_file_name(pathinfo($path, PATHINFO_FILENAME).'-'.uniqid(date('YmdH-')));
 
 	// Chunk the bare name to get a subpath.
-	$chunks = chunk_split( strtolower( $basename ), 3, DIRECTORY_SEPARATOR );
+	$chunks = chunk_split(strtolower($basename), 3, DIRECTORY_SEPARATOR);
 
 	// Get the base dir.
 	$wp_upload_dir = wp_upload_dir();
@@ -28,22 +28,22 @@ 
 	$base_url      = $wp_upload_dir['baseurl'];
 
 	// Get the full path to the local filename.
-	$image_path      = '/' . $chunks;
-	$image_full_path = $base_dir . $image_path;
-	$image_full_url  = $base_url . $image_path;
+	$image_path      = '/'.$chunks;
+	$image_full_path = $base_dir.$image_path;
+	$image_full_url  = $base_url.$image_path;
 
 	// Create the folders.
-	if ( ! ( file_exists( $image_full_path ) && is_dir( $image_full_path ) ) ) {
-		if ( false === mkdir( $image_full_path, 0777, true ) ) {
-			wl_write_log( "wl_save_image : failed creating dir [ image full path :: $image_full_path ]\n" );
+	if ( ! (file_exists($image_full_path) && is_dir($image_full_path))) {
+		if (false === mkdir($image_full_path, 0777, true)) {
+			wl_write_log("wl_save_image : failed creating dir [ image full path :: $image_full_path ]\n");
 		}
 	};
 
 	// Request the remote file.
-	$response     = wp_remote_get( $url );
-	$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+	$response     = wp_remote_get($url);
+	$content_type = wp_remote_retrieve_header($response, 'content-type');
 
-	switch ( $content_type ) {
+	switch ($content_type) {
 		case 'image/jpeg':
 		case 'image/jpg':
 			$extension = ".jpg";
@@ -62,11 +62,11 @@ 
 	}
 
 	// Complete the local filename.
-	$image_full_path .= $basename . $extension;
-	$image_full_url .= $basename . $extension;
+	$image_full_path .= $basename.$extension;
+	$image_full_url .= $basename.$extension;
 
 	// Store the data locally.
-	file_put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+	file_put_contents($image_full_path, wp_remote_retrieve_body($response));
 
 	// wl_write_log( "wl_save_image [ url :: $url ][ content type :: $content_type ][ image full path :: $image_full_path ][ image full url :: $image_full_url ]\n" );
 

Indentation +54 added lines, -54 removed lines

@@ -10,69 +10,69 @@
  */
 function wl_save_image( $url ) {
 
-	$parts = parse_url( $url );
-	$path  = $parts['path'];
+    $parts = parse_url( $url );
+    $path  = $parts['path'];
 
-	// Get the bare filename (filename w/o the extension).
-	// Sanitize filename before saving the current image as attachment
-	// See https://codex.wordpress.org/Function_Reference/sanitize_file_name
-	$basename = sanitize_file_name( pathinfo( $path, PATHINFO_FILENAME ) . '-' . uniqid( date( 'YmdH-' ) ) );
+    // Get the bare filename (filename w/o the extension).
+    // Sanitize filename before saving the current image as attachment
+    // See https://codex.wordpress.org/Function_Reference/sanitize_file_name
+    $basename = sanitize_file_name( pathinfo( $path, PATHINFO_FILENAME ) . '-' . uniqid( date( 'YmdH-' ) ) );
 
-	// Chunk the bare name to get a subpath.
-	$chunks = chunk_split( strtolower( $basename ), 3, DIRECTORY_SEPARATOR );
+    // Chunk the bare name to get a subpath.
+    $chunks = chunk_split( strtolower( $basename ), 3, DIRECTORY_SEPARATOR );
 
-	// Get the base dir.
-	$wp_upload_dir = wp_upload_dir();
-	$base_dir      = $wp_upload_dir['basedir'];
-	$base_url      = $wp_upload_dir['baseurl'];
+    // Get the base dir.
+    $wp_upload_dir = wp_upload_dir();
+    $base_dir      = $wp_upload_dir['basedir'];
+    $base_url      = $wp_upload_dir['baseurl'];
 
-	// Get the full path to the local filename.
-	$image_path      = '/' . $chunks;
-	$image_full_path = $base_dir . $image_path;
-	$image_full_url  = $base_url . $image_path;
+    // Get the full path to the local filename.
+    $image_path      = '/' . $chunks;
+    $image_full_path = $base_dir . $image_path;
+    $image_full_url  = $base_url . $image_path;
 
-	// Create the folders.
-	if ( ! ( file_exists( $image_full_path ) && is_dir( $image_full_path ) ) ) {
-		if ( false === mkdir( $image_full_path, 0777, true ) ) {
-			wl_write_log( "wl_save_image : failed creating dir [ image full path :: $image_full_path ]\n" );
-		}
-	};
+    // Create the folders.
+    if ( ! ( file_exists( $image_full_path ) && is_dir( $image_full_path ) ) ) {
+        if ( false === mkdir( $image_full_path, 0777, true ) ) {
+            wl_write_log( "wl_save_image : failed creating dir [ image full path :: $image_full_path ]\n" );
+        }
+    };
 
-	// Request the remote file.
-	$response     = wp_remote_get( $url );
-	$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+    // Request the remote file.
+    $response     = wp_remote_get( $url );
+    $content_type = wp_remote_retrieve_header( $response, 'content-type' );
 
-	switch ( $content_type ) {
-		case 'image/jpeg':
-		case 'image/jpg':
-			$extension = ".jpg";
-			break;
-		case 'image/svg+xml':
-			$extension = ".svg";
-			break;
-		case 'image/gif':
-			$extension = ".gif";
-			break;
-		case 'image/png':
-			$extension = ".png";
-			break;
-		default:
-			$extension = '';
-	}
+    switch ( $content_type ) {
+        case 'image/jpeg':
+        case 'image/jpg':
+            $extension = ".jpg";
+            break;
+        case 'image/svg+xml':
+            $extension = ".svg";
+            break;
+        case 'image/gif':
+            $extension = ".gif";
+            break;
+        case 'image/png':
+            $extension = ".png";
+            break;
+        default:
+            $extension = '';
+    }
 
-	// Complete the local filename.
-	$image_full_path .= $basename . $extension;
-	$image_full_url .= $basename . $extension;
+    // Complete the local filename.
+    $image_full_path .= $basename . $extension;
+    $image_full_url .= $basename . $extension;
 
-	// Store the data locally.
-	file_put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+    // Store the data locally.
+    file_put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
 
-	// wl_write_log( "wl_save_image [ url :: $url ][ content type :: $content_type ][ image full path :: $image_full_path ][ image full url :: $image_full_url ]\n" );
+    // wl_write_log( "wl_save_image [ url :: $url ][ content type :: $content_type ][ image full path :: $image_full_path ][ image full url :: $image_full_url ]\n" );
 
-	// Return the path.
-	return array(
-		'path'         => $image_full_path,
-		'url'          => $image_full_url,
-		'content_type' => $content_type,
-	);
+    // Return the path.
+    return array(
+        'path'         => $image_full_path,
+        'url'          => $image_full_url,
+        'content_type' => $content_type,
+    );
 }

src/shortcodes/wordlift_shortcode_field.php

Spacing +9 added lines, -9 removed lines

@@ -9,28 +9,28 @@ 
  * @param array $atts An array of shortcode attributes.
  * @return string A dom element with requested property value(s).
  */
-function wl_shortcode_field( $atts ) {
+function wl_shortcode_field($atts) {
 	
     // Extract attributes and set default values.
-    $field_atts = shortcode_atts( array(
+    $field_atts = shortcode_atts(array(
         'id'    => null,
         'name'  => null
-    ), $atts );
+    ), $atts);
     
     // Get id of the post
     $entity_id = $field_atts['id'];
-    if( is_null( $field_atts['id'] ) || !is_numeric( $field_atts['id'] ) ) {
+    if (is_null($field_atts['id']) || ! is_numeric($field_atts['id'])) {
         $entity_id = get_the_ID();
     }
 
     $property_name = $field_atts['name'];
-    if( !is_null( $property_name ) ) {
-        $values = wl_schema_get_value( $entity_id, $property_name );
+    if ( ! is_null($property_name)) {
+        $values = wl_schema_get_value($entity_id, $property_name);
     }
     
     // Return
-    if( is_array( $values ) ) {
-        return implode( ', ', $values );
+    if (is_array($values)) {
+        return implode(', ', $values);
     } else {
         return null;
     }
@@ -40,5 +40,5 @@ 
     add_shortcode('wl_field', 'wl_shortcode_field');
 }
 
-add_action( 'init', 'wl_register_shortcode_field');
+add_action('init', 'wl_register_shortcode_field');
 

src/uninstall.php

Indentation +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
 
 // If uninstall not called from WordPress, then exit.
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-	exit;
+    exit;
 }
 
 // Get a reference to WP and the Wordlift plugin
@@ -40,10 +40,10 @@ 
 
 // Do a db search for posts of type entity
 $args           = array(
-	'posts_per_page' => - 1,
-	'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
-	'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
-	'fields'         => 'ids'
+    'posts_per_page' => - 1,
+    'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
+    'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
+    'fields'         => 'ids'
 );
 $entities_array = get_posts( $args );
 
@@ -52,8 +52,8 @@ 
 wl_write_log( 'Deleting entities and their meta... ' );
 wl_write_log( $entities_array );
 foreach ( $entities_array as $entity_id ) {
-	// Delete the whole entity and its metas.
-	wp_delete_post( $entity_id, true );
+    // Delete the whole entity and its metas.
+    wp_delete_post( $entity_id, true );
 }
 wl_write_log( 'Done.' );
 
@@ -74,8 +74,8 @@ 
 // We loop over terms in this rude way because in the uninstall script
 // is not possible to call WP custom taxonomy functions.
 foreach ( range( 0, 100 ) as $index ) {
-	delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
-	wp_delete_term( $index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+    delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
+    wp_delete_term( $index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
 }
 delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_children' );  // it's a hierarchical taxonomy
 wl_write_log( 'Done.' );

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
@@ -39,53 +39,53 @@ 
  */
 
 // Do a db search for posts of type entity
-$args           = array(
-	'posts_per_page' => - 1,
+$args = array(
+	'posts_per_page' => -1,
 	'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
-	'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
+	'post_status'    => array('publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash'),
 	'fields'         => 'ids'
 );
-$entities_array = get_posts( $args );
+$entities_array = get_posts($args);
 
 // Loop over entities and delete them.
 // TODO: thumbnails?
-wl_write_log( 'Deleting entities and their meta... ' );
-wl_write_log( $entities_array );
-foreach ( $entities_array as $entity_id ) {
+wl_write_log('Deleting entities and their meta... ');
+wl_write_log($entities_array);
+foreach ($entities_array as $entity_id) {
 	// Delete the whole entity and its metas.
-	wp_delete_post( $entity_id, true );
+	wp_delete_post($entity_id, true);
 }
-wl_write_log( 'Done.' );
+wl_write_log('Done.');
 
 /*
  * Delete post-entity relationships
  */
-wl_write_log( 'Deleting post-entity relationships... ' );
-$sql = 'DROP TABLE IF EXISTS ' . wl_core_get_relation_instances_table_name() . ';';
-$wpdb->query( $sql );
-delete_option( 'wl_db_version' );
-wl_write_log( 'Done.' );
+wl_write_log('Deleting post-entity relationships... ');
+$sql = 'DROP TABLE IF EXISTS '.wl_core_get_relation_instances_table_name().';';
+$wpdb->query($sql);
+delete_option('wl_db_version');
+wl_write_log('Done.');
 
 /*
  * Delete taxonomy
  */
-wl_write_log( 'Cleaning entities taxonomy... ' );
+wl_write_log('Cleaning entities taxonomy... ');
 // Delte custom taxonomy terms.
 // We loop over terms in this rude way because in the uninstall script
 // is not possible to call WP custom taxonomy functions.
-foreach ( range( 0, 100 ) as $index ) {
-	delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
-	wp_delete_term( $index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+foreach (range(0, 100) as $index) {
+	delete_option(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME.'_'.$index);
+	wp_delete_term($index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 }
-delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_children' );  // it's a hierarchical taxonomy
-wl_write_log( 'Done.' );
+delete_option(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME.'_children'); // it's a hierarchical taxonomy
+wl_write_log('Done.');
 
 /**
  * Delete options
  */
-wl_write_log( 'Cleaning WordLift options... ' );
+wl_write_log('Cleaning WordLift options... ');
 // delete_option( WL_OPTIONS_NAME );
-delete_option( 'wl_option_prefixes' );
-delete_option( 'wl_general_settings' );
-delete_option( 'wl_advanced_settings' );
-wl_write_log( 'Done. WordLift successfully uninstalled.' );
+delete_option('wl_option_prefixes');
+delete_option('wl_general_settings');
+delete_option('wl_advanced_settings');
+wl_write_log('Done. WordLift successfully uninstalled.');