lightspeeddevelopment / wetu-importer

classes/class-accommodation.php

Indentation +210 added lines, -210 removed lines

@@ -70,7 +70,7 @@ 
 	 */
 	public function set_variables()
 	{
-	    parent::set_variables();
+		parent::set_variables();
 		// ** This request only works with API KEY **
 		//if ( false !== $this->api_username && false !== $this->api_password ) {
 		//	$this->url    = 'https://wetu.com/API/Pins/';
@@ -95,7 +95,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
             <?php $this->navigation('accommodation'); ?>
 
@@ -236,8 +236,8 @@ 
 		$accommodation = json_decode($data, true);
 
 		if(isset($accommodation['error'])){
-		    return $accommodation['error'];
-        }elseif (isset($accommodation) && !empty($accommodation)) {
+			return $accommodation['error'];
+		}elseif (isset($accommodation) && !empty($accommodation)) {
 			set_transient('lsx_ti_accommodation',$accommodation,60*60*2);
 			return true;
 		}
@@ -253,8 +253,8 @@ 
 			$accommodation = get_transient('lsx_ti_accommodation');
 
 			if(false === $accommodation){
-			    $this->update_options();
-            }
+				$this->update_options();
+			}
 
 			if ( false !== $accommodation ) {
 				$searched_items = false;
@@ -263,7 +263,7 @@ 
 					$keyphrases = $_POST['keyword'];
 				}else{
 					$keyphrases = array(0);
-                }
+				}
 
 				if(!is_array($keyphrases)){
 					$keyphrases = array($keyphrases);
@@ -304,11 +304,11 @@ 
 
 							if('import' === $post_status){
 
-							    if(is_array($this->queued_imports) && in_array($row['post_id'],$this->queued_imports)){
+								if(is_array($this->queued_imports) && in_array($row['post_id'],$this->queued_imports)){
 									$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
-                                }else{
-							        continue;
-                                }
+								}else{
+									continue;
+								}
 
 							}else{
 
@@ -387,7 +387,7 @@ 
 	 * Saves the queue to the option.
 	 */
 	public function remove_from_queue($id) {
-        if (!empty($this->queued_imports)) {
+		if (!empty($this->queued_imports)) {
 
 			if(($key = array_search($id, $this->queued_imports)) !== false) {
 				unset($this->queued_imports[$key]);
@@ -395,7 +395,7 @@ 
 				delete_option('wetu_importer_que');
 				update_option('wetu_importer_que',$this->queued_imports);
 			}
-        }
+		}
 	}
 
 	/**
@@ -434,18 +434,18 @@ 
 				$content = false;
 			}
 
-            $jdata = file_get_contents( $this->url . '/Get?' . $this->url_qs . '&ids=' . $wetu_id );
-            if($jdata)
-            {
-                $adata=json_decode($jdata,true);
-                if(!empty($adata))
-                {
-                	$return = $this->import_row($adata,$wetu_id,$post_id,$team_members,$content,$safari_brands);
-                	$this->format_completed_row($return);
-                	$this->remove_from_queue($return);
+			$jdata = file_get_contents( $this->url . '/Get?' . $this->url_qs . '&ids=' . $wetu_id );
+			if($jdata)
+			{
+				$adata=json_decode($jdata,true);
+				if(!empty($adata))
+				{
+					$return = $this->import_row($adata,$wetu_id,$post_id,$team_members,$content,$safari_brands);
+					$this->format_completed_row($return);
+					$this->remove_from_queue($return);
 					$this->cleanup_posts();
-                }
-            }
+				}
+			}
 		}
 	}
 
@@ -454,144 +454,144 @@ 
 	 */
 	public function import_row($data,$wetu_id,$id=0,$team_members=false,$importable_content=false,$safari_brands=false) {
 
-	        $post_name = $data_post_content = $data_post_excerpt = '';
-	        $post = array(
-	          'post_type'		=> 'accommodation',
-	        );
-
-	        $content_used_general_description = false;
-
-	        //Set the post_content
-	        if(false !== $importable_content && in_array('description',$importable_content)){
-		        if(isset($data[0]['content']['extended_description']))
-		        {
-		            $data_post_content = $data[0]['content']['extended_description'];
-		        }elseif(isset($data[0]['content']['general_description'])){
-		            $data_post_content = $data[0]['content']['general_description'];
-		            $content_used_general_description = true;
-		        }elseif(isset($data[0]['content']['teaser_description'])){
-		        	$data_post_content = $data[0]['content']['teaser_description'];
-		        }
-	        	$post['post_content'] = wp_strip_all_tags($data_post_content);
-	        }
-
-	        //set the post_excerpt
-	        if(false !== $importable_content && in_array('excerpt',$importable_content)){
-		        if(isset($data[0]['content']['teaser_description'])){
-		        	$data_post_excerpt = $data[0]['content']['teaser_description'];
-		        }elseif(isset($data[0]['content']['general_description']) && false === $content_used_general_description){
-		            $data_post_excerpt = $data[0]['content']['general_description'];
-		        }	   
-		        $post['post_excerpt'] = $data_post_excerpt;     	
-	        }
-
-	        if(false !== $id && '0' !== $id){
-	        	$post['ID'] = $id;
+			$post_name = $data_post_content = $data_post_excerpt = '';
+			$post = array(
+			  'post_type'		=> 'accommodation',
+			);
+
+			$content_used_general_description = false;
+
+			//Set the post_content
+			if(false !== $importable_content && in_array('description',$importable_content)){
+				if(isset($data[0]['content']['extended_description']))
+				{
+					$data_post_content = $data[0]['content']['extended_description'];
+				}elseif(isset($data[0]['content']['general_description'])){
+					$data_post_content = $data[0]['content']['general_description'];
+					$content_used_general_description = true;
+				}elseif(isset($data[0]['content']['teaser_description'])){
+					$data_post_content = $data[0]['content']['teaser_description'];
+				}
+				$post['post_content'] = wp_strip_all_tags($data_post_content);
+			}
+
+			//set the post_excerpt
+			if(false !== $importable_content && in_array('excerpt',$importable_content)){
+				if(isset($data[0]['content']['teaser_description'])){
+					$data_post_excerpt = $data[0]['content']['teaser_description'];
+				}elseif(isset($data[0]['content']['general_description']) && false === $content_used_general_description){
+					$data_post_excerpt = $data[0]['content']['general_description'];
+				}	   
+				$post['post_excerpt'] = $data_post_excerpt;     	
+			}
+
+			if(false !== $id && '0' !== $id){
+				$post['ID'] = $id;
 				if(isset($data[0]['name'])){
 					$post['post_title'] = $data[0]['name'];
-	        		$post['post_status'] = 'publish';
+					$post['post_status'] = 'publish';
 					$post['post_name'] = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'accommodation', 0);
 				}
-	        	$id = wp_update_post($post);
-	        	$prev_date = get_post_meta($id,'lsx_wetu_modified_date',true);
-	        	update_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']),$prev_date);
-	        }else{
-
-		        //Set the name
-		        if(isset($data[0]['name'])){
-		            $post_name = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'accommodation', 0);
-		        }
-	        	$post['post_name'] = $post_name;
-	        	$post['post_title'] = $data[0]['name'];
-	        	$post['post_status'] = 'publish';
-	        	$id = wp_insert_post($post);
-
-	        	//Save the WETU ID and the Last date it was modified.
-	        	if(false !== $id){
-	        		add_post_meta($id,'lsx_wetu_id',$wetu_id);
-	        		add_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']));
-	        	}
-	        }
-	        //Setup some default for use in the import
-	        if(false !== $importable_content && (in_array('gallery',$importable_content) || in_array('banner_image',$importable_content) || in_array('featured_image',$importable_content))){
+				$id = wp_update_post($post);
+				$prev_date = get_post_meta($id,'lsx_wetu_modified_date',true);
+				update_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']),$prev_date);
+			}else{
+
+				//Set the name
+				if(isset($data[0]['name'])){
+					$post_name = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'accommodation', 0);
+				}
+				$post['post_name'] = $post_name;
+				$post['post_title'] = $data[0]['name'];
+				$post['post_status'] = 'publish';
+				$id = wp_insert_post($post);
+
+				//Save the WETU ID and the Last date it was modified.
+				if(false !== $id){
+					add_post_meta($id,'lsx_wetu_id',$wetu_id);
+					add_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']));
+				}
+			}
+			//Setup some default for use in the import
+			if(false !== $importable_content && (in_array('gallery',$importable_content) || in_array('banner_image',$importable_content) || in_array('featured_image',$importable_content))){
 				$this->find_attachments($id);
 			}
 
-	        //Set the team member if it is there
-	        if(post_type_exists('team') && false !== $team_members && '' !== $team_members){
-	        	$this->set_team_member($id,$team_members);
-	    	}
-
-	        //Set the safari brand
-	        if(false !== $safari_brands && '' !== $safari_brands){
-	        	$this->set_safari_brands($id,$safari_brands);
-
-	    	}	    	
-
-	        if(class_exists('LSX_TO_Maps')){
-	        	$this->set_map_data($data,$id,9);
-	        }
-
-	        if(post_type_exists('destination') && false !== $importable_content && in_array('destination',$importable_content)){
-	        	$this->connect_destinations($data,$id);
-	        }
-
-	        if(false !== $importable_content && in_array('category',$importable_content)){
-	        	$this->set_taxonomy_style($data,$id);
-	        }
-
-	        //Set the Room Data
-	        if(false !== $importable_content && in_array('rooms',$importable_content)){
-	        	$this->set_room_data($data,$id);
-	    	}
-
-	    	//Set the rating
-	    	if(false !== $importable_content && in_array('rating',$importable_content)){
-	       		$this->set_rating($data,$id);
-	    	}
-
-	    	//Set the checkin checkout data
-	    	if(false !== $importable_content && in_array('checkin',$importable_content)){
-	        	$this->set_checkin_checkout($data,$id);
-	        }
-
-	    	//Set the Spoken Languages
-	    	if(false !== $importable_content && in_array('spoken_languages',$importable_content)){
-	       		$this->set_spoken_languages($data,$id);
-	    	}
-
-	    	//Set the friendly options
-	    	if(false !== $importable_content && in_array('friendly',$importable_content)){
-	       		$this->set_friendly($data,$id);
-	    	}
-
-	    	//Set the special_interests
-	    	if(false !== $importable_content && in_array('special_interests',$importable_content)){
-	       		$this->set_special_interests($data,$id);
-	    	}	    		    		        
-
-	        //Import the videos
-	        if(false !== $importable_content && in_array('videos',$importable_content)){
-	        	$this->set_video_data($data,$id);
-	        }
-
-	        //Import the facilities
-	        if(false !== $importable_content && in_array('facilities',$importable_content)){
-	        	$this->set_facilities($data,$id);
-	        }	        
-
-	        //Set the featured image
-	        if(false !== $importable_content && in_array('featured_image',$importable_content)){
-	        	$this->set_featured_image($data,$id);
-	        }
-	        if(false !== $importable_content && in_array('banner_image',$importable_content)){
-	        	$this->set_banner_image($data,$id);
-	        }	        
-	        //Import the main gallery
-	        if(false !== $importable_content && in_array('gallery',$importable_content)){	    	
-	    		$this->create_main_gallery($data,$id);
-	        }
-        return $id;
+			//Set the team member if it is there
+			if(post_type_exists('team') && false !== $team_members && '' !== $team_members){
+				$this->set_team_member($id,$team_members);
+			}
+
+			//Set the safari brand
+			if(false !== $safari_brands && '' !== $safari_brands){
+				$this->set_safari_brands($id,$safari_brands);
+
+			}	    	
+
+			if(class_exists('LSX_TO_Maps')){
+				$this->set_map_data($data,$id,9);
+			}
+
+			if(post_type_exists('destination') && false !== $importable_content && in_array('destination',$importable_content)){
+				$this->connect_destinations($data,$id);
+			}
+
+			if(false !== $importable_content && in_array('category',$importable_content)){
+				$this->set_taxonomy_style($data,$id);
+			}
+
+			//Set the Room Data
+			if(false !== $importable_content && in_array('rooms',$importable_content)){
+				$this->set_room_data($data,$id);
+			}
+
+			//Set the rating
+			if(false !== $importable_content && in_array('rating',$importable_content)){
+		   		$this->set_rating($data,$id);
+			}
+
+			//Set the checkin checkout data
+			if(false !== $importable_content && in_array('checkin',$importable_content)){
+				$this->set_checkin_checkout($data,$id);
+			}
+
+			//Set the Spoken Languages
+			if(false !== $importable_content && in_array('spoken_languages',$importable_content)){
+		   		$this->set_spoken_languages($data,$id);
+			}
+
+			//Set the friendly options
+			if(false !== $importable_content && in_array('friendly',$importable_content)){
+		   		$this->set_friendly($data,$id);
+			}
+
+			//Set the special_interests
+			if(false !== $importable_content && in_array('special_interests',$importable_content)){
+		   		$this->set_special_interests($data,$id);
+			}	    		    		        
+
+			//Import the videos
+			if(false !== $importable_content && in_array('videos',$importable_content)){
+				$this->set_video_data($data,$id);
+			}
+
+			//Import the facilities
+			if(false !== $importable_content && in_array('facilities',$importable_content)){
+				$this->set_facilities($data,$id);
+			}	        
+
+			//Set the featured image
+			if(false !== $importable_content && in_array('featured_image',$importable_content)){
+				$this->set_featured_image($data,$id);
+			}
+			if(false !== $importable_content && in_array('banner_image',$importable_content)){
+				$this->set_banner_image($data,$id);
+			}	        
+			//Import the main gallery
+			if(false !== $importable_content && in_array('gallery',$importable_content)){	    	
+				$this->create_main_gallery($data,$id);
+			}
+		return $id;
 	}
 
 	/**
@@ -601,7 +601,7 @@ 
 
 		delete_post_meta($id, 'team_to_'.$this->tab_slug);
 		foreach($team_members as $team){
-        	add_post_meta($id,'team_to_'.$this->tab_slug,$team);			
+			add_post_meta($id,'team_to_'.$this->tab_slug,$team);			
 		}
 	}
 
@@ -610,7 +610,7 @@ 
 	 */
 	public function set_safari_brands($id,$safari_brands) {
 		foreach($safari_brands as $safari_brand){
-        	wp_set_object_terms( $id, intval($safari_brand), 'accommodation-brand',true);			
+			wp_set_object_terms( $id, intval($safari_brand), 'accommodation-brand',true);			
 		}
 	}
 
@@ -619,32 +619,32 @@ 
 	 */
 	public function connect_destinations($data,$id) {
 		if(isset($data[0]['position'])){
-		    $destinations = false;
-		    if(isset($data[0]['position']['country'])){
-		    	$destinations['country'] = $data[0]['position']['country'];
-		    }
-		    if(isset($data[0]['position']['destination'])){
-		    	$destinations['destination'] = $data[0]['position']['destination'];
-		    }
+			$destinations = false;
+			if(isset($data[0]['position']['country'])){
+				$destinations['country'] = $data[0]['position']['country'];
+			}
+			if(isset($data[0]['position']['destination'])){
+				$destinations['destination'] = $data[0]['position']['destination'];
+			}
 		    
-		    if(false !== $destinations){	
-		    	$prev_values = get_post_meta($id,'destination_to_accommodation',false);
-		    	if(false === $prev_values || !is_array($prev_values)){
-		    		$prev_values = array();
-		    	}
-		    	//print_r($destinations);
+			if(false !== $destinations){	
+				$prev_values = get_post_meta($id,'destination_to_accommodation',false);
+				if(false === $prev_values || !is_array($prev_values)){
+					$prev_values = array();
+				}
+				//print_r($destinations);
 				$destinations = array_unique($destinations);
 				//print_r($destinations);
-			    foreach($destinations as $key => $value){
-				    $destination = get_page_by_title(ltrim(rtrim($value)), 'OBJECT', 'destination');
-	                if (null !== $destination) {
-	                	if(!in_array($destination->ID,$prev_values)){
-	                   		add_post_meta($id,'destination_to_accommodation',$destination->ID,false);
-	                   		add_post_meta($destination->ID,'accommodation_to_destination',$id,false);
+				foreach($destinations as $key => $value){
+					$destination = get_page_by_title(ltrim(rtrim($value)), 'OBJECT', 'destination');
+					if (null !== $destination) {
+						if(!in_array($destination->ID,$prev_values)){
+					   		add_post_meta($id,'destination_to_accommodation',$destination->ID,false);
+					   		add_post_meta($destination->ID,'accommodation_to_destination',$id,false);
 							$this->cleanup_posts[$destination->ID] = 'accommodation_to_destination';
-	                	}
-	                } 		    	
-			    }	
+						}
+					} 		    	
+				}	
 			}
 		}
 	}	
@@ -656,15 +656,15 @@ 
 		$terms = false;
 		if(isset($data[0]['category'])){
 			if(!$term = term_exists(trim($data[0]['category']), 'accommodation-type'))
-	        {
-	            $term = wp_insert_term(trim($data[0]['category']), 'accommodation-type');
-	            if ( is_wp_error($term) ){echo $term->get_error_message();}
-	            else { wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true); }
-	        }
-	        else
-	        {
-	            wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true);
-	        }				
+			{
+				$term = wp_insert_term(trim($data[0]['category']), 'accommodation-type');
+				if ( is_wp_error($term) ){echo $term->get_error_message();}
+				else { wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true); }
+			}
+			else
+			{
+				wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true);
+			}				
 		}
 	}		
 
@@ -688,25 +688,25 @@ 
 				$temp_room['type'] = 'room';
 
 				if(!empty($room['images']) && is_array($room['images'])){
-			    	$attachments_args = array(
-			    			'post_parent' => $id,
-			    			'post_status' => 'inherit',
-			    			'post_type' => 'attachment',
-			    			'order' => 'ASC',
-			    	);   	
-			    	$attachments = new WP_Query($attachments_args);
-			    	$found_attachments = array();
-
-			    	if($attachments->have_posts()){
-			    		foreach($attachments->posts as $attachment){
-			    			$found_attachments[] = str_replace(array('.jpg','.png','.jpeg'),'',$attachment->post_title);
-			    		}
-			    	}
+					$attachments_args = array(
+							'post_parent' => $id,
+							'post_status' => 'inherit',
+							'post_type' => 'attachment',
+							'order' => 'ASC',
+					);   	
+					$attachments = new WP_Query($attachments_args);
+					$found_attachments = array();
+
+					if($attachments->have_posts()){
+						foreach($attachments->posts as $attachment){
+							$found_attachments[] = str_replace(array('.jpg','.png','.jpeg'),'',$attachment->post_title);
+						}
+					}
 
 					$temp_room['gallery'] = array();
 					foreach($room['images'] as $image_data){
-			    		$temp_room['gallery'][] = $this->attach_image($image_data,$id,$found_attachments);
-			    	}
+						$temp_room['gallery'][] = $this->attach_image($image_data,$id,$found_attachments);
+					}
 				}
 				$rooms[] = $temp_room;
 			}
@@ -715,7 +715,7 @@ 
 				delete_post_meta($id, 'units');				
 			}
 			foreach($rooms as $room){
-		        add_post_meta($id,'units',$room,false);			
+				add_post_meta($id,'units',$room,false);			
 			}
 
 			if(isset($data[0]['features']) && isset($data[0]['features']['rooms'])){
@@ -725,11 +725,11 @@ 
 			}
 
 			if(false !== $id && '0' !== $id){
-	        	$prev_rooms = get_post_meta($id,'number_of_rooms',true);
-	        	update_post_meta($id,'number_of_rooms',$room_count,$prev_rooms);
-	        }else{
-	        	add_post_meta($id,'number_of_rooms',$room_count,true);
-	        }
+				$prev_rooms = get_post_meta($id,'number_of_rooms',true);
+				update_post_meta($id,'number_of_rooms',$room_count,$prev_rooms);
+			}else{
+				add_post_meta($id,'number_of_rooms',$room_count,true);
+			}
 		}
 	}
 

Spacing +221 added lines, -221 removed lines

@@ -76,17 +76,17 @@ 
 		//	$this->url    = 'https://wetu.com/API/Pins/';
 		//	$this->url_qs = 'username=' . $this->api_username . '&password=' . $this->api_password;
 		//} elseif ( false !== $this->api_key ) {
-			$this->url    = 'https://wetu.com/API/Pins/' . $this->api_key;
+			$this->url    = 'https://wetu.com/API/Pins/'.$this->api_key;
 			$this->url_qs = 'all=include';
 		//}
 
-		$temp_options = get_option('_lsx-to_settings',false);
-		if(false !== $temp_options && isset($temp_options[$this->plugin_slug]) && !empty($temp_options[$this->plugin_slug])){
+		$temp_options = get_option('_lsx-to_settings', false);
+		if (false !== $temp_options && isset($temp_options[$this->plugin_slug]) && !empty($temp_options[$this->plugin_slug])) {
 			$this->options = $temp_options[$this->plugin_slug];
 		}
 
-		$accommodation_options = get_option('wetu_importer_accommodation_settings',false);
-		if(false !== $accommodation_options){
+		$accommodation_options = get_option('wetu_importer_accommodation_settings', false);
+		if (false !== $accommodation_options) {
 			$this->accommodation_options = $accommodation_options;
 		}
 	}
@@ -106,8 +106,8 @@ 
 			<form method="get" action="" id="posts-filter">
 				<input type="hidden" name="post_type" class="post_type" value="<?php echo $this->tab_slug; ?>" />
 				
-				<p><input class="button button-primary add" type="button" value="<?php _e('Add to List','wetu-importer'); ?>" />
-					<input class="button button-primary clear" type="button" value="<?php _e('Clear','wetu-importer'); ?>" />
+				<p><input class="button button-primary add" type="button" value="<?php _e('Add to List', 'wetu-importer'); ?>" />
+					<input class="button button-primary clear" type="button" value="<?php _e('Clear', 'wetu-importer'); ?>" />
 				</p>				
 
 				<table class="wp-list-table widefat fixed posts">
@@ -116,11 +116,11 @@ 
 					<tbody id="the-list">
 						<tr class="post-0 type-tour status-none" id="post-0">
 							<th class="check-column" scope="row">
-								<label for="cb-select-0" class="screen-reader-text"><?php _e('Enter a title to search for and press enter','wetu-importer'); ?></label>
+								<label for="cb-select-0" class="screen-reader-text"><?php _e('Enter a title to search for and press enter', 'wetu-importer'); ?></label>
 							</th>
 							<td class="post-title page-title column-title">
 								<strong>
-									<?php _e('Enter a title to search for','wetu-importer'); ?>
+									<?php _e('Enter a title to search for', 'wetu-importer'); ?>
 								</strong>
 							</td>
 							<td class="date column-date">							
@@ -134,8 +134,8 @@ 
 
 				</table>
 
-				<p><input class="button button-primary add" type="button" value="<?php _e('Add to List','wetu-importer'); ?>" />
-					<input class="button button-primary clear" type="button" value="<?php _e('Clear','wetu-importer'); ?>" />
+				<p><input class="button button-primary add" type="button" value="<?php _e('Add to List', 'wetu-importer'); ?>" />
+					<input class="button button-primary clear" type="button" value="<?php _e('Clear', 'wetu-importer'); ?>" />
 				</p>
 			</form> 
 
@@ -147,32 +147,32 @@ 
 						<div class="settings-all" style="width:30%;display:block;float:left;">
 							<h3><?php _e('What content to Sync from WETU'); ?></h3>
 							<ul>
-                                <li><input class="content select-all" <?php $this->checked($this->accommodation_options,'all'); ?> type="checkbox"name="content[]"  value="all" /> <?php _e('Select All','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'description'); ?>" type="checkbox" name="content[]" value="description" /> <?php _e('Description','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'excerpt'); ?>" type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'gallery'); ?>" type="checkbox" name="content[]" value="gallery" /> <?php _e('Main Gallery','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'category'); ?>" type="checkbox" name="content[]" value="category" /> <?php _e('Category','wetu-importer'); ?></li>
-		                        <?php if(class_exists('LSX_TO_Maps')){ ?>
-								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options,'location'); ?>" type="checkbox" name="content[]" value="location" /> <?php _e('Location','wetu-importer'); ?></li>
+                                <li><input class="content select-all" <?php $this->checked($this->accommodation_options, 'all'); ?> type="checkbox"name="content[]"  value="all" /> <?php _e('Select All', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'description'); ?>" type="checkbox" name="content[]" value="description" /> <?php _e('Description', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'excerpt'); ?>" type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'gallery'); ?>" type="checkbox" name="content[]" value="gallery" /> <?php _e('Main Gallery', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'category'); ?>" type="checkbox" name="content[]" value="category" /> <?php _e('Category', 'wetu-importer'); ?></li>
+		                        <?php if (class_exists('LSX_TO_Maps')) { ?>
+								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'location'); ?>" type="checkbox" name="content[]" value="location" /> <?php _e('Location', 'wetu-importer'); ?></li>
 		                        <?php } ?>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'destination'); ?>" type="checkbox" name="content[]" value="destination" /> <?php _e('Connect Destinations','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'checkin'); ?>" type="checkbox" name="content[]" value="checkin" /> <?php _e('Check In / Check Out','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'facilities'); ?>" type="checkbox" name="content[]" value="facilities" /> <?php _e('Facilities','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'friendly'); ?>" type="checkbox" name="content[]" value="friendly" /> <?php _e('Friendly','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'rating'); ?>" type="checkbox" name="content[]" value="rating" /> <?php _e('Rating','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'rooms'); ?>" type="checkbox" name="content[]" value="rooms" /> <?php _e('Rooms','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'special_interests'); ?>" type="checkbox" name="content[]" value="special_interests" /> <?php _e('Special Interests','wetu-importer'); ?></li>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'spoken_languages'); ?>" type="checkbox" name="content[]" value="spoken_languages" /> <?php _e('Spoken Languages','wetu-importer'); ?></li>
-
-		                        <?php if(class_exists('LSX_TO_Videos')){ ?>
-								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options,'videos'); ?>" type="checkbox" name="content[]" value="videos" /> <?php _e('Videos','wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'destination'); ?>" type="checkbox" name="content[]" value="destination" /> <?php _e('Connect Destinations', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'checkin'); ?>" type="checkbox" name="content[]" value="checkin" /> <?php _e('Check In / Check Out', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'facilities'); ?>" type="checkbox" name="content[]" value="facilities" /> <?php _e('Facilities', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'friendly'); ?>" type="checkbox" name="content[]" value="friendly" /> <?php _e('Friendly', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'rating'); ?>" type="checkbox" name="content[]" value="rating" /> <?php _e('Rating', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'rooms'); ?>" type="checkbox" name="content[]" value="rooms" /> <?php _e('Rooms', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'special_interests'); ?>" type="checkbox" name="content[]" value="special_interests" /> <?php _e('Special Interests', 'wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'spoken_languages'); ?>" type="checkbox" name="content[]" value="spoken_languages" /> <?php _e('Spoken Languages', 'wetu-importer'); ?></li>
+
+		                        <?php if (class_exists('LSX_TO_Videos')) { ?>
+								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'videos'); ?>" type="checkbox" name="content[]" value="videos" /> <?php _e('Videos', 'wetu-importer'); ?></li>
 		                        <?php } ?>
 							</ul>
 							<h4><?php _e('Additional Content'); ?></h4>
 							<ul>
-								<li><input class="content" checked="<?php $this->checked($this->accommodation_options,'featured_image'); ?>" type="checkbox" name="content[]" value="featured_image" /> <?php _e('Set Featured Image','wetu-importer'); ?></li>
-		                        <?php if(class_exists('LSX_Banners')){ ?>
-								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options,'banner_image'); ?>" type="checkbox" name="content[]" value="banner_image" /> <?php _e('Set Banner Image','wetu-importer'); ?></li>
+								<li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'featured_image'); ?>" type="checkbox" name="content[]" value="featured_image" /> <?php _e('Set Featured Image', 'wetu-importer'); ?></li>
+		                        <?php if (class_exists('LSX_Banners')) { ?>
+								    <li><input class="content" checked="<?php $this->checked($this->accommodation_options, 'banner_image'); ?>" type="checkbox" name="content[]" value="banner_image" /> <?php _e('Set Banner Image', 'wetu-importer'); ?></li>
 		                        <?php } ?>
 							</ul>
 						</div>
@@ -183,7 +183,7 @@ 
 
 						<div style="width:30%;display:block;float:left;">
 							<h3><?php _e('Assign a Safari Brand'); ?></h3> 
-							<?php echo $this->taxonomy_checkboxes('accommodation-brand',$this->accommodation_options); ?>
+							<?php echo $this->taxonomy_checkboxes('accommodation-brand', $this->accommodation_options); ?>
 						</div>	
 
 						<br clear="both" />			
@@ -191,7 +191,7 @@ 
 
 
 					<h3><?php _e('Your List'); ?></h3>
-                    <p><input class="button button-primary" type="submit" value="<?php _e('Sync','wetu-importer'); ?>" /></p>
+                    <p><input class="button button-primary" type="submit" value="<?php _e('Sync', 'wetu-importer'); ?>" /></p>
 					<table class="wp-list-table widefat fixed posts">
 						<?php $this->table_header(); ?>
 
@@ -203,12 +203,12 @@ 
 
 					</table>
 
-					<p><input class="button button-primary" type="submit" value="<?php _e('Sync','wetu-importer'); ?>" /></p>
+					<p><input class="button button-primary" type="submit" value="<?php _e('Sync', 'wetu-importer'); ?>" /></p>
 				</form>
 			</div>
 
 			<div style="display:none;" class="completed-list-wrapper">
-				<h3><?php _e('Completed'); ?> - <small><?php _e('Import your','wetu-importer'); ?> <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations'); ?></a> <?php _e('next','wetu-importer'); ?></small></h3>
+				<h3><?php _e('Completed'); ?> - <small><?php _e('Import your', 'wetu-importer'); ?> <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations'); ?></a> <?php _e('next', 'wetu-importer'); ?></small></h3>
 				<ul>
 				</ul>
 			</div>
@@ -220,9 +220,9 @@ 
 	 * search_form
 	 */
 	public function update_options_form() {
-		echo '<div style="display:none;" class="wetu-status"><h3>'.__('Wetu Status','wetu-importer').'</h3>';
+		echo '<div style="display:none;" class="wetu-status"><h3>'.__('Wetu Status', 'wetu-importer').'</h3>';
 		$accommodation = get_transient('lsx_ti_accommodation');
-		if('' === $accommodation || false === $accommodation || isset($_GET['refresh_accommodation'])){
+		if ('' === $accommodation || false === $accommodation || isset($_GET['refresh_accommodation'])) {
 			$this->update_options();
 		}
 		echo '</div>';
@@ -232,13 +232,13 @@ 
 	 * Save the list of Accommodation into an option
 	 */
 	public function update_options() {
-		$data = file_get_contents( $this->url . '/List?' . $this->url_qs );
+		$data = file_get_contents($this->url.'/List?'.$this->url_qs);
 		$accommodation = json_decode($data, true);
 
-		if(isset($accommodation['error'])){
+		if (isset($accommodation['error'])) {
 		    return $accommodation['error'];
         }elseif (isset($accommodation) && !empty($accommodation)) {
-			set_transient('lsx_ti_accommodation',$accommodation,60*60*2);
+			set_transient('lsx_ti_accommodation', $accommodation, 60 * 60 * 2);
 			return true;
 		}
 	}
@@ -249,41 +249,41 @@ 
 	public function process_ajax_search() {
 		$return = false;
 
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === 'accommodation'){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === 'accommodation') {
 			$accommodation = get_transient('lsx_ti_accommodation');
 
-			if(false === $accommodation){
+			if (false === $accommodation) {
 			    $this->update_options();
             }
 
-			if ( false !== $accommodation ) {
+			if (false !== $accommodation) {
 				$searched_items = false;
 
-				if(isset($_POST['keyword'] )) {
+				if (isset($_POST['keyword'])) {
 					$keyphrases = $_POST['keyword'];
-				}else{
+				}else {
 					$keyphrases = array(0);
                 }
 
-				if(!is_array($keyphrases)){
+				if (!is_array($keyphrases)) {
 					$keyphrases = array($keyphrases);
 				}
-				foreach($keyphrases as &$keyword){
+				foreach ($keyphrases as &$keyword) {
 					$keyword = ltrim(rtrim($keyword));
 				}
 
 
 				$post_status = false;
-				if(in_array('publish',$keyphrases)){
+				if (in_array('publish', $keyphrases)) {
 					$post_status = 'publish';
 				}
-				if(in_array('pending',$keyphrases)){
+				if (in_array('pending', $keyphrases)) {
 					$post_status = 'pending';
 				}
-				if(in_array('draft',$keyphrases)){
+				if (in_array('draft', $keyphrases)) {
 					$post_status = 'draft';
 				}
-				if(in_array('import',$keyphrases)){
+				if (in_array('import', $keyphrases)) {
 					$post_status = 'import';
 				}
 
@@ -291,32 +291,32 @@ 
 
 					$current_accommodation = $this->find_current_accommodation();
 
-					foreach($accommodation as $row_key => $row){
+					foreach ($accommodation as $row_key => $row) {
 
 						//If this is a current tour, add its ID to the row.
 						$row['post_id'] = 0;
-						if(false !== $current_accommodation && array_key_exists($row['id'], $current_accommodation)){
+						if (false !== $current_accommodation && array_key_exists($row['id'], $current_accommodation)) {
 							$row['post_id'] = $current_accommodation[$row['id']]->post_id;
 						}
 
 						//If we are searching for
-						if(false !== $post_status){
+						if (false !== $post_status) {
 
-							if('import' === $post_status){
+							if ('import' === $post_status) {
 
-							    if(is_array($this->queued_imports) && in_array($row['post_id'],$this->queued_imports)){
+							    if (is_array($this->queued_imports) && in_array($row['post_id'], $this->queued_imports)) {
 									$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
-                                }else{
+                                }else {
 							        continue;
                                 }
 
-							}else{
+							}else {
 
-								if(0 === $row['post_id']){
+								if (0 === $row['post_id']) {
 									continue;
-								}else{
+								}else {
 									$current_status = get_post_status($row['post_id']);
-									if($current_status !== $post_status){
+									if ($current_status !== $post_status) {
 										continue;
 									}
 
@@ -324,17 +324,17 @@ 
 								$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
 							}
 
-						}else{
+						}else {
 							//Search through each keyword.
-							foreach($keyphrases as $keyphrase){
+							foreach ($keyphrases as $keyphrase) {
 
 								//Make sure the keyphrase is turned into an array
-								$keywords = explode(" ",$keyphrase);
-								if(!is_array($keywords)){
+								$keywords = explode(" ", $keyphrase);
+								if (!is_array($keywords)) {
 									$keywords = array($keywords);
 								}
 
-								if($this->multineedle_stripos(ltrim(rtrim($row['name'])), $keywords) !== false){
+								if ($this->multineedle_stripos(ltrim(rtrim($row['name'])), $keywords) !== false) {
 									$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
 								}
 							}
@@ -343,7 +343,7 @@ 
 				}
 
 
-				if(false !== $searched_items){
+				if (false !== $searched_items) {
 					ksort($searched_items);
 					$return = implode($searched_items);
 				}
@@ -355,11 +355,11 @@ 
 	/**
 	 * Formats the row for output on the screen.
 	 */	
-	public function format_row($row = false){
-		if(false !== $row){
+	public function format_row($row = false) {
+		if (false !== $row) {
 
 			$status = 'import';
-			if(0 !== $row['post_id']){
+			if (0 !== $row['post_id']) {
 				$status = '<a href="'.admin_url('/post.php?post='.$row['post_id'].'&action=edit').'" target="_blank">'.get_post_status($row['post_id']).'</a>';
 			}
 
@@ -373,7 +373,7 @@ 
 					<strong>'.$row['name'].'</strong> - '.$status.'
 				</td>
 				<td class="date column-date">
-					<abbr title="'.date('Y/m/d',strtotime($row['last_modified'])).'">'.date('Y/m/d',strtotime($row['last_modified'])).'</abbr><br>Last Modified
+					<abbr title="'.date('Y/m/d', strtotime($row['last_modified'])).'">'.date('Y/m/d', strtotime($row['last_modified'])).'</abbr><br>Last Modified
 				</td>
 				<td class="ssid column-ssid">
 					'.$row['id'].'
@@ -389,11 +389,11 @@ 
 	public function remove_from_queue($id) {
         if (!empty($this->queued_imports)) {
 
-			if(($key = array_search($id, $this->queued_imports)) !== false) {
+			if (($key = array_search($id, $this->queued_imports)) !== false) {
 				unset($this->queued_imports[$key]);
 
 				delete_option('wetu_importer_que');
-				update_option('wetu_importer_que',$this->queued_imports);
+				update_option('wetu_importer_que', $this->queued_imports);
 			}
         }
 	}
@@ -404,43 +404,43 @@ 
 	public function process_ajax_import() {
 		$return = false;
 
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === 'accommodation' && isset($_POST['wetu_id'])){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === 'accommodation' && isset($_POST['wetu_id'])) {
 			
 			$wetu_id = $_POST['wetu_id'];
-			if(isset($_POST['post_id'])){
+			if (isset($_POST['post_id'])) {
 				$post_id = $_POST['post_id'];	
-			}else{
+			}else {
 				$post_id = 0;
 			}
 
-			if(isset($_POST['team_members'])){
+			if (isset($_POST['team_members'])) {
 				$team_members = $_POST['team_members'];	
-			}else{
+			}else {
 				$team_members = false;
 			}
 
-			if(isset($_POST['safari_brands'])){
+			if (isset($_POST['safari_brands'])) {
 				$safari_brands = $_POST['safari_brands'];	
-			}else{
+			}else {
 				$safari_brands = false;
 			}
 
 			delete_option('wetu_importer_accommodation_settings');
-			if(isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])){
+			if (isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])) {
 				$content = $_POST['content'];
-				add_option('wetu_importer_accommodation_settings',$content);
-			}else{
+				add_option('wetu_importer_accommodation_settings', $content);
+			}else {
 
 				$content = false;
 			}
 
-            $jdata = file_get_contents( $this->url . '/Get?' . $this->url_qs . '&ids=' . $wetu_id );
-            if($jdata)
+            $jdata = file_get_contents($this->url.'/Get?'.$this->url_qs.'&ids='.$wetu_id);
+            if ($jdata)
             {
-                $adata=json_decode($jdata,true);
-                if(!empty($adata))
+                $adata = json_decode($jdata, true);
+                if (!empty($adata))
                 {
-                	$return = $this->import_row($adata,$wetu_id,$post_id,$team_members,$content,$safari_brands);
+                	$return = $this->import_row($adata, $wetu_id, $post_id, $team_members, $content, $safari_brands);
                 	$this->format_completed_row($return);
                 	$this->remove_from_queue($return);
 					$this->cleanup_posts();
@@ -452,7 +452,7 @@ 
 	/**
 	 * Connect to wetu
 	 */
-	public function import_row($data,$wetu_id,$id=0,$team_members=false,$importable_content=false,$safari_brands=false) {
+	public function import_row($data, $wetu_id, $id = 0, $team_members = false, $importable_content = false, $safari_brands = false) {
 
 	        $post_name = $data_post_content = $data_post_excerpt = '';
 	        $post = array(
@@ -462,44 +462,44 @@ 
 	        $content_used_general_description = false;
 
 	        //Set the post_content
-	        if(false !== $importable_content && in_array('description',$importable_content)){
-		        if(isset($data[0]['content']['extended_description']))
+	        if (false !== $importable_content && in_array('description', $importable_content)) {
+		        if (isset($data[0]['content']['extended_description']))
 		        {
 		            $data_post_content = $data[0]['content']['extended_description'];
-		        }elseif(isset($data[0]['content']['general_description'])){
+		        }elseif (isset($data[0]['content']['general_description'])) {
 		            $data_post_content = $data[0]['content']['general_description'];
 		            $content_used_general_description = true;
-		        }elseif(isset($data[0]['content']['teaser_description'])){
+		        }elseif (isset($data[0]['content']['teaser_description'])) {
 		        	$data_post_content = $data[0]['content']['teaser_description'];
 		        }
 	        	$post['post_content'] = wp_strip_all_tags($data_post_content);
 	        }
 
 	        //set the post_excerpt
-	        if(false !== $importable_content && in_array('excerpt',$importable_content)){
-		        if(isset($data[0]['content']['teaser_description'])){
+	        if (false !== $importable_content && in_array('excerpt', $importable_content)) {
+		        if (isset($data[0]['content']['teaser_description'])) {
 		        	$data_post_excerpt = $data[0]['content']['teaser_description'];
-		        }elseif(isset($data[0]['content']['general_description']) && false === $content_used_general_description){
+		        }elseif (isset($data[0]['content']['general_description']) && false === $content_used_general_description) {
 		            $data_post_excerpt = $data[0]['content']['general_description'];
 		        }	   
 		        $post['post_excerpt'] = $data_post_excerpt;     	
 	        }
 
-	        if(false !== $id && '0' !== $id){
+	        if (false !== $id && '0' !== $id) {
 	        	$post['ID'] = $id;
-				if(isset($data[0]['name'])){
+				if (isset($data[0]['name'])) {
 					$post['post_title'] = $data[0]['name'];
 	        		$post['post_status'] = 'publish';
-					$post['post_name'] = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'accommodation', 0);
+					$post['post_name'] = wp_unique_post_slug(sanitize_title($data[0]['name']), $id, 'draft', 'accommodation', 0);
 				}
 	        	$id = wp_update_post($post);
-	        	$prev_date = get_post_meta($id,'lsx_wetu_modified_date',true);
-	        	update_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']),$prev_date);
-	        }else{
+	        	$prev_date = get_post_meta($id, 'lsx_wetu_modified_date', true);
+	        	update_post_meta($id, 'lsx_wetu_modified_date', strtotime($data[0]['last_modified']), $prev_date);
+	        }else {
 
 		        //Set the name
-		        if(isset($data[0]['name'])){
-		            $post_name = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'accommodation', 0);
+		        if (isset($data[0]['name'])) {
+		            $post_name = wp_unique_post_slug(sanitize_title($data[0]['name']), $id, 'draft', 'accommodation', 0);
 		        }
 	        	$post['post_name'] = $post_name;
 	        	$post['post_title'] = $data[0]['name'];
@@ -507,89 +507,89 @@ 
 	        	$id = wp_insert_post($post);
 
 	        	//Save the WETU ID and the Last date it was modified.
-	        	if(false !== $id){
-	        		add_post_meta($id,'lsx_wetu_id',$wetu_id);
-	        		add_post_meta($id,'lsx_wetu_modified_date',strtotime($data[0]['last_modified']));
+	        	if (false !== $id) {
+	        		add_post_meta($id, 'lsx_wetu_id', $wetu_id);
+	        		add_post_meta($id, 'lsx_wetu_modified_date', strtotime($data[0]['last_modified']));
 	        	}
 	        }
 	        //Setup some default for use in the import
-	        if(false !== $importable_content && (in_array('gallery',$importable_content) || in_array('banner_image',$importable_content) || in_array('featured_image',$importable_content))){
+	        if (false !== $importable_content && (in_array('gallery', $importable_content) || in_array('banner_image', $importable_content) || in_array('featured_image', $importable_content))) {
 				$this->find_attachments($id);
 			}
 
 	        //Set the team member if it is there
-	        if(post_type_exists('team') && false !== $team_members && '' !== $team_members){
-	        	$this->set_team_member($id,$team_members);
+	        if (post_type_exists('team') && false !== $team_members && '' !== $team_members) {
+	        	$this->set_team_member($id, $team_members);
 	    	}
 
 	        //Set the safari brand
-	        if(false !== $safari_brands && '' !== $safari_brands){
-	        	$this->set_safari_brands($id,$safari_brands);
+	        if (false !== $safari_brands && '' !== $safari_brands) {
+	        	$this->set_safari_brands($id, $safari_brands);
 
 	    	}	    	
 
-	        if(class_exists('LSX_TO_Maps')){
-	        	$this->set_map_data($data,$id,9);
+	        if (class_exists('LSX_TO_Maps')) {
+	        	$this->set_map_data($data, $id, 9);
 	        }
 
-	        if(post_type_exists('destination') && false !== $importable_content && in_array('destination',$importable_content)){
-	        	$this->connect_destinations($data,$id);
+	        if (post_type_exists('destination') && false !== $importable_content && in_array('destination', $importable_content)) {
+	        	$this->connect_destinations($data, $id);
 	        }
 
-	        if(false !== $importable_content && in_array('category',$importable_content)){
-	        	$this->set_taxonomy_style($data,$id);
+	        if (false !== $importable_content && in_array('category', $importable_content)) {
+	        	$this->set_taxonomy_style($data, $id);
 	        }
 
 	        //Set the Room Data
-	        if(false !== $importable_content && in_array('rooms',$importable_content)){
-	        	$this->set_room_data($data,$id);
+	        if (false !== $importable_content && in_array('rooms', $importable_content)) {
+	        	$this->set_room_data($data, $id);
 	    	}
 
 	    	//Set the rating
-	    	if(false !== $importable_content && in_array('rating',$importable_content)){
-	       		$this->set_rating($data,$id);
+	    	if (false !== $importable_content && in_array('rating', $importable_content)) {
+	       		$this->set_rating($data, $id);
 	    	}
 
 	    	//Set the checkin checkout data
-	    	if(false !== $importable_content && in_array('checkin',$importable_content)){
-	        	$this->set_checkin_checkout($data,$id);
+	    	if (false !== $importable_content && in_array('checkin', $importable_content)) {
+	        	$this->set_checkin_checkout($data, $id);
 	        }
 
 	    	//Set the Spoken Languages
-	    	if(false !== $importable_content && in_array('spoken_languages',$importable_content)){
-	       		$this->set_spoken_languages($data,$id);
+	    	if (false !== $importable_content && in_array('spoken_languages', $importable_content)) {
+	       		$this->set_spoken_languages($data, $id);
 	    	}
 
 	    	//Set the friendly options
-	    	if(false !== $importable_content && in_array('friendly',$importable_content)){
-	       		$this->set_friendly($data,$id);
+	    	if (false !== $importable_content && in_array('friendly', $importable_content)) {
+	       		$this->set_friendly($data, $id);
 	    	}
 
 	    	//Set the special_interests
-	    	if(false !== $importable_content && in_array('special_interests',$importable_content)){
-	       		$this->set_special_interests($data,$id);
+	    	if (false !== $importable_content && in_array('special_interests', $importable_content)) {
+	       		$this->set_special_interests($data, $id);
 	    	}	    		    		        
 
 	        //Import the videos
-	        if(false !== $importable_content && in_array('videos',$importable_content)){
-	        	$this->set_video_data($data,$id);
+	        if (false !== $importable_content && in_array('videos', $importable_content)) {
+	        	$this->set_video_data($data, $id);
 	        }
 
 	        //Import the facilities
-	        if(false !== $importable_content && in_array('facilities',$importable_content)){
-	        	$this->set_facilities($data,$id);
+	        if (false !== $importable_content && in_array('facilities', $importable_content)) {
+	        	$this->set_facilities($data, $id);
 	        }	        
 
 	        //Set the featured image
-	        if(false !== $importable_content && in_array('featured_image',$importable_content)){
-	        	$this->set_featured_image($data,$id);
+	        if (false !== $importable_content && in_array('featured_image', $importable_content)) {
+	        	$this->set_featured_image($data, $id);
 	        }
-	        if(false !== $importable_content && in_array('banner_image',$importable_content)){
-	        	$this->set_banner_image($data,$id);
+	        if (false !== $importable_content && in_array('banner_image', $importable_content)) {
+	        	$this->set_banner_image($data, $id);
 	        }	        
 	        //Import the main gallery
-	        if(false !== $importable_content && in_array('gallery',$importable_content)){	    	
-	    		$this->create_main_gallery($data,$id);
+	        if (false !== $importable_content && in_array('gallery', $importable_content)) {	    	
+	    		$this->create_main_gallery($data, $id);
 	        }
         return $id;
 	}
@@ -597,50 +597,50 @@ 
 	/**
 	 * Set the team memberon each item.
 	 */
-	public function set_team_member($id,$team_members) {
+	public function set_team_member($id, $team_members) {
 
 		delete_post_meta($id, 'team_to_'.$this->tab_slug);
-		foreach($team_members as $team){
-        	add_post_meta($id,'team_to_'.$this->tab_slug,$team);			
+		foreach ($team_members as $team) {
+        	add_post_meta($id, 'team_to_'.$this->tab_slug, $team);			
 		}
 	}
 
 	/**
 	 * Set the safari brand
 	 */
-	public function set_safari_brands($id,$safari_brands) {
-		foreach($safari_brands as $safari_brand){
-        	wp_set_object_terms( $id, intval($safari_brand), 'accommodation-brand',true);			
+	public function set_safari_brands($id, $safari_brands) {
+		foreach ($safari_brands as $safari_brand) {
+        	wp_set_object_terms($id, intval($safari_brand), 'accommodation-brand', true);			
 		}
 	}
 
 	/**
 	 * Connects the destinations post type
 	 */
-	public function connect_destinations($data,$id) {
-		if(isset($data[0]['position'])){
+	public function connect_destinations($data, $id) {
+		if (isset($data[0]['position'])) {
 		    $destinations = false;
-		    if(isset($data[0]['position']['country'])){
+		    if (isset($data[0]['position']['country'])) {
 		    	$destinations['country'] = $data[0]['position']['country'];
 		    }
-		    if(isset($data[0]['position']['destination'])){
+		    if (isset($data[0]['position']['destination'])) {
 		    	$destinations['destination'] = $data[0]['position']['destination'];
 		    }
 		    
-		    if(false !== $destinations){	
-		    	$prev_values = get_post_meta($id,'destination_to_accommodation',false);
-		    	if(false === $prev_values || !is_array($prev_values)){
+		    if (false !== $destinations) {	
+		    	$prev_values = get_post_meta($id, 'destination_to_accommodation', false);
+		    	if (false === $prev_values || !is_array($prev_values)) {
 		    		$prev_values = array();
 		    	}
 		    	//print_r($destinations);
 				$destinations = array_unique($destinations);
 				//print_r($destinations);
-			    foreach($destinations as $key => $value){
+			    foreach ($destinations as $key => $value) {
 				    $destination = get_page_by_title(ltrim(rtrim($value)), 'OBJECT', 'destination');
 	                if (null !== $destination) {
-	                	if(!in_array($destination->ID,$prev_values)){
-	                   		add_post_meta($id,'destination_to_accommodation',$destination->ID,false);
-	                   		add_post_meta($destination->ID,'accommodation_to_destination',$id,false);
+	                	if (!in_array($destination->ID, $prev_values)) {
+	                   		add_post_meta($id, 'destination_to_accommodation', $destination->ID, false);
+	                   		add_post_meta($destination->ID, 'accommodation_to_destination', $id, false);
 							$this->cleanup_posts[$destination->ID] = 'accommodation_to_destination';
 	                	}
 	                } 		    	
@@ -652,18 +652,18 @@ 
 	/**
 	 * Set the Travel Style
 	 */
-	public function set_taxonomy_style($data,$id) {
+	public function set_taxonomy_style($data, $id) {
 		$terms = false;
-		if(isset($data[0]['category'])){
-			if(!$term = term_exists(trim($data[0]['category']), 'accommodation-type'))
+		if (isset($data[0]['category'])) {
+			if (!$term = term_exists(trim($data[0]['category']), 'accommodation-type'))
 	        {
 	            $term = wp_insert_term(trim($data[0]['category']), 'accommodation-type');
-	            if ( is_wp_error($term) ){echo $term->get_error_message();}
-	            else { wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true); }
+	            if (is_wp_error($term)) {echo $term->get_error_message(); }
+	            else { wp_set_object_terms($id, intval($term['term_id']), 'accommodation-type', true); }
 	        }
 	        else
 	        {
-	            wp_set_object_terms( $id, intval($term['term_id']), 'accommodation-type',true);
+	            wp_set_object_terms($id, intval($term['term_id']), 'accommodation-type', true);
 	        }				
 		}
 	}		
@@ -671,23 +671,23 @@ 
 	/**
 	 * Saves the room data
 	 */
-	public function set_room_data($data,$id) {
-		if(!empty($data[0]['rooms']) && is_array($data[0]['rooms'])){
+	public function set_room_data($data, $id) {
+		if (!empty($data[0]['rooms']) && is_array($data[0]['rooms'])) {
 			$rooms = false;
 
-			foreach($data[0]['rooms'] as $room){
+			foreach ($data[0]['rooms'] as $room) {
 
 				$temp_room = array();
-				if(isset($room['name'])){
+				if (isset($room['name'])) {
 					$temp_room['title'] = $room['name'];
 				}
-				if(isset($room['description'])){
+				if (isset($room['description'])) {
 					$temp_room['description'] = strip_tags($room['description']);
 				}			
 				$temp_room['price'] = 0;
 				$temp_room['type'] = 'room';
 
-				if(!empty($room['images']) && is_array($room['images'])){
+				if (!empty($room['images']) && is_array($room['images'])) {
 			    	$attachments_args = array(
 			    			'post_parent' => $id,
 			    			'post_status' => 'inherit',
@@ -697,38 +697,38 @@ 
 			    	$attachments = new WP_Query($attachments_args);
 			    	$found_attachments = array();
 
-			    	if($attachments->have_posts()){
-			    		foreach($attachments->posts as $attachment){
-			    			$found_attachments[] = str_replace(array('.jpg','.png','.jpeg'),'',$attachment->post_title);
+			    	if ($attachments->have_posts()) {
+			    		foreach ($attachments->posts as $attachment) {
+			    			$found_attachments[] = str_replace(array('.jpg', '.png', '.jpeg'), '', $attachment->post_title);
 			    		}
 			    	}
 
 					$temp_room['gallery'] = array();
-					foreach($room['images'] as $image_data){
-			    		$temp_room['gallery'][] = $this->attach_image($image_data,$id,$found_attachments);
+					foreach ($room['images'] as $image_data) {
+			    		$temp_room['gallery'][] = $this->attach_image($image_data, $id, $found_attachments);
 			    	}
 				}
 				$rooms[] = $temp_room;
 			}
 
-			if(false !== $id && '0' !== $id){
+			if (false !== $id && '0' !== $id) {
 				delete_post_meta($id, 'units');				
 			}
-			foreach($rooms as $room){
-		        add_post_meta($id,'units',$room,false);			
+			foreach ($rooms as $room) {
+		        add_post_meta($id, 'units', $room, false);			
 			}
 
-			if(isset($data[0]['features']) && isset($data[0]['features']['rooms'])){
+			if (isset($data[0]['features']) && isset($data[0]['features']['rooms'])) {
 				$room_count = $data[0]['features']['rooms'];
-			}else{
+			}else {
 				$room_count = count($data[0]['rooms']);
 			}
 
-			if(false !== $id && '0' !== $id){
-	        	$prev_rooms = get_post_meta($id,'number_of_rooms',true);
-	        	update_post_meta($id,'number_of_rooms',$room_count,$prev_rooms);
-	        }else{
-	        	add_post_meta($id,'number_of_rooms',$room_count,true);
+			if (false !== $id && '0' !== $id) {
+	        	$prev_rooms = get_post_meta($id, 'number_of_rooms', true);
+	        	update_post_meta($id, 'number_of_rooms', $room_count, $prev_rooms);
+	        }else {
+	        	add_post_meta($id, 'number_of_rooms', $room_count, true);
 	        }
 		}
 	}
@@ -736,31 +736,31 @@ 
 	/**
 	 * Set the ratings
 	 */
-	public function set_rating($data,$id) {
+	public function set_rating($data, $id) {
 
-		if(!empty($data[0]['features']) && isset($data[0]['features']['star_authority'])){
+		if (!empty($data[0]['features']) && isset($data[0]['features']['star_authority'])) {
 			$rating_type = $data[0]['features']['star_authority'];	
-		}else{
+		}else {
 			$rating_type = 'Unspecified2';
 		}
-		$this->save_custom_field($rating_type,'rating_type',$id);
+		$this->save_custom_field($rating_type, 'rating_type', $id);
 
-		if(!empty($data[0]['features']) && isset($data[0]['features']['stars'])){
-			$this->save_custom_field($data[0]['features']['stars'],'rating',$id,true);	
+		if (!empty($data[0]['features']) && isset($data[0]['features']['stars'])) {
+			$this->save_custom_field($data[0]['features']['stars'], 'rating', $id, true);	
 		}
 	}
 
 	/**
 	 * Set the spoken_languages
 	 */
-	public function set_spoken_languages($data,$id) {
-		if(!empty($data[0]['features']) && isset($data[0]['features']['spoken_languages']) && !empty($data[0]['features']['spoken_languages'])){
+	public function set_spoken_languages($data, $id) {
+		if (!empty($data[0]['features']) && isset($data[0]['features']['spoken_languages']) && !empty($data[0]['features']['spoken_languages'])) {
 			$languages = false;
-			foreach($data[0]['features']['spoken_languages'] as $spoken_language){
+			foreach ($data[0]['features']['spoken_languages'] as $spoken_language) {
 				$languages[] = sanitize_title($spoken_language);
 			}
-			if(false !== $languages){
-				$this->save_custom_field($languages,'spoken_languages',$id);
+			if (false !== $languages) {
+				$this->save_custom_field($languages, 'spoken_languages', $id);
 			}
 		}
 	}
@@ -768,14 +768,14 @@ 
 	/**
 	 * Set the friendly
 	 */
-	public function set_friendly($data,$id) {
-		if(!empty($data[0]['features']) && isset($data[0]['features']['suggested_visitor_types']) && !empty($data[0]['features']['suggested_visitor_types'])){
+	public function set_friendly($data, $id) {
+		if (!empty($data[0]['features']) && isset($data[0]['features']['suggested_visitor_types']) && !empty($data[0]['features']['suggested_visitor_types'])) {
 			$friendly_options = false;
-			foreach($data[0]['features']['suggested_visitor_types'] as $visitor_type){
+			foreach ($data[0]['features']['suggested_visitor_types'] as $visitor_type) {
 				$friendly_options[] = sanitize_title($visitor_type);
 			}
-			if(false !== $friendly_options){
-				$this->save_custom_field($friendly_options,'suggested_visitor_types',$id);
+			if (false !== $friendly_options) {
+				$this->save_custom_field($friendly_options, 'suggested_visitor_types', $id);
 			}
 		}		
 	}
@@ -783,14 +783,14 @@ 
 	/**
 	 * Set the special interests
 	 */
-	public function set_special_interests($data,$id) {
-		if(!empty($data[0]['features']) && isset($data[0]['features']['special_interests']) && !empty($data[0]['features']['special_interests'])){
+	public function set_special_interests($data, $id) {
+		if (!empty($data[0]['features']) && isset($data[0]['features']['special_interests']) && !empty($data[0]['features']['special_interests'])) {
 			$interests = false;
-			foreach($data[0]['features']['special_interests'] as $special_interest){
+			foreach ($data[0]['features']['special_interests'] as $special_interest) {
 				$interests[] = sanitize_title($special_interest);
 			}
-			if(false !== $interests){
-				$this->save_custom_field($interests,'special_interests',$id);
+			if (false !== $interests) {
+				$this->save_custom_field($interests, 'special_interests', $id);
 			}
 		}		
 	}				
@@ -798,24 +798,24 @@ 
 	/**
 	 * Set the Check in and Check out Date
 	 */
-	public function set_checkin_checkout($data,$id) {
+	public function set_checkin_checkout($data, $id) {
 
-		if(!empty($data[0]['features']) && isset($data[0]['features']['check_in_time'])){
-			$time = str_replace('h',':',$data[0]['features']['check_in_time']);
-			$time = date('h:ia',strtotime($time));
-			$this->save_custom_field($time,'checkin_time',$id);
+		if (!empty($data[0]['features']) && isset($data[0]['features']['check_in_time'])) {
+			$time = str_replace('h', ':', $data[0]['features']['check_in_time']);
+			$time = date('h:ia', strtotime($time));
+			$this->save_custom_field($time, 'checkin_time', $id);
 		}
-		if(!empty($data[0]['features']) && isset($data[0]['features']['check_out_time'])){
-			$time = str_replace('h',':',$data[0]['features']['check_out_time']);
-			$time = date('h:ia',strtotime($time));
-			$this->save_custom_field($time,'checkout_time',$id);
+		if (!empty($data[0]['features']) && isset($data[0]['features']['check_out_time'])) {
+			$time = str_replace('h', ':', $data[0]['features']['check_out_time']);
+			$time = date('h:ia', strtotime($time));
+			$this->save_custom_field($time, 'checkout_time', $id);
 		}
 	}	
 
 	/**
 	 * Set the Facilities
 	 */
-	public function set_facilities($data,$id) {
+	public function set_facilities($data, $id) {
 
 		$parent_facilities = array(
 			'available_services' => 'Available Services',
@@ -823,13 +823,13 @@ 
 			'room_facilities' => 'Room Facilities',
 			'activities_on_site' => 'Activities on Site'
 		);
-		foreach($parent_facilities as $key => $label){
+		foreach ($parent_facilities as $key => $label) {
 			$terms = false;
-			if(isset($data[0]['features']) && isset($data[0]['features'][$key])){
-				$parent_id = $this->set_term($id,$label,'facility');	
+			if (isset($data[0]['features']) && isset($data[0]['features'][$key])) {
+				$parent_id = $this->set_term($id, $label, 'facility');	
 			}
-			foreach($data[0]['features'][$key] as $child_facility){
-				$this->set_term($id,$child_facility,'facility',$parent_id);
+			foreach ($data[0]['features'][$key] as $child_facility) {
+				$this->set_term($id, $child_facility, 'facility', $parent_id);
 			}
 		}
 	}

classes/class-destination.php

Indentation +5 added lines, -5 removed lines

@@ -469,12 +469,12 @@
 					$this->remove_from_queue($return);
 					$this->format_completed_row($return);
 				}else{
-				    if(isset($adata['error'])){
-				        $this->format_error($adata['error']);
-                    }else{
+					if(isset($adata['error'])){
+						$this->format_error($adata['error']);
+					}else{
 						$this->format_error(esc_html__('There was a problem importing your destination.','wet-importer'));
-                    }
-                }
+					}
+				}
 			}
 		}
 	}

Spacing +29 added lines, -29 removed lines

@@ -78,7 +78,7 @@ 
 		//	$this->url    = 'https://wetu.com/API/Pins/';
 		//	$this->url_qs = 'username=' . $this->api_username . '&password=' . $this->api_password;
 		//} elseif ( false !== $this->api_key ) {
-		$this->url = 'https://wetu.com/API/Pins/' . $this->api_key;
+		$this->url = 'https://wetu.com/API/Pins/'.$this->api_key;
 		$this->url_qs = '';
 		//}
 
@@ -322,7 +322,7 @@ 
 
 				if (isset($_POST['keyword'])) {
 					$keyphrases = $_POST['keyword'];
-				} else {
+				}else {
 					$keyphrases = array(0);
 				}
 
@@ -354,10 +354,10 @@ 
 					foreach ($destination as $row) {
 
 						//If we are searching for
-						if('import' === $post_status) {
-							if(is_array($this->queued_imports) && in_array($row->post_id,$this->queued_imports)){
-								$searched_items[sanitize_title($row->name) . '-' . $row->meta_value] = $this->format_row($row);
-							}else{
+						if ('import' === $post_status) {
+							if (is_array($this->queued_imports) && in_array($row->post_id, $this->queued_imports)) {
+								$searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
+							}else {
 								continue;
 							}
 						}else if (false !== $post_status) {
@@ -366,10 +366,10 @@ 
 							if ($current_status !== $post_status) {
 								continue;
 							}
-							$searched_items[sanitize_title($row->name) . '-' . $row->meta_value] = $this->format_row($row);
+							$searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
 
 
-						} else {
+						}else {
 							//Search through each keyword.
 							foreach ($keyphrases as $keyphrase) {
 
@@ -380,7 +380,7 @@ 
 								}
 
 								if ($this->multineedle_stripos(ltrim(rtrim($row->name)), $keywords) !== false) {
-									$searched_items[sanitize_title($row->name) . '-' . $row->meta_value] = $this->format_row($row);
+									$searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
 								}
 							}
 						}
@@ -406,23 +406,23 @@ 
 
 			$status = 'import';
 			if (0 !== $row->post_id) {
-				$status = '<a href="' . admin_url('/post.php?post=' . $row->post_id . '&action=edit') . '" target="_blank">' . get_post_status($row->post_id) . '</a>';
+				$status = '<a href="'.admin_url('/post.php?post='.$row->post_id.'&action=edit').'" target="_blank">'.get_post_status($row->post_id).'</a>';
 			}
 
 			$row_html = '
-			<tr class="post-' . $row->post_id . ' type-tour" id="post-' . $row->post_id . '">
+			<tr class="post-' . $row->post_id.' type-tour" id="post-'.$row->post_id.'">
 				<th class="check-column" scope="row">
-					<label for="cb-select-' . $row->meta_value . '" class="screen-reader-text">' . $row->name . '</label>
-					<input type="checkbox" data-identifier="' . $row->meta_value . '" value="' . $row->post_id . '" name="post[]" id="cb-select-' . $row->meta_value . '">
+					<label for="cb-select-' . $row->meta_value.'" class="screen-reader-text">'.$row->name.'</label>
+					<input type="checkbox" data-identifier="' . $row->meta_value.'" value="'.$row->post_id.'" name="post[]" id="cb-select-'.$row->meta_value.'">
 				</th>
 				<td class="post-title page-title column-title">
-					<strong>' . $row->name . '</strong> - ' . $status . '
+					<strong>' . $row->name.'</strong> - '.$status.'
 				</td>
 				<td class="date column-date">
-					<abbr title="' . date('Y/m/d', strtotime($row->last_modified)) . '">' . date('Y/m/d', strtotime($row->last_modified)) . '</abbr><br>Last Modified
+					<abbr title="' . date('Y/m/d', strtotime($row->last_modified)).'">'.date('Y/m/d', strtotime($row->last_modified)).'</abbr><br>Last Modified
 				</td>
 				<td class="ssid column-ssid">
-					' . $row->meta_value . '
+					' . $row->meta_value.'
 				</td>
 			</tr>';
 			return $row_html;
@@ -440,13 +440,13 @@ 
 			$wetu_id = $_POST['wetu_id'];
 			if (isset($_POST['post_id'])) {
 				$post_id = $_POST['post_id'];
-			} else {
+			}else {
 				$post_id = 0;
 			}
 
 			if (isset($_POST['team_members'])) {
 				$team_members = $_POST['team_members'];
-			} else {
+			}else {
 				$team_members = false;
 			}
 
@@ -456,11 +456,11 @@ 
 			if (isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])) {
 				$content = $_POST['content'];
 				add_option('wetu_importer_destination_settings', $content);
-			} else {
+			}else {
 				$content = false;
 			}
 
-			$jdata = file_get_contents($this->url . '/Get?' . $this->url_qs . '&ids=' . $wetu_id);
+			$jdata = file_get_contents($this->url.'/Get?'.$this->url_qs.'&ids='.$wetu_id);
 			if ($jdata) {
 				$adata = json_decode($jdata, true);
 
@@ -468,11 +468,11 @@ 
 					$return = $this->import_row($adata, $wetu_id, $post_id, $team_members, $content, $safari_brands);
 					$this->remove_from_queue($return);
 					$this->format_completed_row($return);
-				}else{
-				    if(isset($adata['error'])){
+				}else {
+				    if (isset($adata['error'])) {
 				        $this->format_error($adata['error']);
-                    }else{
-						$this->format_error(esc_html__('There was a problem importing your destination.','wet-importer'));
+                    }else {
+						$this->format_error(esc_html__('There was a problem importing your destination.', 'wet-importer'));
                     }
                 }
 			}
@@ -485,11 +485,11 @@ 
 	public function remove_from_queue($id) {
 		if (!empty($this->queued_imports)) {
 
-			if(($key = array_search($id, $this->queued_imports)) !== false) {
+			if (($key = array_search($id, $this->queued_imports)) !== false) {
 				unset($this->queued_imports[$key]);
 
 				delete_option('wetu_importer_que');
-				update_option('wetu_importer_que',$this->queued_imports);
+				update_option('wetu_importer_que', $this->queued_imports);
 			}
 		}
 	}
@@ -544,7 +544,7 @@ 
 				$id = wp_update_post($post);
 				$prev_date = get_post_meta($id, 'lsx_wetu_modified_date', true);
 				update_post_meta($id, 'lsx_wetu_modified_date', strtotime($data[0]['last_modified']), $prev_date);
-			} else {
+			}else {
 
 				//Set the name
 				if (isset($data[0]['name'])) {
@@ -646,9 +646,9 @@ 
 	public function set_team_member($id, $team_members)
 	{
 
-		delete_post_meta($id, 'team_to_' . $this->tab_slug);
+		delete_post_meta($id, 'team_to_'.$this->tab_slug);
 		foreach ($team_members as $team) {
-			add_post_meta($id, 'team_to_' . $this->tab_slug, $team);
+			add_post_meta($id, 'team_to_'.$this->tab_slug, $team);
 		}
 	}
 

Braces +4 added lines, -4 removed lines

@@ -357,10 +357,10 @@ 
 						if('import' === $post_status) {
 							if(is_array($this->queued_imports) && in_array($row->post_id,$this->queued_imports)){
 								$searched_items[sanitize_title($row->name) . '-' . $row->meta_value] = $this->format_row($row);
-							}else{
+							} else{
 								continue;
 							}
-						}else if (false !== $post_status) {
+						} else if (false !== $post_status) {
 
 							$current_status = get_post_status($row->post_id);
 							if ($current_status !== $post_status) {
@@ -468,10 +468,10 @@ 
 					$return = $this->import_row($adata, $wetu_id, $post_id, $team_members, $content, $safari_brands);
 					$this->remove_from_queue($return);
 					$this->format_completed_row($return);
-				}else{
+				} else{
 				    if(isset($adata['error'])){
 				        $this->format_error($adata['error']);
-                    }else{
+                    } else{
 						$this->format_error(esc_html__('There was a problem importing your destination.','wet-importer'));
                     }
                 }

classes/class-importer.php

Indentation +37 added lines, -37 removed lines

@@ -210,15 +210,15 @@ 
 			$this->api_username = false;
 			$this->api_password = false;
 
-            if (isset($temp_options['api']['wetu_api_key']) && '' !== $temp_options['api']['wetu_api_key']) {
-                $this->api_key = $temp_options['api']['wetu_api_key'];
-            }
-            if (isset($temp_options['api']['wetu_api_username']) && '' !== $temp_options['api']['wetu_api_username']) {
-                $this->api_username = $temp_options['api']['wetu_api_username'];
-            }
-            if (isset($temp_options['api']['wetu_api_password']) && '' !== $temp_options['api']['wetu_api_password']) {
-                $this->api_password = $temp_options['api']['wetu_api_password'];
-            }
+			if (isset($temp_options['api']['wetu_api_key']) && '' !== $temp_options['api']['wetu_api_key']) {
+				$this->api_key = $temp_options['api']['wetu_api_key'];
+			}
+			if (isset($temp_options['api']['wetu_api_username']) && '' !== $temp_options['api']['wetu_api_username']) {
+				$this->api_username = $temp_options['api']['wetu_api_username'];
+			}
+			if (isset($temp_options['api']['wetu_api_password']) && '' !== $temp_options['api']['wetu_api_password']) {
+				$this->api_password = $temp_options['api']['wetu_api_password'];
+			}
 
 			//Set the tab slug
 			if(isset($_GET['tab']) || isset($_POST['type'])) {
@@ -234,22 +234,22 @@ 
 			}
 
 			//Set the scaling options
-            if (isset($temp_options[$this->plugin_slug]) && !empty($temp_options[$this->plugin_slug]) && isset($this->options['image_scaling'])) {
-                $this->scale_images = true;
-                $width = '800';
-                if (isset($this->options['width']) && '' !== $this->options['width']) {
-                    $width = $this->options['width'];
-                }
-                $height = '600';
-                if (isset($this->options['height']) && '' !== $this->options['height']) {
-                    $height = $this->options['height'];
-                }
-                $cropping = 'raw';
-                if (isset($this->options['cropping']) && '' !== $this->options['cropping']) {
-                    $cropping = $this->options['cropping'];
-                }
-                $this->image_scaling_url = 'https://wetu.com/ImageHandler/' . $cropping . $width . 'x' . $height . '/';
-            }
+			if (isset($temp_options[$this->plugin_slug]) && !empty($temp_options[$this->plugin_slug]) && isset($this->options['image_scaling'])) {
+				$this->scale_images = true;
+				$width = '800';
+				if (isset($this->options['width']) && '' !== $this->options['width']) {
+					$width = $this->options['width'];
+				}
+				$height = '600';
+				if (isset($this->options['height']) && '' !== $this->options['height']) {
+					$height = $this->options['height'];
+				}
+				$cropping = 'raw';
+				if (isset($this->options['cropping']) && '' !== $this->options['cropping']) {
+					$cropping = $this->options['cropping'];
+				}
+				$this->image_scaling_url = 'https://wetu.com/ImageHandler/' . $cropping . $width . 'x' . $height . '/';
+			}
 
 		}
 	}
@@ -323,10 +323,10 @@ 
 
 	// DISPLAY FUNCTIONS
 
-    /*
+	/*
      * Load the importer class you want to use
      */
-    public function load_class(){
+	public function load_class(){
 
 		switch($this->tab_slug){
 			case 'accommodation':
@@ -346,7 +346,7 @@ 
 				break;
 		}
 
-    }
+	}
 
 	/**
 	 * Registers the admin page which will house the importer form.
@@ -402,7 +402,7 @@ 
 				<?php*/
 			}else{
 			   $this->current_importer->display_page();
-            }; ?>
+			}; ?>
         </div>
 		<?php
 	}
@@ -802,12 +802,12 @@ 
 	 */
 	public function set_featured_image($data,$id) {
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if('tour' === $this->tab_slug){
-		        $key = array_rand($data[0]['content']['images']);
-                $this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
-            }else{
+			if('tour' === $this->tab_slug){
+				$key = array_rand($data[0]['content']['images']);
+				$this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
+			}else{
 				$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
-            }
+			}
 
 
 			if(false !== $this->featured_image){
@@ -827,7 +827,7 @@ 
 	 */
 	public function set_banner_image($data,$id) {
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
+			if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
 				$temp_banner = $this->attach_image($data[0]['destination_image'], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
 			}else{
 				if ('tour' === $this->tab_slug) {
@@ -836,7 +836,7 @@ 
 				} else {
 					$temp_banner = $this->attach_image($data[0]['content']['images'][1], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
 				}
-            }
+			}
 
 
 			if(false !== $temp_banner){
@@ -1048,7 +1048,7 @@ 
 	 * Run through the accommodation grabbed from the DB.
 	 */
 	public function process_ajax_search() {
-	    $this->current_importer->process_ajax_search();
+		$this->current_importer->process_ajax_search();
 		die();
 	}
 

Spacing +257 added lines, -257 removed lines

@@ -156,31 +156,31 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'admin_init', array( $this, 'compatible_version_check' ) );
+		add_action('admin_init', array($this, 'compatible_version_check'));
 
 		// Don't run anything else in the plugin, if we're on an incompatible PHP version
-		if ( ! self::compatible_version() ) {
+		if (!self::compatible_version()) {
 			return;
 		}
 
 		$this->set_variables();
 
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
-		add_action( 'admin_enqueue_scripts', array($this,'admin_scripts') ,11 );
-		add_action( 'admin_menu', array( $this, 'register_importer_page' ),20 );
+		add_action('init', array($this, 'load_plugin_textdomain'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts'), 11);
+		add_action('admin_menu', array($this, 'register_importer_page'), 20);
 
 		require_once(WETU_IMPORTER_PATH.'classes/class-accommodation.php');
 		require_once(WETU_IMPORTER_PATH.'classes/class-destination.php');
 		require_once(WETU_IMPORTER_PATH.'classes/class-tours.php');
 
-		add_action( 'init', array( $this, 'load_class' ) );
+		add_action('init', array($this, 'load_class'));
 
-		if('default' !== $this->tab_slug){
-			add_action('wp_ajax_lsx_tour_importer',array($this,'process_ajax_search'));
-			add_action('wp_ajax_nopriv_lsx_tour_importer',array($this,'process_ajax_search'));
+		if ('default' !== $this->tab_slug) {
+			add_action('wp_ajax_lsx_tour_importer', array($this, 'process_ajax_search'));
+			add_action('wp_ajax_nopriv_lsx_tour_importer', array($this, 'process_ajax_search'));
 
-			add_action('wp_ajax_lsx_import_items',array($this,'process_ajax_import'));
-			add_action('wp_ajax_nopriv_lsx_import_items',array($this,'process_ajax_import'));
+			add_action('wp_ajax_lsx_import_items', array($this, 'process_ajax_import'));
+			add_action('wp_ajax_nopriv_lsx_import_items', array($this, 'process_ajax_import'));
 		}
 	}
 
@@ -192,18 +192,18 @@ 
 	 * @since 1.0.0
 	 */
 	public function load_plugin_textdomain() {
-		load_plugin_textdomain( 'wetu-importer', FALSE, basename( WETU_IMPORTER_PATH ) . '/languages');
+		load_plugin_textdomain('wetu-importer', FALSE, basename(WETU_IMPORTER_PATH).'/languages');
 	}
 
 	/**
 	 * Sets the variables used throughout the plugin.
 	 */
 	public function set_variables() {
-		$this->post_types = array('accommodation','destination','tour');
-		$temp_options = get_option('_lsx-to_settings',false);
+		$this->post_types = array('accommodation', 'destination', 'tour');
+		$temp_options = get_option('_lsx-to_settings', false);
 
 		//Set the options.
-		if(false !== $temp_options && isset($temp_options[$this->plugin_slug])) {
+		if (false !== $temp_options && isset($temp_options[$this->plugin_slug])) {
 			$this->options = $temp_options[$this->plugin_slug];
 
 			$this->api_key = false;
@@ -221,10 +221,10 @@ 
             }
 
 			//Set the tab slug
-			if(isset($_GET['tab']) || isset($_POST['type'])) {
+			if (isset($_GET['tab']) || isset($_POST['type'])) {
 				if (isset($_GET['tab'])) {
 					$this->tab_slug = $_GET['tab'];
-				} else {
+				}else {
 					$this->tab_slug = $_POST['type'];
 				}
 
@@ -248,7 +248,7 @@ 
                 if (isset($this->options['cropping']) && '' !== $this->options['cropping']) {
                     $cropping = $this->options['cropping'];
                 }
-                $this->image_scaling_url = 'https://wetu.com/ImageHandler/' . $cropping . $width . 'x' . $height . '/';
+                $this->image_scaling_url = 'https://wetu.com/ImageHandler/'.$cropping.$width.'x'.$height.'/';
             }
 
 		}
@@ -271,7 +271,7 @@ 
 	 * @since 1.0.0
 	 */
 	public static function compatible_version() {
-		if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
+		if (version_compare(PHP_VERSION, '5.6', '<')) {
 			return false;
 		}
 
@@ -285,13 +285,13 @@ 
 	 * @since 1.0.0
 	 */
 	public function compatible_version_check() {
-		if ( ! self::compatible_version() ) {
-			if ( is_plugin_active( plugin_basename( WETU_IMPORTER_CORE ) ) ) {
-				deactivate_plugins( plugin_basename( WETU_IMPORTER_CORE ) );
-				add_action( 'admin_notices', array( $this, 'compatible_version_notice' ) );
+		if (!self::compatible_version()) {
+			if (is_plugin_active(plugin_basename(WETU_IMPORTER_CORE))) {
+				deactivate_plugins(plugin_basename(WETU_IMPORTER_CORE));
+				add_action('admin_notices', array($this, 'compatible_version_notice'));
 				
-				if ( isset( $_GET['activate'] ) ) {
-					unset( $_GET['activate'] );
+				if (isset($_GET['activate'])) {
+					unset($_GET['activate']);
 				}
 			}
 		}
@@ -304,8 +304,8 @@ 
 	 */
 	public function compatible_version_notice() {
 		$class = 'notice notice-error';
-		$message = esc_html__( 'Wetu Importer Plugin requires PHP 5.6 or higher.', 'wetu-importer' );
-		printf( '<div class="%1$s"><p>%2$s</p></div>', esc_html( $class ), esc_html( $message ) );
+		$message = esc_html__('Wetu Importer Plugin requires PHP 5.6 or higher.', 'wetu-importer');
+		printf('<div class="%1$s"><p>%2$s</p></div>', esc_html($class), esc_html($message));
 	}
 	
 	/**
@@ -315,9 +315,9 @@ 
 	 * @since 1.0.0
 	 */
 	public static function compatible_version_check_on_activation() {
-		if ( ! self::compatible_version() ) {
-			deactivate_plugins( plugin_basename( WETU_IMPORTER_CORE ) );
-			wp_die( esc_html__( 'Wetu Importer Plugin requires PHP 5.6 or higher.', 'wetu-importer' ) );
+		if (!self::compatible_version()) {
+			deactivate_plugins(plugin_basename(WETU_IMPORTER_CORE));
+			wp_die(esc_html__('Wetu Importer Plugin requires PHP 5.6 or higher.', 'wetu-importer'));
 		}
 	}
 
@@ -326,9 +326,9 @@ 
     /*
      * Load the importer class you want to use
      */
-    public function load_class(){
+    public function load_class() {
 
-		switch($this->tab_slug){
+		switch ($this->tab_slug) {
 			case 'accommodation':
 				$this->current_importer = new WETU_Importer_Accommodation();
 				break;
@@ -352,25 +352,25 @@ 
 	 * Registers the admin page which will house the importer form.
 	 */
 	public function register_importer_page() {
-		add_submenu_page( 'tour-operator',esc_html__( 'Importer', 'tour-operator' ), esc_html__( 'Importer', 'tour-operator' ), 'manage_options', 'wetu-importer', array( $this, 'display_page' ) );
+		add_submenu_page('tour-operator', esc_html__('Importer', 'tour-operator'), esc_html__('Importer', 'tour-operator'), 'manage_options', 'wetu-importer', array($this, 'display_page'));
 	}
 
 	/**
 	 * Enqueue the JS needed to contact wetu and return your result.
 	 */
 	public function admin_scripts() {
-		if ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) {
+		if (defined('WP_DEBUG') && true === WP_DEBUG) {
 			$min = '';
-		} else {
+		}else {
 			$min = '.min';
 		}
 		$min = '';
 
-		if(is_admin() && isset($_GET['page']) && $this->plugin_slug === $_GET['page']){
-			wp_enqueue_script( 'wetu-importers-script', WETU_IMPORTER_URL . 'assets/js/wetu-importer' . $min . '.js', array( 'jquery' ), WETU_IMPORTER_VER, true );
-			wp_localize_script( 'wetu-importers-script', 'lsx_tour_importer_params', array(
+		if (is_admin() && isset($_GET['page']) && $this->plugin_slug === $_GET['page']) {
+			wp_enqueue_script('wetu-importers-script', WETU_IMPORTER_URL.'assets/js/wetu-importer'.$min.'.js', array('jquery'), WETU_IMPORTER_VER, true);
+			wp_localize_script('wetu-importers-script', 'lsx_tour_importer_params', array(
 				'ajax_url' => admin_url('admin-ajax.php'),
-			) );
+			));
 		}
 	}
 
@@ -382,14 +382,14 @@ 
         <div class="wrap">
 			<?php screen_icon(); ?>
 
-			<?php if(!is_object($this->current_importer)){
+			<?php if (!is_object($this->current_importer)) {
 				?>
-                <h2><?php _e('Welcome to the LSX Wetu Importer','wetu-importer'); ?></h2>
+                <h2><?php _e('Welcome to the LSX Wetu Importer', 'wetu-importer'); ?></h2>
                 <p>If this is the first time you are running the import, then follow the steps below.</p>
                 <ul>
-                    <li>Step 1 - Import your <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=tour"><?php _e('Tours','wetu-importer'); ?></a></li>
-                    <li>Step 2 - The tour import will have created draft <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation','wetu-importer'); ?></a> that will need to be imported.</li>
-                    <li>Step 3 - Lastly import the <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations','wetu-importer'); ?></a> draft posts created during the previous two steps.</li>
+                    <li>Step 1 - Import your <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=tour"><?php _e('Tours', 'wetu-importer'); ?></a></li>
+                    <li>Step 2 - The tour import will have created draft <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation', 'wetu-importer'); ?></a> that will need to be imported.</li>
+                    <li>Step 3 - Lastly import the <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations', 'wetu-importer'); ?></a> draft posts created during the previous two steps.</li>
                 </ul>
 
                 <?php /*<h3><?php _e('Additional Tools','wetu-importer'); ?></h3>
@@ -400,7 +400,7 @@ 
 					<?php } ?>
                 </ul>
 				<?php*/
-			}else{
+			}else {
 			   $this->current_importer->display_page();
             }; ?>
         </div>
@@ -415,38 +415,38 @@ 
         <form class="ajax-form" id="<?php echo $this->plugin_slug; ?>-search-form" method="get" action="tools.php" data-type="<?php echo $this->tab_slug; ?>">
             <input type="hidden" name="page" value="<?php echo $this->tab_slug; ?>" />
 
-            <h3><span class="dashicons dashicons-search"></span> <?php _e('Search','wetu-importer'); ?></h3>
+            <h3><span class="dashicons dashicons-search"></span> <?php _e('Search', 'wetu-importer'); ?></h3>
 
-			<?php do_action('wetu_importer_search_form',$this); ?>
+			<?php do_action('wetu_importer_search_form', $this); ?>
 
             <div class="normal-search">
-                <input pattern=".{3,}" placeholder="3 characters minimum" class="keyword" name="keyword" value=""> <input class="button button-primary submit" type="submit" value="<?php _e('Search','wetu-importer'); ?>" />
+                <input pattern=".{3,}" placeholder="3 characters minimum" class="keyword" name="keyword" value=""> <input class="button button-primary submit" type="submit" value="<?php _e('Search', 'wetu-importer'); ?>" />
             </div>
             <div class="advanced-search hidden" style="display:none;">
-                <p><?php _e('Enter several keywords, each on a new line.','wetu-importer'); ?></p>
+                <p><?php _e('Enter several keywords, each on a new line.', 'wetu-importer'); ?></p>
                 <textarea rows="10" cols="40" name="bulk-keywords"></textarea>
-                <input class="button button-primary submit" type="submit" value="<?php _e('Search','wetu-importer'); ?>" />
+                <input class="button button-primary submit" type="submit" value="<?php _e('Search', 'wetu-importer'); ?>" />
             </div>
 
             <p>
-                <a class="advanced-search-toggle" href="#"><?php _e('Bulk Search','wetu-importer'); ?></a> |
-                <a class="published search-toggle" href="#publish"><?php esc_attr_e('Published','wetu-importer'); ?></a> |
-                <a class="pending search-toggle"  href="#pending"><?php esc_attr_e('Pending','wetu-importer'); ?></a> |
-                <a class="draft search-toggle"  href="#draft"><?php esc_attr_e('Draft','wetu-importer'); ?></a>
-
-                <?php if('tour'===$this->tab_slug){ ?>
-                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU','wetu-importer'); ?></a>
-                <?php }else if(!empty($this->queued_imports)) { ?>
-                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue','wetu-importer'); ?></a>
+                <a class="advanced-search-toggle" href="#"><?php _e('Bulk Search', 'wetu-importer'); ?></a> |
+                <a class="published search-toggle" href="#publish"><?php esc_attr_e('Published', 'wetu-importer'); ?></a> |
+                <a class="pending search-toggle"  href="#pending"><?php esc_attr_e('Pending', 'wetu-importer'); ?></a> |
+                <a class="draft search-toggle"  href="#draft"><?php esc_attr_e('Draft', 'wetu-importer'); ?></a>
+
+                <?php if ('tour' === $this->tab_slug) { ?>
+                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU', 'wetu-importer'); ?></a>
+                <?php }else if (!empty($this->queued_imports)) { ?>
+                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue', 'wetu-importer'); ?></a>
                 <?php } ?>
             </p>
 
             <div class="ajax-loader" style="display:none;width:100%;text-align:center;">
-                <img style="width:64px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif';?>" />
+                <img style="width:64px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif'; ?>" />
             </div>
 
             <div class="ajax-loader-small" style="display:none;width:100%;text-align:center;">
-                <img style="width:32px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif';?>" />
+                <img style="width:32px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif'; ?>" />
             </div>
         </form> 
 		<?php
@@ -495,15 +495,15 @@ 
 	 *
 	 * @param $tab string
 	 */
-	public function navigation($tab='') {
+	public function navigation($tab = '') {
 		$post_types = array(
-			'tour'              => esc_attr('Tours','wetu-importer'),
-			'accommodation'     => esc_attr('Accommodation','wetu-importer'),
-			'destination'       => esc_attr('Destinations','wetu-importer'),
+			'tour'              => esc_attr('Tours', 'wetu-importer'),
+			'accommodation'     => esc_attr('Accommodation', 'wetu-importer'),
+			'destination'       => esc_attr('Destinations', 'wetu-importer'),
 		);
-		echo '<div class="wet-navigation"><div class="subsubsub"><a class="'.$this->itemd($tab,'','current',false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'">'.esc_attr('Home','wetu-importer').'</a>';
-		foreach($post_types as $post_type => $label){
-			echo ' | <a class="'.$this->itemd($tab,$post_type,'current',false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'&tab='.$post_type.'">'.$label.'</a>';
+		echo '<div class="wet-navigation"><div class="subsubsub"><a class="'.$this->itemd($tab, '', 'current', false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'">'.esc_attr('Home', 'wetu-importer').'</a>';
+		foreach ($post_types as $post_type => $label) {
+			echo ' | <a class="'.$this->itemd($tab, $post_type, 'current', false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'&tab='.$post_type.'">'.$label.'</a>';
 		}
 		echo '</div><br clear="both"/></div>';
 	}
@@ -511,23 +511,23 @@ 
 	/**
 	 * set_taxonomy with some terms
 	 */
-	public function team_member_checkboxes($selected=array()) {
-		if(post_type_exists('team')) { ?>
+	public function team_member_checkboxes($selected = array()) {
+		if (post_type_exists('team')) { ?>
             <ul>
 				<?php
-				$team_args=array(
+				$team_args = array(
 					'post_type'	=>	'team',
 					'post_status' => 'publish',
 					'nopagin' => true,
 					'fields' => 'ids'
 				);
 				$team_members = new WP_Query($team_args);
-				if($team_members->have_posts()){
-					foreach($team_members->posts as $member){ ?>
-                        <li><input class="team" <?php $this->checked($selected,$member); ?> type="checkbox" value="<?php echo $member; ?>" /> <?php echo get_the_title($member); ?></li>
+				if ($team_members->have_posts()) {
+					foreach ($team_members->posts as $member) { ?>
+                        <li><input class="team" <?php $this->checked($selected, $member); ?> type="checkbox" value="<?php echo $member; ?>" /> <?php echo get_the_title($member); ?></li>
 					<?php }
-				}else{ ?>
-                    <li><input class="team" type="checkbox" value="0" /> <?php _e('None','wetu-importer'); ?></li>
+				}else { ?>
+                    <li><input class="team" type="checkbox" value="0" /> <?php _e('None', 'wetu-importer'); ?></li>
 				<?php }
 				?>
             </ul>
@@ -544,12 +544,12 @@ 
 	 * @param $needle string
 	 * @param $echo bool
 	 */
-	public function checked($haystack=false,$needle='',$echo=true) {
-		$return = $this->itemd($haystack,$needle,'checked');
-		if('' !== $return) {
+	public function checked($haystack = false, $needle = '', $echo = true) {
+		$return = $this->itemd($haystack, $needle, 'checked');
+		if ('' !== $return) {
 			if (true === $echo) {
 				echo $return;
-			} else {
+			}else {
 				return $return;
 			}
 		}
@@ -562,12 +562,12 @@ 
 	 * @param $needle string
 	 * @param $echo bool
 	 */
-	public function selected($haystack=false,$needle='',$echo=true) {
-		$return = $this->itemd($haystack,$needle,'selected');
-		if('' !== $return) {
+	public function selected($haystack = false, $needle = '', $echo = true) {
+		$return = $this->itemd($haystack, $needle, 'selected');
+		if ('' !== $return) {
 			if (true === $echo) {
 				echo $return;
-			} else {
+			}else {
 				return $return;
 			}
 		}
@@ -582,16 +582,16 @@ 
 	 * @param $wrap bool
 	 * @return $html string
 	 */
-	public function itemd($haystack=false,$needle='',$type='',$wrap=true) {
+	public function itemd($haystack = false, $needle = '', $type = '', $wrap = true) {
 		$html = '';
-		if('' !== $type) {
+		if ('' !== $type) {
 			if (!is_array($haystack)) {
 				$haystack = array($haystack);
 			}
 			if (in_array($needle, $haystack)) {
-				if(true === $wrap || 'true' === $wrap) {
-					$html = $type . '="' . $type . '"';
-				}else{
+				if (true === $wrap || 'true' === $wrap) {
+					$html = $type.'="'.$type.'"';
+				}else {
 					$html = $type;
 				}
 			}
@@ -603,9 +603,9 @@ 
 	/**
 	 * grabs any attachments for the current item
 	 */
-	public function find_attachments($id=false) {
-		if(false !== $id){
-			if(empty($this->found_attachments)){
+	public function find_attachments($id = false) {
+		if (false !== $id) {
+			if (empty($this->found_attachments)) {
 
 				$attachments_args = array(
 					'post_parent' => $id,
@@ -617,9 +617,9 @@ 
 				);
 
 				$attachments = new WP_Query($attachments_args);
-				if($attachments->have_posts()){
-					foreach($attachments->posts as $attachment){
-						$this->found_attachments[$attachment->ID] = str_replace(array('.jpg','.png','.jpeg'),'',$attachment->post_title);
+				if ($attachments->have_posts()) {
+					foreach ($attachments->posts as $attachment) {
+						$this->found_attachments[$attachment->ID] = str_replace(array('.jpg', '.png', '.jpeg'), '', $attachment->post_title);
 						$this->gallery_meta[] = $attachment->ID;
 					}
 				}
@@ -633,18 +633,18 @@ 
 	/**
 	 * Saves the room data
 	 */
-	public function save_custom_field($value=false,$meta_key,$id,$decrease=false,$unique=true) {
-		if(false !== $value){
-			if(false !== $decrease){
+	public function save_custom_field($value = false, $meta_key, $id, $decrease = false, $unique = true) {
+		if (false !== $value) {
+			if (false !== $decrease) {
 				$value = intval($value);
 				$value--;
 			}
-			$prev = get_post_meta($id,$meta_key,true);
+			$prev = get_post_meta($id, $meta_key, true);
 
-			if(false !== $id && '0' !== $id && false !== $prev && true === $unique){
-				update_post_meta($id,$meta_key,$value,$prev);
-			}else{
-				add_post_meta($id,$meta_key,$value,$unique);
+			if (false !== $id && '0' !== $id && false !== $prev && true === $unique) {
+				update_post_meta($id, $meta_key, $value, $prev);
+			}else {
+				add_post_meta($id, $meta_key, $value, $unique);
 			}
 		}
 	}
@@ -653,12 +653,12 @@ 
 	 * Grabs the custom fields,  and resaves an array of unique items.
 	 */
 	public function cleanup_posts() {
-		if(!empty($this->cleanup_posts)){
-			foreach($this->cleanup_posts as $id => $key) {
+		if (!empty($this->cleanup_posts)) {
+			foreach ($this->cleanup_posts as $id => $key) {
 				$prev_items = get_post_meta($id, $key, false);
 				$new_items = array_unique($prev_items);
 				delete_post_meta($id, $key);
-				foreach($new_items as $new_item) {
+				foreach ($new_items as $new_item) {
 					add_post_meta($id, $key, $new_item, false);
 				}
 			}
@@ -670,51 +670,51 @@ 
 	/**
 	 * set_taxonomy with some terms
 	 */
-	public function set_taxonomy($taxonomy,$terms,$id) {
-		$result=array();
-		if(!empty($data))
+	public function set_taxonomy($taxonomy, $terms, $id) {
+		$result = array();
+		if (!empty($data))
 		{
-			foreach($data as $k)
+			foreach ($data as $k)
 			{
-				if($id)
+				if ($id)
 				{
-					if(!$term = term_exists(trim($k), $tax))
+					if (!$term = term_exists(trim($k), $tax))
 					{
 						$term = wp_insert_term(trim($k), $tax);
-						if ( is_wp_error($term) )
+						if (is_wp_error($term))
 						{
 							echo $term->get_error_message();
 						}
 						else
 						{
-							wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+							wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 						}
 					}
 					else
 					{
-						wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+						wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 					}
 				}
 				else
 				{
-					$result[]=trim($k);
+					$result[] = trim($k);
 				}
 			}
 		}
 		return $result;
 	}
 
-	public function set_term($id=false,$name=false,$taxonomy=false,$parent=false){
-		if(!$term = term_exists($name, $taxonomy))
+	public function set_term($id = false, $name = false, $taxonomy = false, $parent = false) {
+		if (!$term = term_exists($name, $taxonomy))
 		{
-			if(false !== $parent){ $parent = array('parent'=>$parent); }
-			$term = wp_insert_term(trim($name), $taxonomy,$parent);
-			if ( is_wp_error($term) ){echo $term->get_error_message();}
-			else { wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true); }
+			if (false !== $parent) { $parent = array('parent'=>$parent); }
+			$term = wp_insert_term(trim($name), $taxonomy, $parent);
+			if (is_wp_error($term)) {echo $term->get_error_message(); }
+			else { wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true); }
 		}
 		else
 		{
-			wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+			wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 		}
 		return $term['term_id'];
 	}
@@ -722,18 +722,18 @@ 
 	/**
 	 * set_taxonomy with some terms
 	 */
-	public function taxonomy_checkboxes($taxonomy=false,$selected=array()) {
+	public function taxonomy_checkboxes($taxonomy = false, $selected = array()) {
 		$return = '';
-		if(false !== $taxonomy){
+		if (false !== $taxonomy) {
 			$return .= '<ul>';
-			$terms = get_terms(array('taxonomy'=>$taxonomy,'hide_empty'=>false));
+			$terms = get_terms(array('taxonomy'=>$taxonomy, 'hide_empty'=>false));
 
-			if(!is_wp_error($terms)){
-				foreach($terms as $term){
-					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected,$term->term_id,false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
+			if (!is_wp_error($terms)) {
+				foreach ($terms as $term) {
+					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected, $term->term_id, false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
 				}
-			}else{
-				$return .= '<li><input type="checkbox" value="" /> '.__('None','wetu-importer').'</li>';
+			}else {
+				$return .= '<li><input type="checkbox" value="" /> '.__('None', 'wetu-importer').'</li>';
 			}
 			$return .= '</ul>';
 		}
@@ -744,53 +744,53 @@ 
 	/**
 	 * Saves the longitude and lattitude, as well as sets the map marker.
 	 */
-	public function set_map_data($data,$id,$zoom = '10') {
+	public function set_map_data($data, $id, $zoom = '10') {
 		$longitude = $latitude = $address = false;
 
-		if(isset($data[0]['position'])){
+		if (isset($data[0]['position'])) {
 
-			if(isset($data[0]['position']['driving_latitude'])){
+			if (isset($data[0]['position']['driving_latitude'])) {
 				$latitude = $data[0]['position']['driving_latitude'];
-			}elseif(isset($data[0]['position']['latitude'])){
+			}elseif (isset($data[0]['position']['latitude'])) {
 				$latitude = $data[0]['position']['latitude'];
 			}
 
-			if(isset($data[0]['position']['driving_longitude'])){
+			if (isset($data[0]['position']['driving_longitude'])) {
 				$longitude = $data[0]['position']['driving_longitude'];
-			}elseif(isset($data[0]['position']['longitude'])){
+			}elseif (isset($data[0]['position']['longitude'])) {
 				$longitude = $data[0]['position']['longitude'];
 			}
 
 		}
-		if(isset($data[0]['content']) && isset($data[0]['content']['contact_information'])){
-			if(isset($data[0]['content']['contact_information']['address'])){
+		if (isset($data[0]['content']) && isset($data[0]['content']['contact_information'])) {
+			if (isset($data[0]['content']['contact_information']['address'])) {
 				$address = strip_tags($data[0]['content']['contact_information']['address']);
 
-				$address = explode("\n",$address);
-				foreach($address as $bitkey => $bit){
+				$address = explode("\n", $address);
+				foreach ($address as $bitkey => $bit) {
 					$bit = ltrim(rtrim($bit));
-					if(false === $bit || '' === $bit || null === $bit or empty($bit)){
+					if (false === $bit || '' === $bit || null === $bit or empty($bit)) {
 						unset($address[$bitkey]);
 					}
 				}
-				$address = implode(', ',$address);
+				$address = implode(', ', $address);
 				$address = str_replace(', , ', ', ', $address);
 			}
 		}
 
-		if(false !== $longitude){
+		if (false !== $longitude) {
 			$location_data = array(
-				'address'	=>	(string)$address,
-				'lat'		=>	(string)$latitude,
-				'long'		=>	(string)$longitude,
-				'zoom'		=>	(string)$zoom,
+				'address'	=>	(string) $address,
+				'lat'		=>	(string) $latitude,
+				'long'		=>	(string) $longitude,
+				'zoom'		=>	(string) $zoom,
 				'elevation'	=>	'',
 			);
-			if(false !== $id && '0' !== $id){
-				$prev = get_post_meta($id,'location',true);
-				update_post_meta($id,'location',$location_data,$prev);
-			}else{
-				add_post_meta($id,'location',$location_data,true);
+			if (false !== $id && '0' !== $id) {
+				$prev = get_post_meta($id, 'location', true);
+				update_post_meta($id, 'location', $location_data, $prev);
+			}else {
+				add_post_meta($id, 'location', $location_data, true);
 			}
 		}
 	}
@@ -800,22 +800,22 @@ 
 	/**
 	 * Creates the main gallery data
 	 */
-	public function set_featured_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if('tour' === $this->tab_slug){
+	public function set_featured_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+		    if ('tour' === $this->tab_slug) {
 		        $key = array_rand($data[0]['content']['images']);
-                $this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
-            }else{
-				$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
+                $this->featured_image = $this->attach_image($data[0]['content']['images'][$key], $id);
+            }else {
+				$this->featured_image = $this->attach_image($data[0]['content']['images'][0], $id);
             }
 
 
-			if(false !== $this->featured_image){
-				delete_post_meta($id,'_thumbnail_id');
-				add_post_meta($id,'_thumbnail_id',$this->featured_image,true);
+			if (false !== $this->featured_image) {
+				delete_post_meta($id, '_thumbnail_id');
+				add_post_meta($id, '_thumbnail_id', $this->featured_image, true);
 
-				if(!empty($this->gallery_meta) && !in_array($this->featured_image,$this->gallery_meta)){
-					add_post_meta($id,'gallery',$this->featured_image,false);
+				if (!empty($this->gallery_meta) && !in_array($this->featured_image, $this->gallery_meta)) {
+					add_post_meta($id, 'gallery', $this->featured_image, false);
 					$this->gallery_meta[] = $this->featured_image;
 				}
 			}
@@ -825,29 +825,29 @@ 
 	/**
 	 * Sets a banner image
 	 */
-	public function set_banner_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
+	public function set_banner_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+		    if (isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
 				$temp_banner = $this->attach_image($data[0]['destination_image'], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-			}else{
+			}else {
 				if ('tour' === $this->tab_slug) {
 					$key = array_rand($data[0]['content']['images']);
 					$temp_banner = $this->attach_image($data[0]['content']['images'][$key], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-				} else {
+				}else {
 					$temp_banner = $this->attach_image($data[0]['content']['images'][1], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
 				}
             }
 
 
-			if(false !== $temp_banner){
+			if (false !== $temp_banner) {
 				$this->banner_image = $temp_banner;
 
-				delete_post_meta($id,'image_group');
+				delete_post_meta($id, 'image_group');
 				$new_banner = array('banner_image'=>array('cmb-field-0'=>$this->banner_image));
-				add_post_meta($id,'image_group',$new_banner,true);
+				add_post_meta($id, 'image_group', $new_banner, true);
 
-				if(!empty($this->gallery_meta) && !in_array($this->banner_image,$this->gallery_meta)){
-					add_post_meta($id,'gallery',$this->banner_image,false);
+				if (!empty($this->gallery_meta) && !in_array($this->banner_image, $this->gallery_meta)) {
+					add_post_meta($id, 'gallery', $this->banner_image, false);
 					$this->gallery_meta[] = $this->banner_image;
 				}
 			}
@@ -857,24 +857,24 @@ 
 	/**
 	 * Creates the main gallery data
 	 */
-	public function create_main_gallery($data,$id) {
+	public function create_main_gallery($data, $id) {
 
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
 			$counter = 0;
-			foreach($data[0]['content']['images'] as $image_data){
-				if($counter === 0 && false !== $this->featured_image){$counter++;continue;}
-				if($counter === 1 && false !== $this->banner_image){$counter++;continue;}
+			foreach ($data[0]['content']['images'] as $image_data) {
+				if ($counter === 0 && false !== $this->featured_image) {$counter++; continue; }
+				if ($counter === 1 && false !== $this->banner_image) {$counter++; continue; }
 
-				$this->gallery_meta[] = $this->attach_image($image_data,$id);
+				$this->gallery_meta[] = $this->attach_image($image_data, $id);
 				$counter++;
 			}
 
-			if(!empty($this->gallery_meta)){
-				delete_post_meta($id,'gallery');
+			if (!empty($this->gallery_meta)) {
+				delete_post_meta($id, 'gallery');
 				$this->gallery_meta = array_unique($this->gallery_meta);
-				foreach($this->gallery_meta as $gallery_id){
-					if(false !== $gallery_id && '' !== $gallery_id && !is_array($gallery_id)){
-						add_post_meta($id,'gallery',$gallery_id,false);
+				foreach ($this->gallery_meta as $gallery_id) {
+					if (false !== $gallery_id && '' !== $gallery_id && !is_array($gallery_id)) {
+						add_post_meta($id, 'gallery', $gallery_id, false);
 					}
 				}
 			}
@@ -884,27 +884,27 @@ 
 	/**
 	 * search_form
 	 */
-	public function get_scaling_url($args=array()) {
+	public function get_scaling_url($args = array()) {
 
 		$defaults = array(
 			'width' => '640',
 			'height' => '480',
 			'cropping' => 'c'
 		);
-		if(false !== $this->options){
-			if(isset($this->options['width']) && '' !== $this->options['width']){
+		if (false !== $this->options) {
+			if (isset($this->options['width']) && '' !== $this->options['width']) {
 				$defaults['width'] = $this->options['width'];
 			}
 
-			if(isset($this->options['height']) && '' !== $this->options['height']){
+			if (isset($this->options['height']) && '' !== $this->options['height']) {
 				$defaults['height'] = $this->options['height'];
 			}
 
-			if(isset($this->options['cropping']) && '' !== $this->options['cropping']){
+			if (isset($this->options['cropping']) && '' !== $this->options['cropping']) {
 				$defaults['cropping'] = $this->options['cropping'];
 			}
 		}
-		$args = wp_parse_args($args,$defaults);
+		$args = wp_parse_args($args, $defaults);
 
 		$cropping = $args['cropping'];
 		$width = $args['width'];
@@ -917,42 +917,42 @@ 
 	/**
 	 * Attaches 1 image
 	 */
-	public function attach_image($v=false,$parent_id,$image_sizes=false){
-		if(false !== $v){
-			$temp_fragment = explode('/',$v['url_fragment']);
-			$url_filename = $temp_fragment[count($temp_fragment)-1];
-			$url_filename = str_replace(array('.jpg','.png','.jpeg'),'',$url_filename);
+	public function attach_image($v = false, $parent_id, $image_sizes = false) {
+		if (false !== $v) {
+			$temp_fragment = explode('/', $v['url_fragment']);
+			$url_filename = $temp_fragment[count($temp_fragment) - 1];
+			$url_filename = str_replace(array('.jpg', '.png', '.jpeg'), '', $url_filename);
 			$url_filename = trim($url_filename);
-			$url_filename = str_replace(" ",'_',$url_filename);
+			$url_filename = str_replace(" ", '_', $url_filename);
 
-			if(in_array($url_filename,$this->found_attachments)){
-				return array_search($url_filename,$this->found_attachments);
+			if (in_array($url_filename, $this->found_attachments)) {
+				return array_search($url_filename, $this->found_attachments);
 			}
 
-			$postdata=array();
-			if(empty($v['label']))
+			$postdata = array();
+			if (empty($v['label']))
 			{
-				$v['label']='';
+				$v['label'] = '';
 			}
-			if(!empty($v['description']))
+			if (!empty($v['description']))
 			{
-				$desc=wp_strip_all_tags($v['description']);
-				$posdata=array('post_excerpt'=>$desc);
+				$desc = wp_strip_all_tags($v['description']);
+				$posdata = array('post_excerpt'=>$desc);
 			}
-			if(!empty($v['section']))
+			if (!empty($v['section']))
 			{
-				$desc=wp_strip_all_tags($v['section']);
-				$posdata=array('post_excerpt'=>$desc);
+				$desc = wp_strip_all_tags($v['section']);
+				$posdata = array('post_excerpt'=>$desc);
 			}
 
-			$attachID=NULL;
+			$attachID = NULL;
 			//Resizor - add option to setting if required
-			$fragment = str_replace(' ','%20',$v['url_fragment']);
+			$fragment = str_replace(' ', '%20', $v['url_fragment']);
 			$url = $this->get_scaling_url($image_sizes).$fragment;
-			$attachID = $this->attach_external_image2($url,$parent_id,'',$v['label'],$postdata);
+			$attachID = $this->attach_external_image2($url, $parent_id, '', $v['label'], $postdata);
 
 			//echo($attachID.' add image');
-			if($attachID!=NULL)
+			if ($attachID != NULL)
 			{
 				return $attachID;
 			}
@@ -960,13 +960,13 @@ 
 		return 	false;
 	}
 
-	public function attach_external_image2( $url = null, $post_id = null, $thumb = null, $filename = null, $post_data = array() ) {
+	public function attach_external_image2($url = null, $post_id = null, $thumb = null, $filename = null, $post_data = array()) {
 
-		if ( !$url || !$post_id ) { return new WP_Error('missing', "Need a valid URL and post ID..."); }
+		if (!$url || !$post_id) { return new WP_Error('missing', "Need a valid URL and post ID..."); }
 
-		require_once(ABSPATH . 'wp-admin/includes/file.php');
-		require_once(ABSPATH . 'wp-admin/includes/media.php');
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/file.php');
+		require_once(ABSPATH.'wp-admin/includes/media.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 		// Download file to temp location, returns full server path to temp file
 		//$tmp = download_url( $url );
 
@@ -975,53 +975,53 @@ 
 
 		$image = file_get_contents($url);
 		file_put_contents($tmp, $image);
-		chmod($tmp,'777');
+		chmod($tmp, '777');
 
-		preg_match('/[^\?]+\.(tif|TIFF|jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG|pdf|PDF|bmp|BMP)/', $url, $matches);    // fix file filename for query strings
+		preg_match('/[^\?]+\.(tif|TIFF|jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG|pdf|PDF|bmp|BMP)/', $url, $matches); // fix file filename for query strings
 		$url_filename = basename($matches[0]);
-		$url_filename=str_replace('%20','_',$url_filename);
+		$url_filename = str_replace('%20', '_', $url_filename);
 		// extract filename from url for title
-		$url_type = wp_check_filetype($url_filename);                                           // determine file type (ext and mime/type)
+		$url_type = wp_check_filetype($url_filename); // determine file type (ext and mime/type)
 
 		// override filename if given, reconstruct server path
-		if ( !empty( $filename ) && " " != $filename )
+		if (!empty($filename) && " " != $filename)
 		{
 			$filename = sanitize_file_name($filename);
-			$tmppath = pathinfo( $tmp );
+			$tmppath = pathinfo($tmp);
 
 			$extension = '';
-			if(isset($tmppath['extension'])){
+			if (isset($tmppath['extension'])) {
 				$extension = $tmppath['extension'];
 			}
 
-			$new = $tmppath['dirname'] . "/". $filename . "." . $extension;
-			rename($tmp, $new);                                                                 // renames temp file on server
-			$tmp = $new;                                                                        // push new filename (in path) to be used in file array later
+			$new = $tmppath['dirname']."/".$filename.".".$extension;
+			rename($tmp, $new); // renames temp file on server
+			$tmp = $new; // push new filename (in path) to be used in file array later
 		}
 
 		// assemble file data (should be built like $_FILES since wp_handle_sideload() will be using)
-		$file_array['tmp_name'] = $tmp;                                                         // full server path to temp file
+		$file_array['tmp_name'] = $tmp; // full server path to temp file
 
-		if ( !empty( $filename) && " " != $filename )
+		if (!empty($filename) && " " != $filename)
 		{
-			$file_array['name'] = $filename . "." . $url_type['ext'];                           // user given filename for title, add original URL extension
+			$file_array['name'] = $filename.".".$url_type['ext']; // user given filename for title, add original URL extension
 		}
 		else
 		{
-			$file_array['name'] = $url_filename;                                                // just use original URL filename
+			$file_array['name'] = $url_filename; // just use original URL filename
 		}
 
 		// set additional wp_posts columns
-		if ( empty( $post_data['post_title'] ) )
+		if (empty($post_data['post_title']))
 		{
 
-			$url_filename=str_replace('%20',' ',$url_filename);
+			$url_filename = str_replace('%20', ' ', $url_filename);
 
-			$post_data['post_title'] = basename($url_filename, "." . $url_type['ext']);         // just use the original filename (no extension)
+			$post_data['post_title'] = basename($url_filename, ".".$url_type['ext']); // just use the original filename (no extension)
 		}
 
 		// make sure gets tied to parent
-		if ( empty( $post_data['post_parent'] ) )
+		if (empty($post_data['post_parent']))
 		{
 			$post_data['post_parent'] = $post_id;
 		}
@@ -1029,12 +1029,12 @@ 
 		// required libraries for media_handle_sideload
 
 		// do the validation and storage stuff
-		$att_id = media_handle_sideload( $file_array, $post_id, null, $post_data );             // $post_data can override the items saved to wp_posts table, like post_mime_type, guid, post_parent, post_title, post_content, post_status
+		$att_id = media_handle_sideload($file_array, $post_id, null, $post_data); // $post_data can override the items saved to wp_posts table, like post_mime_type, guid, post_parent, post_title, post_content, post_status
 
 		// If error storing permanently, unlink
-		if ( is_wp_error($att_id) )
+		if (is_wp_error($att_id))
 		{
-			unlink($file_array['tmp_name']);   // clean up
+			unlink($file_array['tmp_name']); // clean up
 			return false; // output wp_error
 			//return $att_id; // output wp_error
 		}
@@ -1063,31 +1063,31 @@ 
 	/**
 	 * Formats the row for the completed list.
 	 */
-	public function format_completed_row($response){
+	public function format_completed_row($response) {
 		echo '<li class="post-'.$response.'"><span class="dashicons dashicons-yes"></span> <a target="_blank" href="'.get_permalink($response).'">'.get_the_title($response).'</a></li>';
 	}
 
 	/**
 	 * Formats the error.
 	 */
-	public function format_error($response){
+	public function format_error($response) {
 		echo '<li class="post-error"><span class="dashicons dashicons-no"></span>'.$response.'</li>';
 	}
 
 	/**
 	 * Does a multine search
 	 */
-	public function multineedle_stripos($haystack, $needles, $offset=0) {
+	public function multineedle_stripos($haystack, $needles, $offset = 0) {
 		$found = false;
 		$needle_count = count($needles);
-		foreach($needles as $needle) {
-			if(false !== stripos($haystack, $needle, $offset)){
+		foreach ($needles as $needle) {
+			if (false !== stripos($haystack, $needle, $offset)) {
 				$found[] = true;
 			}
 		}
-		if(false !== $found && $needle_count === count($found)){
+		if (false !== $found && $needle_count === count($found)) {
 			return true;
-		}else{
+		}else {
 			return false;
 		}
 	}
@@ -1095,7 +1095,7 @@ 
 	/**
 	 * Grab all the current accommodation posts via the lsx_wetu_id field.
 	 */
-	public function find_current_accommodation($post_type='accommodation') {
+	public function find_current_accommodation($post_type = 'accommodation') {
 		global $wpdb;
 		$return = array();
 
@@ -1111,8 +1111,8 @@ 
 
 					LIMIT 0,5000
 		");
-		if(null !== $current_accommodation && !empty($current_accommodation)){
-			foreach($current_accommodation as $accom){
+		if (null !== $current_accommodation && !empty($current_accommodation)) {
+			foreach ($current_accommodation as $accom) {
 				$return[$accom->meta_value] = $accom;
 			}
 		}
@@ -1122,31 +1122,31 @@ 
 	/**
 	 * Set the Video date
 	 */
-	public function set_video_data($data,$id) {
-		if(!empty($data[0]['content']['youtube_videos']) && is_array($data[0]['content']['youtube_videos'])){
+	public function set_video_data($data, $id) {
+		if (!empty($data[0]['content']['youtube_videos']) && is_array($data[0]['content']['youtube_videos'])) {
 			$videos = false;
 
-			foreach($data[0]['content']['youtube_videos'] as $video){
+			foreach ($data[0]['content']['youtube_videos'] as $video) {
 				$temp_video = array();
 
-				if(isset($video['label'])){
+				if (isset($video['label'])) {
 					$temp_video['title'] = $video['label'];
 				}
-				if(isset($video['description'])){
+				if (isset($video['description'])) {
 					$temp_video['description'] = strip_tags($video['description']);
 				}
-				if(isset($video['url'])){
+				if (isset($video['url'])) {
 					$temp_video['url'] = $video['url'];
 				}
 				$temp_video['thumbnail'] = '';
 				$videos[] = $temp_video;
 			}
 
-			if(false !== $id && '0' !== $id){
+			if (false !== $id && '0' !== $id) {
 				delete_post_meta($id, 'videos');
 			}
-			foreach($videos as $video){
-				add_post_meta($id,'videos',$video,false);
+			foreach ($videos as $video) {
+				add_post_meta($id, 'videos', $video, false);
 			}
 		}
 	}

Braces +18 added lines, -24 removed lines

@@ -400,7 +400,7 @@ 
 					<?php } ?>
                 </ul>
 				<?php*/
-			}else{
+			} else{
 			   $this->current_importer->display_page();
             }; ?>
         </div>
@@ -436,7 +436,7 @@ 
 
                 <?php if('tour'===$this->tab_slug){ ?>
                     | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU','wetu-importer'); ?></a>
-                <?php }else if(!empty($this->queued_imports)) { ?>
+                <?php } else if(!empty($this->queued_imports)) { ?>
                     | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue','wetu-importer'); ?></a>
                 <?php } ?>
             </p>
@@ -526,7 +526,7 @@ 
 					foreach($team_members->posts as $member){ ?>
                         <li><input class="team" <?php $this->checked($selected,$member); ?> type="checkbox" value="<?php echo $member; ?>" /> <?php echo get_the_title($member); ?></li>
 					<?php }
-				}else{ ?>
+				} else{ ?>
                     <li><input class="team" type="checkbox" value="0" /> <?php _e('None','wetu-importer'); ?></li>
 				<?php }
 				?>
@@ -591,7 +591,7 @@ 
 			if (in_array($needle, $haystack)) {
 				if(true === $wrap || 'true' === $wrap) {
 					$html = $type . '="' . $type . '"';
-				}else{
+				} else{
 					$html = $type;
 				}
 			}
@@ -643,7 +643,7 @@ 
 
 			if(false !== $id && '0' !== $id && false !== $prev && true === $unique){
 				update_post_meta($id,$meta_key,$value,$prev);
-			}else{
+			} else{
 				add_post_meta($id,$meta_key,$value,$unique);
 			}
 		}
@@ -684,18 +684,15 @@ 
 						if ( is_wp_error($term) )
 						{
 							echo $term->get_error_message();
-						}
-						else
+						} else
 						{
 							wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
 						}
-					}
-					else
+					} else
 					{
 						wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
 					}
-				}
-				else
+				} else
 				{
 					$result[]=trim($k);
 				}
@@ -709,10 +706,8 @@ 
 		{
 			if(false !== $parent){ $parent = array('parent'=>$parent); }
 			$term = wp_insert_term(trim($name), $taxonomy,$parent);
-			if ( is_wp_error($term) ){echo $term->get_error_message();}
-			else { wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true); }
-		}
-		else
+			if ( is_wp_error($term) ){echo $term->get_error_message();} else { wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true); }
+		} else
 		{
 			wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
 		}
@@ -732,7 +727,7 @@ 
 				foreach($terms as $term){
 					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected,$term->term_id,false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
 				}
-			}else{
+			} else{
 				$return .= '<li><input type="checkbox" value="" /> '.__('None','wetu-importer').'</li>';
 			}
 			$return .= '</ul>';
@@ -751,13 +746,13 @@ 
 
 			if(isset($data[0]['position']['driving_latitude'])){
 				$latitude = $data[0]['position']['driving_latitude'];
-			}elseif(isset($data[0]['position']['latitude'])){
+			} elseif(isset($data[0]['position']['latitude'])){
 				$latitude = $data[0]['position']['latitude'];
 			}
 
 			if(isset($data[0]['position']['driving_longitude'])){
 				$longitude = $data[0]['position']['driving_longitude'];
-			}elseif(isset($data[0]['position']['longitude'])){
+			} elseif(isset($data[0]['position']['longitude'])){
 				$longitude = $data[0]['position']['longitude'];
 			}
 
@@ -789,7 +784,7 @@ 
 			if(false !== $id && '0' !== $id){
 				$prev = get_post_meta($id,'location',true);
 				update_post_meta($id,'location',$location_data,$prev);
-			}else{
+			} else{
 				add_post_meta($id,'location',$location_data,true);
 			}
 		}
@@ -805,7 +800,7 @@ 
 		    if('tour' === $this->tab_slug){
 		        $key = array_rand($data[0]['content']['images']);
                 $this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
-            }else{
+            } else{
 				$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
             }
 
@@ -829,7 +824,7 @@ 
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
 		    if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
 				$temp_banner = $this->attach_image($data[0]['destination_image'], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-			}else{
+			} else{
 				if ('tour' === $this->tab_slug) {
 					$key = array_rand($data[0]['content']['images']);
 					$temp_banner = $this->attach_image($data[0]['content']['images'][$key], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
@@ -1005,8 +1000,7 @@ 
 		if ( !empty( $filename) && " " != $filename )
 		{
 			$file_array['name'] = $filename . "." . $url_type['ext'];                           // user given filename for title, add original URL extension
-		}
-		else
+		} else
 		{
 			$file_array['name'] = $url_filename;                                                // just use original URL filename
 		}
@@ -1087,7 +1081,7 @@ 
 		}
 		if(false !== $found && $needle_count === count($found)){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}