lightspeeddevelopment / wetu-importer

classes/class-accommodation.php

Doc Comments +11 added lines

@@ -414,6 +414,7 @@ 
 
 	/**
 	 * Does a multine search
+	 * @param string $haystack
 	 */	
 	public function multineedle_stripos($haystack, $needles, $offset=0) {
 		$found = false;
@@ -664,6 +665,7 @@ 
 
 	/**
 	 * Set the team memberon each item.
+	 * @param boolean $team_members
 	 */
 	public function set_team_member($id,$team_members) {
 
@@ -675,6 +677,7 @@ 
 
 	/**
 	 * Set the safari brand
+	 * @param boolean $safari_brands
 	 */
 	public function set_safari_brands($id,$safari_brands) {
 		foreach($safari_brands as $safari_brand){
@@ -1028,6 +1031,9 @@ 
 		}
 	}
 
+	/**
+	 * @return boolean
+	 */
 	function set_term($id=false,$name=false,$taxonomy=false,$parent=false){
 		if(!$term = term_exists($name, $taxonomy))
         {
@@ -1152,6 +1158,11 @@ 
         }	
         return 	false;
 	}
+
+	/**
+	 * @param string $url
+	 * @param string $thumb
+	 */
 	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..."); }

Braces +30 added lines, -39 removed lines

@@ -315,7 +315,7 @@ 
 
 		if(isset($accommodation['error'])){
 		    return $accommodation['error'];
-        }elseif (isset($accommodation) && !empty($accommodation)) {
+        } elseif (isset($accommodation) && !empty($accommodation)) {
 			set_transient('lsx_ti_accommodation',$accommodation,60*60*2);
 			return true;
 		}
@@ -361,7 +361,7 @@ 
 
 				if(isset($_POST['keyword'] )) {
 					$keyphrases = $_POST['keyword'];
-				}else{
+				} else{
 					$keyphrases = array(0);
                 }
 
@@ -406,16 +406,16 @@ 
 
 								if(0 !== $row['post_id']){
 									continue;
-								}else{
+								} else{
 									$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
 								}
 
 
-							}else{
+							} else{
 
 								if(0 === $row['post_id']){
 									continue;
-								}else{
+								} else{
 									$current_status = get_post_status($row['post_id']);
 									if($current_status !== $post_status){
 										continue;
@@ -425,7 +425,7 @@ 
 								$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
 							}
 
-						}else{
+						} else{
 							//Search through each keyword.
 							foreach($keyphrases as $keyphrase){
 
@@ -467,7 +467,7 @@ 
 	    }
 	    if(false !== $found && $needle_count === count($found)){ 
 	    	return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -513,26 +513,26 @@ 
 			$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;
 			}
 
 			if(isset($_POST['safari_brands'])){
 				$safari_brands = $_POST['safari_brands'];	
-			}else{
+			} else{
 				$safari_brands = false;
 			}			
 
 			if(isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])){
 				$content = $_POST['content'];
 				add_option('wetu_importer_accommodation_settings',$content);
-			}else{
+			} else{
 				delete_option('wetu_importer_accommodation_settings');
 				$content = false;
 			}
@@ -577,10 +577,10 @@ 
 		        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);
@@ -590,7 +590,7 @@ 
 	        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;     	
@@ -606,7 +606,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'])){
@@ -738,13 +738,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'];
 			}		
 
@@ -777,7 +777,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);
 	        }
 		}
@@ -797,12 +797,10 @@ 
 		            $term = wp_insert_term(trim($data[0]['position']['country']), 'location');
 		            if ( is_wp_error($term) ){
 		            	echo $term->get_error_message();
-		            }
-		            else {
+		            } else {
 		            	wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
 		            }
-		        }
-		        else
+		        } else
 		        {
 		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
 		        }
@@ -815,10 +813,8 @@ 
 				if(!$term = term_exists(trim($data[0]['position']['destination']), 'location'))
 		        {
 		            $term = wp_insert_term(trim($data[0]['position']['destination']), 'location', $tax_args);
-		            if ( is_wp_error($term) ){echo $term->get_error_message();}
-		            else { wp_set_object_terms( $id, intval($term['term_id']), 'location',true); }
-		        }
-		        else
+		            if ( is_wp_error($term) ){echo $term->get_error_message();} else { wp_set_object_terms( $id, intval($term['term_id']), 'location',true); }
+		        } else
 		        {
 		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
 		        }				
@@ -866,10 +862,8 @@ 
 			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
+	            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);
 	        }				
@@ -928,14 +922,14 @@ 
 
 			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{
+	        } else{
 	        	add_post_meta($id,'number_of_rooms',$room_count,true);
 	        }
 		}
@@ -948,7 +942,7 @@ 
 
 		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);
@@ -1078,10 +1072,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);
         }
@@ -1242,8 +1234,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
 		}

Indentation +325 added lines, -325 removed lines

@@ -136,7 +136,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
             <?php screen_icon(); ?>
 
@@ -314,8 +314,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;
 		}
@@ -363,7 +363,7 @@ 
 					$keyphrases = $_POST['keyword'];
 				}else{
 					$keyphrases = array(0);
-                }
+				}
 
 				if(!is_array($keyphrases)){
 					$keyphrases = array($keyphrases);
@@ -460,13 +460,13 @@ 
 	public function multineedle_stripos($haystack, $needles, $offset=0) {
 		$found = false;
 		$needle_count = count($needles);
-	    foreach($needles as $needle) {
-	    	if(false !== stripos($haystack, $needle, $offset)){
-	        	$found[] = true;
-	    	}
-	    }
-	    if(false !== $found && $needle_count === count($found)){ 
-	    	return true;
+		foreach($needles as $needle) {
+			if(false !== stripos($haystack, $needle, $offset)){
+				$found[] = true;
+			}
+		}
+		if(false !== $found && $needle_count === count($found)){ 
+			return true;
 		}else{
 			return false;
 		}
@@ -537,16 +537,16 @@ 
 				$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);
-                }
-            }
+			$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);
+				}
+			}
 
 			die();
 		}
@@ -563,148 +563,148 @@ 
 	 */
 	public function import_row($data,$wetu_id,$id=0,$team_members=false,$importable_content=false,$safari_brands=false) {
 
-        if(trim($data[0]['type'])=='Accommodation')
-        {
-	        $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(trim($data[0]['type'])=='Accommodation')
+		{
+			$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);
-	        	$this->set_location_taxonomy($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);
-	        }
-
-	        //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);
+				$this->set_location_taxonomy($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);
+			}
+
+			//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;
 	}
 
 	/**
@@ -714,7 +714,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);			
 		}
 	}
 
@@ -723,7 +723,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);			
 		}
 	}	
 	
@@ -775,11 +775,11 @@ 
 				'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);
-	        }
+				$prev = get_post_meta($id,'location',true);
+				update_post_meta($id,'location',$location_data,$prev);
+			}else{
+				add_post_meta($id,'location',$location_data,true);
+			}
 		}
 	}
 	/**
@@ -793,35 +793,35 @@ 
 			if(isset($data[0]['position']['country'])){
 
 				if(!$term = term_exists(trim($data[0]['position']['country']), 'location'))
-		        {
-		            $term = wp_insert_term(trim($data[0]['position']['country']), 'location');
-		            if ( is_wp_error($term) ){
-		            	echo $term->get_error_message();
-		            }
-		            else {
-		            	wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
-		            }
-		        }
-		        else
-		        {
-		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
-		        }
-		        $country_id = intval($term['term_id']);
-		    }
+				{
+					$term = wp_insert_term(trim($data[0]['position']['country']), 'location');
+					if ( is_wp_error($term) ){
+						echo $term->get_error_message();
+					}
+					else {
+						wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
+					}
+				}
+				else
+				{
+					wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
+				}
+				$country_id = intval($term['term_id']);
+			}
 
 			if(isset($data[0]['position']['destination'])){
 
 				$tax_args = array('parent'=>$country_id);
 				if(!$term = term_exists(trim($data[0]['position']['destination']), 'location'))
-		        {
-		            $term = wp_insert_term(trim($data[0]['position']['destination']), 'location', $tax_args);
-		            if ( is_wp_error($term) ){echo $term->get_error_message();}
-		            else { wp_set_object_terms( $id, intval($term['term_id']), 'location',true); }
-		        }
-		        else
-		        {
-		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
-		        }				
+				{
+					$term = wp_insert_term(trim($data[0]['position']['destination']), 'location', $tax_args);
+					if ( is_wp_error($term) ){echo $term->get_error_message();}
+					else { wp_set_object_terms( $id, intval($term['term_id']), 'location',true); }
+				}
+				else
+				{
+					wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
+				}				
 			}		
 		}
 	}
@@ -831,28 +831,28 @@ 
 	 */
 	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();
-		    	}
-			    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(false !== $destinations){	
+				$prev_values = get_post_meta($id,'destination_to_accommodation',false);
+				if(false === $prev_values || !is_array($prev_values)){
+					$prev_values = array();
+				}
+				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);
+						}
+					} 		    	
+				}	
 			}
 		}
 	}	
@@ -864,15 +864,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);
+			}				
 		}
 	}		
 
@@ -896,25 +896,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;
 			}
@@ -923,7 +923,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'])){
@@ -933,11 +933,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);
+			}
 		}
 	}
 
@@ -1046,7 +1046,7 @@ 
 				delete_post_meta($id, 'videos');				
 			}
 			foreach($videos as $video){
-		        add_post_meta($id,'videos',$video,false);			
+				add_post_meta($id,'videos',$video,false);			
 			}
 		}
 	}	
@@ -1075,17 +1075,17 @@ 
 
 	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); }
-        }
-        else
-        {
-            wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
-        }
-        return $term['term_id'];
+		{
+			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);
+		}
+		return $term['term_id'];
 	}	
 
 	/**
@@ -1093,17 +1093,17 @@ 
 	 */
 	public function set_featured_image($data,$id) {
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-	    	$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
+			$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);
-	    			$this->gallery_meta[] = $this->featured_image;
-	    		}
-	    	}			
+				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;
+				}
+			}			
 		}	
 	}	
 
@@ -1112,18 +1112,18 @@ 
 	 */
 	public function set_banner_image($data,$id) {
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-	    	$this->banner_image = $this->attach_image($data[0]['content']['images'][1],$id,array('width'=>'1920','height'=>'800','cropping'=>'c'));
-
-	    	if(false !== $this->banner_image){
-	    		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);
-
-	    		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;
-	    		}
-	    	}			
+			$this->banner_image = $this->attach_image($data[0]['content']['images'][1],$id,array('width'=>'1920','height'=>'800','cropping'=>'c'));
+
+			if(false !== $this->banner_image){
+				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);
+
+				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;
+				}
+			}			
 		}	
 	}		
 
@@ -1133,25 +1133,25 @@ 
 	public function create_main_gallery($data,$id) {
 
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-	    	$counter = 0;
+			$counter = 0;
 			print_r($data[0]['content']['images']);
-	    	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);
-	    		$counter++;
-	    	}
-
-	    	if(!empty($this->gallery_meta)){
-	    		delete_post_meta($id,'gallery');
-	    		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($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);
+				$counter++;
+			}
+
+			if(!empty($this->gallery_meta)){
+				delete_post_meta($id,'gallery');
+				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);
+					}
+				}
+			}
+		}
 	}	
 
 	/**
@@ -1160,44 +1160,44 @@ 
 	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 = $temp_fragment[count($temp_fragment)-1];
+			$url_filename = str_replace(array('.jpg','.png','.jpeg'),'',$url_filename);
 
-	    	print_r($url_filename);
-	    	if(in_array($url_filename,$this->found_attachments)){
+			print_r($url_filename);
+			if(in_array($url_filename,$this->found_attachments)){
 				print_r(' - found <br/>');
-	    		return array_search($url_filename,$this->found_attachments);
-	    	}
+				return array_search($url_filename,$this->found_attachments);
+			}
 	    	               
-	        $postdata=array();
-	        if(empty($v['label']))
-	        {
-	            $v['label']='';
-	        }
-	        if(!empty($v['description']))
-	        {
-	            $desc=wp_strip_all_tags($v['description']);
-	            $posdata=array('post_excerpt'=>$desc);
-	        }
-	        if(!empty($v['section']))
-	        {
-	            $desc=wp_strip_all_tags($v['section']);
-	            $posdata=array('post_excerpt'=>$desc);
-	        }
-
-	        $attachID=NULL;  
-	        //Resizor - add option to setting if required
-	        $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);
-
-	        //echo($attachID.' add image');
-	        if($attachID!=NULL)
-	        {
-	            return $attachID;
-	        }
-        }	
-        return 	false;
+			$postdata=array();
+			if(empty($v['label']))
+			{
+				$v['label']='';
+			}
+			if(!empty($v['description']))
+			{
+				$desc=wp_strip_all_tags($v['description']);
+				$posdata=array('post_excerpt'=>$desc);
+			}
+			if(!empty($v['section']))
+			{
+				$desc=wp_strip_all_tags($v['section']);
+				$posdata=array('post_excerpt'=>$desc);
+			}
+
+			$attachID=NULL;  
+			//Resizor - add option to setting if required
+			$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);
+
+			//echo($attachID.' add image');
+			if($attachID!=NULL)
+			{
+				return $attachID;
+			}
+		}	
+		return 	false;
 	}
 	public function attach_external_image2( $url = null, $post_id = null, $thumb = null, $filename = null, $post_data = array() ) {
 	

Spacing +369 added lines, -369 removed lines

@@ -64,20 +64,20 @@ 
 	public function __construct() {
 		$this->set_variables();
 
-		add_action( 'lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this,'display_page') );
-		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('lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this, 'display_page'));
+		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'));
 
-		$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;
 		}
 	}
@@ -94,7 +94,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 = '';
 		//}
 	}
@@ -102,27 +102,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'];
@@ -147,8 +147,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">
@@ -157,11 +157,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">							
@@ -175,8 +175,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> 
 
@@ -188,31 +188,31 @@ 
 						<div style="width:30%;display:block;float:left;">
 							<h3><?php _e('What content to Sync from WETU'); ?></h3>
 							<ul>
-								<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('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" 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('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('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('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>
@@ -223,7 +223,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" />			
@@ -231,7 +231,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(); ?>
 
@@ -243,12 +243,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>
@@ -264,30 +264,30 @@ 
         <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>
         	<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> |
-                <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU','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> |
+                <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU', 'wetu-importer'); ?></a>
             </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 
@@ -297,9 +297,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>';
@@ -310,13 +310,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;
 		}
 	}
@@ -324,7 +324,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();
 
@@ -340,8 +340,8 @@ 
 
 					LIMIT 0,500
 		");
-		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;
 			}
 		}
@@ -353,37 +353,37 @@ 
 	 */
 	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) {
 				$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';
 				}
 
@@ -391,33 +391,33 @@ 
 
 					$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(0 !== $row['post_id']){
+								if (0 !== $row['post_id']) {
 									continue;
-								}else{
+								}else {
 									$searched_items[sanitize_title($row['name']).'-'.$row['id']] = $this->format_row($row);
 								}
 
 
-							}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;
 									}
 
@@ -425,17 +425,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);
 								}
 							}
@@ -444,7 +444,7 @@ 
 				}
 
 
-				if(false !== $searched_items){
+				if (false !== $searched_items) {
 					ksort($searched_items);
 					$return = implode($searched_items);
 				}
@@ -457,17 +457,17 @@ 
 	/**
 	 * 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;
 		}
 	}
@@ -475,11 +475,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>';
 			}
 
@@ -493,7 +493,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'].'
@@ -508,42 +508,42 @@ 
 	 */
 	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;
 			}			
 
-			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 {
 				delete_option('wetu_importer_accommodation_settings');
 				$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);
                 }
             }
@@ -555,15 +555,15 @@ 
 	/**
 	 * 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>';
 	}
 	/**
 	 * 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) {
 
-        if(trim($data[0]['type'])=='Accommodation')
+        if (trim($data[0]['type']) == 'Accommodation')
         {
 	        $post_name = $data_post_content = $data_post_excerpt = '';
 	        $post = array(
@@ -573,44 +573,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'];
@@ -618,90 +618,90 @@ 
 	        	$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);
-	        	$this->set_location_taxonomy($data,$id);
+	        if (class_exists('LSX_TO_Maps')) {
+	        	$this->set_map_data($data, $id);
+	        	$this->set_location_taxonomy($data, $id);
 	        }
 
-	        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;
@@ -710,63 +710,63 @@ 
 	/**
 	 * 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);			
 		}
 	}	
 	
 	/**
 	 * Saves the longitude and lattitude, as well as sets the map marker.
 	 */
-	public function set_map_data($data,$id) {
+	public function set_map_data($data, $id) {
 		$longitude = $latitude = $address = false;
 		$zoom = '15';	
 
-		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'	=>	$address,
 				'lat'		=>	$latitude,
@@ -774,53 +774,53 @@ 
 				'zoom'		=>	$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);
 	        }
 		}
 	}
 	/**
 	 * Saves the longitude and lattitude, as well as sets the map marker.
 	 */
-	public function set_location_taxonomy($data,$id) {
+	public function set_location_taxonomy($data, $id) {
 		$taxonomy = 'location';
 		$terms = false;
-		if(isset($data[0]['position'])){
+		if (isset($data[0]['position'])) {
 			$country_id = 0;
-			if(isset($data[0]['position']['country'])){
+			if (isset($data[0]['position']['country'])) {
 
-				if(!$term = term_exists(trim($data[0]['position']['country']), 'location'))
+				if (!$term = term_exists(trim($data[0]['position']['country']), 'location'))
 		        {
 		            $term = wp_insert_term(trim($data[0]['position']['country']), 'location');
-		            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']), 'location',true);
+		            	wp_set_object_terms($id, intval($term['term_id']), 'location', true);
 		            }
 		        }
 		        else
 		        {
-		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
+		            wp_set_object_terms($id, intval($term['term_id']), 'location', true);
 		        }
 		        $country_id = intval($term['term_id']);
 		    }
 
-			if(isset($data[0]['position']['destination'])){
+			if (isset($data[0]['position']['destination'])) {
 
 				$tax_args = array('parent'=>$country_id);
-				if(!$term = term_exists(trim($data[0]['position']['destination']), 'location'))
+				if (!$term = term_exists(trim($data[0]['position']['destination']), 'location'))
 		        {
 		            $term = wp_insert_term(trim($data[0]['position']['destination']), 'location', $tax_args);
-		            if ( is_wp_error($term) ){echo $term->get_error_message();}
-		            else { wp_set_object_terms( $id, intval($term['term_id']), 'location',true); }
+		            if (is_wp_error($term)) {echo $term->get_error_message(); }
+		            else { wp_set_object_terms($id, intval($term['term_id']), 'location', true); }
 		        }
 		        else
 		        {
-		            wp_set_object_terms( $id, intval($term['term_id']), 'location',true);
+		            wp_set_object_terms($id, intval($term['term_id']), 'location', true);
 		        }				
 			}		
 		}
@@ -829,27 +829,27 @@ 
 	/**
 	 * 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();
 		    	}
-			    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);
 	                	}
 	                } 		    	
 			    }	
@@ -860,18 +860,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);
 	        }				
 		}
 	}		
@@ -879,23 +879,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',
@@ -905,38 +905,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);
 	        }
 		}
 	}
@@ -944,31 +944,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);
 			}
 		}
 	}
@@ -976,14 +976,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);
 			}
 		}		
 	}
@@ -991,14 +991,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);
 			}
 		}		
 	}				
@@ -1006,47 +1006,47 @@ 
 	/**
 	 * 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 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 = '';
-				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);			
 			}
 		}
 	}	
@@ -1054,7 +1054,7 @@ 
 	/**
 	 * Set the Facilities
 	 */
-	public function set_facilities($data,$id) {
+	public function set_facilities($data, $id) {
 
 		$parent_facilities = array(
 			'available_services' => 'Available Services',
@@ -1062,28 +1062,28 @@ 
 			'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);
 			}
 		}
 	}
 
-	function set_term($id=false,$name=false,$taxonomy=false,$parent=false){
-		if(!$term = term_exists($name, $taxonomy))
+	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'];
 	}	
@@ -1091,16 +1091,16 @@ 
 	/**
 	 * Creates the main gallery data
 	 */
-	public function set_featured_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-	    	$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
+	public function set_featured_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+	    	$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;
 	    		}
 	    	}			
@@ -1110,17 +1110,17 @@ 
 	/**
 	 * Sets a banner image
 	 */
-	public function set_banner_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-	    	$this->banner_image = $this->attach_image($data[0]['content']['images'][1],$id,array('width'=>'1920','height'=>'800','cropping'=>'c'));
+	public function set_banner_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+	    	$this->banner_image = $this->attach_image($data[0]['content']['images'][1], $id, array('width'=>'1920', 'height'=>'800', 'cropping'=>'c'));
 
-	    	if(false !== $this->banner_image){
-	    		delete_post_meta($id,'image_group');
+	    	if (false !== $this->banner_image) {
+	    		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;
 	    		}
 	    	}			
@@ -1130,24 +1130,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;
 			print_r($data[0]['content']['images']);
-	    	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');
-	    		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);
+	    	if (!empty($this->gallery_meta)) {
+	    		delete_post_meta($id, 'gallery');
+	    		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);
 	    			}
 	    		}
 	    	}
@@ -1157,55 +1157,55 @@ 
 	/**
 	 * 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);
 
 	    	print_r($url_filename);
-	    	if(in_array($url_filename,$this->found_attachments)){
+	    	if (in_array($url_filename, $this->found_attachments)) {
 				print_r(' - found <br/>');
-	    		return array_search($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;
 	        }
         }	
         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 );
 
@@ -1214,53 +1214,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;
 		}
@@ -1268,12 +1268,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
 		}

classes/class-connect-accommodation.php

Doc Comments +1 added lines

@@ -207,6 +207,7 @@
 
 	/**
 	 * format the array
+	 * @param string $key
 	 */
 	public function format_array($array,$key){
 		$new_array = array();

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function display_page() {
 		global $post;
-        ?>
+		?>
         <div class="wrap">
 
             <h3><span class="dashicons dashicons-admin-multisite"></span> <?php _e('Connect your Accommodation','wetu-importer'); ?></h3>

Braces +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 									foreach($accommodation as $row_key => $row){
 										if(stripos(ltrim(rtrim($row->name)), $post->post_title) !== false){
 											$identifier = $row->id;
-										}else{
+										} else{
 											continue;
 										}
 									}
@@ -196,7 +196,7 @@ 
 			//remove the extra accommodation
 			if(null !== $current_accommodation && !empty($current_accommodation)){
 				$all_accommodation = array_diff($this->format_array($all_accommodation,'ID'), $this->format_array($current_accommodation,'post_id'));
-			}elseif(null !== $current_accommodation && empty($current_accommodation)){
+			} elseif(null !== $current_accommodation && empty($current_accommodation)){
 				$all_accommodation = $this->format_array($current_accommodation,'post_id');
 			}
 

Spacing +28 added lines, -28 removed lines

@@ -35,15 +35,15 @@ 
 	 * @access private
 	 */
 	public function __construct() {
-		$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];
 		}
 		$this->url = 'http://wetu.com/API/Pins/'.$this->options['api_key'].'/List';
 
-		add_action( 'lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this,'display_page') );
-		add_action('wp_ajax_lsx_import_connect_accommodation',array($this,'process_connection'));	
-		add_action('wp_ajax_nopriv_lsx_import_connect_accommodation',array($this,'process_connection'));
+		add_action('lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this, 'display_page'));
+		add_action('wp_ajax_lsx_import_connect_accommodation', array($this, 'process_connection'));	
+		add_action('wp_ajax_nopriv_lsx_import_connect_accommodation', array($this, 'process_connection'));
 	}	
 
 	/**
@@ -54,30 +54,30 @@ 
         ?>
         <div class="wrap">
 
-            <h3><span class="dashicons dashicons-admin-multisite"></span> <?php _e('Connect your Accommodation','wetu-importer'); ?></h3>
+            <h3><span class="dashicons dashicons-admin-multisite"></span> <?php _e('Connect your Accommodation', 'wetu-importer'); ?></h3>
 
 			<form method="get" action="" id="connect-accommodation-filter">
 				<input type="hidden" name="post_type" class="post_type" value="<?php echo $this->tab_slug; ?>" />	
 
-				<p><?php _e('Below is a list of your accommodation that does not contain a WETU ID, but its Title matches a name in the WETU DB. Connecting it will all you to pull through information from WETU.','wetu-importer'); ?></p>
+				<p><?php _e('Below is a list of your accommodation that does not contain a WETU ID, but its Title matches a name in the WETU DB. Connecting it will all you to pull through information from WETU.', 'wetu-importer'); ?></p>
 
 	            <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>  
 
 				<?php
 					$loose_accommodation = $this->find_current_accommodation();
 				?>
-				<p><input class="button button-primary connect" type="button" value="<?php _e('Connect','wetu-importer'); ?>" /></p>
+				<p><input class="button button-primary connect" type="button" value="<?php _e('Connect', 'wetu-importer'); ?>" /></p>
 				<table class="wp-list-table widefat fixed posts">
 					<?php $this->table_header(); ?>
 				
 					<tbody>
-						<?php if(false !== $loose_accommodation){ 
+						<?php if (false !== $loose_accommodation) { 
 
 							$loose_args = array(
 								'post_type'=>'accommodation',
-								'post_status' => array('publish','pending'),
+								'post_status' => array('publish', 'pending'),
 								'nopagin' => true,
 								'post__in' => $loose_accommodation
 							);
@@ -85,14 +85,14 @@ 
 							$accommodation = get_transient('lsx_ti_accommodation');
 							$identifier = '';
 
-							if($loose_accommodation_query->have_posts() && false !== $accommodation){
-								while($loose_accommodation_query->have_posts()){
+							if ($loose_accommodation_query->have_posts() && false !== $accommodation) {
+								while ($loose_accommodation_query->have_posts()) {
 									$loose_accommodation_query->the_post();
 
-									foreach($accommodation as $row_key => $row){
-										if(stripos(ltrim(rtrim($row->name)), $post->post_title) !== false){
+									foreach ($accommodation as $row_key => $row) {
+										if (stripos(ltrim(rtrim($row->name)), $post->post_title) !== false) {
 											$identifier = $row->id;
-										}else{
+										}else {
 											continue;
 										}
 									}
@@ -118,7 +118,7 @@ 
 
 				</table>
 
-				<p><input class="button button-primary connect" type="button" value="<?php _e('Connect','wetu-importer'); ?>" /></p>
+				<p><input class="button button-primary connect" type="button" value="<?php _e('Connect', 'wetu-importer'); ?>" /></p>
 
 			</form> 
 
@@ -179,7 +179,7 @@ 
 					FROM {$wpdb->posts}	
 					WHERE post_type = 'accommodation'
 					LIMIT 0,500
-		",ARRAY_A);
+		", ARRAY_A);
 
 		$current_accommodation = $wpdb->get_results("
 					SELECT key1.post_id
@@ -192,14 +192,14 @@ 
 					AND key2.post_type = 'accommodation'
 
 					LIMIT 0,500
-		",ARRAY_A);
+		", ARRAY_A);
 
-		if(null !== $all_accommodation && !empty($all_accommodation)){
+		if (null !== $all_accommodation && !empty($all_accommodation)) {
 			//remove the extra accommodation
-			if(null !== $current_accommodation && !empty($current_accommodation)){
-				$all_accommodation = array_diff($this->format_array($all_accommodation,'ID'), $this->format_array($current_accommodation,'post_id'));
-			}elseif(null !== $current_accommodation && empty($current_accommodation)){
-				$all_accommodation = $this->format_array($current_accommodation,'post_id');
+			if (null !== $current_accommodation && !empty($current_accommodation)) {
+				$all_accommodation = array_diff($this->format_array($all_accommodation, 'ID'), $this->format_array($current_accommodation, 'post_id'));
+			}elseif (null !== $current_accommodation && empty($current_accommodation)) {
+				$all_accommodation = $this->format_array($current_accommodation, 'post_id');
 			}
 
 			$return = $all_accommodation;
@@ -210,9 +210,9 @@ 
 	/**
 	 * format the array
 	 */
-	public function format_array($array,$key){
+	public function format_array($array, $key) {
 		$new_array = array();
-		foreach($array as $value){
+		foreach ($array as $value) {
 			$new_array[] = $value[$key];
 		}
 		return $new_array;
@@ -224,7 +224,7 @@ 
 	public function process_connection() {
 		$return = false;
 
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_import_connect_accommodation' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug && isset($_POST['post_id']) && isset($_POST['wetu_id'])){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_import_connect_accommodation' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug && isset($_POST['post_id']) && isset($_POST['wetu_id'])) {
 
 			$post_id = false;
 			$matching_id = false;
@@ -232,7 +232,7 @@ 
 			$post_id = $_POST['post_id'];
 			$matching_id = $_POST['wetu_id'];			
 
-			add_post_meta($post_id,'lsx_wetu_id',$matching_id);
+			add_post_meta($post_id, 'lsx_wetu_id', $matching_id);
 			$return = '<li class="post-'.$post_id.'"><span class="dashicons dashicons-yes"></span> <a target="_blank" href="'.get_permalink($post_id).'">'.get_the_title($post_id).'</a></li>';
 		}
 		print_r($return);

classes/class-tours.php

Doc Comments +1 added lines

@@ -552,6 +552,7 @@
 
 	/**
 	 * A loop which runs through each leg on the tour.
+	 * @param boolean $importable_content
 	 */
 	public function process_itineraries($data,$id,$importable_content) {
 		$day_counter = 1;

Braces +21 added lines, -21 removed lines

@@ -249,10 +249,10 @@ 
 
 			if(true === $result){
 			    echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
-            }else{
+            } else{
 			    echo '<span style="color:red;">'.wp_kses_post($result).'</span>';
             }
-		}else{
+		} else{
 			echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
         }
 		echo '</h3></div>';
@@ -267,7 +267,7 @@ 
 
 		if(isset($tours['error'])){
 		    return $tours['error'];
-        }elseif (isset($tours['itineraries']) && !empty($tours['itineraries'])) {
+        } elseif (isset($tours['itineraries']) && !empty($tours['itineraries'])) {
 			set_transient('lsx_ti_tours',$tours['itineraries'],60*60*2);
 			return true;
 		}
@@ -314,7 +314,7 @@ 
 
 				if(isset($_POST['keyword'] )) {
 					$keyphrases = $_POST['keyword'];
-				}else{
+				} else{
 					$keyphrases = array(0);
                 }
 
@@ -366,16 +366,16 @@ 
 
 								if(0 !== $row['post_id']){
 								    continue;
-								}else{
+								} else{
 									$searched_items[sanitize_title($row['name']).'-'.$row['identifier']] = $this->format_row($row);
                                 }
 
 
-                            }else{
+                            } else{
 
 								if(0 === $row['post_id']){
 									continue;
-								}else{
+								} else{
 									$current_status = get_post_status($row['post_id']);
 									if($current_status !== $post_status){
 									    continue;
@@ -386,7 +386,7 @@ 
 
                             }
 
-                        }else{
+                        } else{
 							//Search through each keyword.
 							foreach($keyphrases as $keyphrase){
 
@@ -455,14 +455,14 @@ 
 			$wetu_id = $_POST['wetu_id'];
 			if(isset($_POST['post_id'])){
 				$post_id = $_POST['post_id'];	
-			}else{
+			} else{
 				$post_id = 0;
 			}
 
 			if(isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])){
 				$content = $_POST['content'];
 				add_option('wetu_importer_tour_settings',$content);
-			}else{
+			} else{
 				delete_option('wetu_importer_tour_settings');
 				$content = false;
 			}
@@ -502,7 +502,7 @@ 
 
             if(isset($data['description'])){
                 $data_post_content = $data['description'];
-            }elseif(isset($data['summary'])){
+            } elseif(isset($data['summary'])){
                 $data_post_content = $data['summary'];
             }
             $post['post_content'] = $data_post_content;
@@ -515,7 +515,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['last_modified']),$prev_date);
-        }else{
+        } else{
 
             //Set the name
             if(isset($data['name'])){
@@ -626,42 +626,42 @@ 
 						//Description
 						if(false !== $importable_content && in_array('itinerary_description',$importable_content) && isset($day['notes']) && '' !== $day['notes']){
 							$current_day['description'] = strip_tags($day['notes']);
-						}else{
+						} else{
 							$current_day['description'] = '';
 						}
 
 						//Itinerary Gallery
 						if(false !== $importable_content && in_array('itinerary_gallery',$importable_content) && isset($day['images'])){
 							$current_day['featured_image'] = '';
-						}else{
+						} else{
 							$current_day['featured_image'] = '';
 						}
 
 						//Accommodation
 						if(false !== $current_accommodation){
 							$current_day['accommodation_to_tour'] = array($current_accommodation);
-						}else{
+						} else{
 							$current_day['accommodation_to_tour'] = array();
 						}
 
 						//Destination
 						if(false !== $current_destination){
 							$current_day['destination_to_tour'] = array($current_destination);
-						}else{
+						} else{
 							$current_day['destination_to_tour'] = array();
 						}
 
 						//Included
 						if(false !== $importable_content && in_array('itinerary_included',$importable_content) && isset($day['included']) && '' !== $day['included']){
 							$current_day['included'] = strip_tags($day['included']);
-						}else{
+						} else{
 							$current_day['description'] = '';
 						}
 
 						//Excluded
 						if(false !== $importable_content && in_array('itinerary_excluded',$importable_content) && isset($day['excluded']) && '' !== $day['excluded']){
 							$current_day['excluded'] = strip_tags($day['excluded']);
-						}else{
+						} else{
 							$current_day['excluded'] = '';
 						}
 
@@ -669,7 +669,7 @@ 
 						$day_counter++;
 					}
 
-				}else{
+				} else{
 					$day_counter = $day_counter + (int)$leg['nights'];
 				}
 
@@ -769,7 +769,7 @@ 
 
 			if(false !== $this->current_accommodation && !empty($this->current_accommodation) && array_key_exists($day['content_entity_id'],$this->current_accommodation)){
                 $ac_id = $this->current_accommodation[$day['content_entity_id']];
-			}else{
+			} else{
 				$ac_id = wp_insert_post(array(
                     'post_type' => 'accommodation',
                     'post_status' => 'draft',
@@ -836,7 +836,7 @@ 
 					$this->set_country($country_wetu_id, $id);
                 }
 
-			}else {
+			} else {
 
 				$destination_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=" . $day['destination_content_entity_id']);
 

Indentation +159 added lines, -159 removed lines

@@ -97,7 +97,7 @@ 
 		$tour_options = get_option('wetu_importer_tour_settings',false);
 		if(false !== $tour_options){
 			$this->tour_options = $tour_options;
-        }
+		}
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
             <?php screen_icon(); ?>
 
@@ -248,13 +248,13 @@ 
 			$result = $this->update_options();
 
 			if(true === $result){
-			    echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
-            }else{
-			    echo '<span style="color:red;">'.wp_kses_post($result).'</span>';
-            }
+				echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
+			}else{
+				echo '<span style="color:red;">'.wp_kses_post($result).'</span>';
+			}
 		}else{
 			echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
-        }
+		}
 		echo '</h3></div>';
 	}
 
@@ -266,8 +266,8 @@ 
 		$tours = json_decode($data, true);
 
 		if(isset($tours['error'])){
-		    return $tours['error'];
-        }elseif (isset($tours['itineraries']) && !empty($tours['itineraries'])) {
+			return $tours['error'];
+		}elseif (isset($tours['itineraries']) && !empty($tours['itineraries'])) {
 			set_transient('lsx_ti_tours',$tours['itineraries'],60*60*2);
 			return true;
 		}
@@ -316,7 +316,7 @@ 
 					$keyphrases = $_POST['keyword'];
 				}else{
 					$keyphrases = array(0);
-                }
+				}
 
 				if(!is_array($keyphrases)){
 					$keyphrases = array($keyphrases);
@@ -345,15 +345,15 @@ 
 
 					foreach($tours as $row_key => $row){
 
-					    if(isset($row['is_disabled']) && true === $row['is_disabled']){
-                            continue;
-                        }
+						if(isset($row['is_disabled']) && true === $row['is_disabled']){
+							continue;
+						}
 
-                        /*if('Sample' === $row['type']){
+						/*if('Sample' === $row['type']){
                             continue;
                         }*/
 
-                        //If this is a current tour, add its ID to the row.
+						//If this is a current tour, add its ID to the row.
 						$row['post_id'] = 0;
 						if(false !== $current_tours && array_key_exists($row['identifier'], $current_tours)){
 							$row['post_id'] = $current_tours[$row['identifier']]->post_id;
@@ -362,31 +362,31 @@ 
 						//If we are searching for
 						if(false !== $post_status){
 
-                            if('import' === $post_status){
+							if('import' === $post_status){
 
 								if(0 !== $row['post_id']){
-								    continue;
+									continue;
 								}else{
 									$searched_items[sanitize_title($row['name']).'-'.$row['identifier']] = $this->format_row($row);
-                                }
+								}
 
 
-                            }else{
+							}else{
 
 								if(0 === $row['post_id']){
 									continue;
 								}else{
 									$current_status = get_post_status($row['post_id']);
 									if($current_status !== $post_status){
-									    continue;
-                                    }
+										continue;
+									}
 
 								}
 								$searched_items[sanitize_title($row['name']).'-'.$row['identifier']] = $this->format_row($row);
 
-                            }
+							}
 
-                        }else{
+						}else{
 							//Search through each keyword.
 							foreach($keyphrases as $keyphrase){
 
@@ -400,7 +400,7 @@ 
 									$searched_items[sanitize_title($row['name']).'-'.$row['identifier']] = $this->format_row($row);
 								}
 							}
-                        }
+						}
 					}		
 				}
 
@@ -467,17 +467,17 @@ 
 				$content = false;
 			}
 
-            $jdata=file_get_contents("http://wetu.com/API/Itinerary/V7/Get?id=".$wetu_id);
+			$jdata=file_get_contents("http://wetu.com/API/Itinerary/V7/Get?id=".$wetu_id);
 
-            if($jdata)
-            {
+			if($jdata)
+			{
 				$jdata=json_decode($jdata,true);
-                if(!empty($jdata))
-                {
-                	$return = $this->import_row($jdata,$wetu_id,$post_id,$content);
-                	$this->format_completed_row($return);
-                }
-            }
+				if(!empty($jdata))
+				{
+					$return = $this->import_row($jdata,$wetu_id,$post_id,$content);
+					$this->format_completed_row($return);
+				}
+			}
 			die();
 		}
 
@@ -485,53 +485,53 @@ 
 
 	/**
 	 * Connect to wetu
-     *
-     * @param $data array
-     * @param $wetu_id string
+	 *
+	 * @param $data array
+	 * @param $wetu_id string
 	 */
 	public function import_row($data,$wetu_id,$id=0,$importable_content=false,$old1=false,$old2=false) {
-        $post_name = $data_post_content = $data_post_excerpt = '';
-        $post = array(
-          'post_type'		=> 'tour',
-        );
+		$post_name = $data_post_content = $data_post_excerpt = '';
+		$post = array(
+		  'post_type'		=> 'tour',
+		);
 
-        //Set the post_content
+		//Set the post_content
 		$content_used_general_description = false;
-        if(false !== $importable_content && in_array('description',$importable_content)){
-            $data_post_content = '';
-
-            if(isset($data['description'])){
-                $data_post_content = $data['description'];
-            }elseif(isset($data['summary'])){
-                $data_post_content = $data['summary'];
-            }
-            $post['post_content'] = $data_post_content;
-        }
-
-        //Create or update the post
-        if(false !== $id && '0' !== $id){
-            $post['ID'] = $id;
-	        $post['post_status'] = 'publish';
-            $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['last_modified']),$prev_date);
-        }else{
-
-            //Set the name
-            if(isset($data['name'])){
-                $post_name = wp_unique_post_slug(sanitize_title($data['name']),$id, 'draft', 'tour', 0);
-            }
-            $post['post_name'] = $post_name;
-            $post['post_title'] = $data['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['last_modified']));
-            }
-        }
+		if(false !== $importable_content && in_array('description',$importable_content)){
+			$data_post_content = '';
+
+			if(isset($data['description'])){
+				$data_post_content = $data['description'];
+			}elseif(isset($data['summary'])){
+				$data_post_content = $data['summary'];
+			}
+			$post['post_content'] = $data_post_content;
+		}
+
+		//Create or update the post
+		if(false !== $id && '0' !== $id){
+			$post['ID'] = $id;
+			$post['post_status'] = 'publish';
+			$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['last_modified']),$prev_date);
+		}else{
+
+			//Set the name
+			if(isset($data['name'])){
+				$post_name = wp_unique_post_slug(sanitize_title($data['name']),$id, 'draft', 'tour', 0);
+			}
+			$post['post_name'] = $post_name;
+			$post['post_title'] = $data['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['last_modified']));
+			}
+		}
 
 
 		//Set the price
@@ -544,9 +544,9 @@ 
 			$this->set_duration($data,$id);
 		}
 
-        if(in_array('itineraries',$importable_content) && isset($data['legs']) && !empty($data['legs'])){
-            $this->process_itineraries($data,$id,$importable_content);
-        }
+		if(in_array('itineraries',$importable_content) && isset($data['legs']) && !empty($data['legs'])){
+			$this->process_itineraries($data,$id,$importable_content);
+		}
 
 		if(in_array('map',$importable_content) && isset($data['routes']) && !empty($data['routes'])){
 			$this->process_map_points($data,$id);
@@ -557,24 +557,24 @@ 
 		if(false !== $importable_content && (in_array('itinerary_gallery',$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 featured image
-        //TODO Test These
-        if(false !== $importable_content && in_array('featured_image',$importable_content)){
-            $this->set_featured_image($data,$id);
-        }
+		//Set the featured image
+		//TODO Test These
+		if(false !== $importable_content && in_array('featured_image',$importable_content)){
+			$this->set_featured_image($data,$id);
+		}
 
 		//TODO Test These
-        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);
+		}
 
 		//TODO Test These
-        //Import the main gallery
-        if(false !== $importable_content && in_array('gallery',$importable_content)){
-            $this->create_main_gallery($data,$id);
-        }
+		//Import the main gallery
+		if(false !== $importable_content && in_array('gallery',$importable_content)){
+			$this->create_main_gallery($data,$id);
+		}
 
-        return $id;
+		return $id;
 	}
 
 	/**
@@ -700,31 +700,31 @@ 
 	 */
 	public function process_map_points($data,$id) {
 
-	    if(!empty($data['routes'])){
+		if(!empty($data['routes'])){
 
-	        delete_post_meta($id,'wetu_map_points');
+			delete_post_meta($id,'wetu_map_points');
 
-	        $points = array();
+			$points = array();
 
-	        foreach($data['routes'] as $route){
+			foreach($data['routes'] as $route){
 
 
-	            if(isset($route['points']) && '' !== $route['points']){
+				if(isset($route['points']) && '' !== $route['points']){
 
-	                $temp_points = explode(';',$route['points']);
-	                $point_counter = count($temp_points);
+					$temp_points = explode(';',$route['points']);
+					$point_counter = count($temp_points);
 
 					for ($x = 0; $x <= $point_counter; $x++) {
-					    $y = $x+1;
+						$y = $x+1;
 						$points[] = $temp_points[$x].','.$temp_points[$y];
 						$x++;
 					}
 				}
-            }
-            if(!empty($points)){
+			}
+			if(!empty($points)){
 				$this->save_custom_field(implode(' ',$points),'wetu_map_points',$id,false,true);
-            }
-        }
+			}
+		}
 
 	}
 
@@ -732,17 +732,17 @@ 
 	 * Set the Itinerary Day
 	 */
 	public function set_itinerary_day($day,$id) {
-        $this->save_custom_field($day,'itinerary',$id,false,false);
+		$this->save_custom_field($day,'itinerary',$id,false,false);
 	}
 
 	/**
 	 * Set the price
 	 */
 	public function set_price($data,$id) {
-	    //Price
+		//Price
 		if(isset($data['price']) && ''!== $data['price']){
-            $price = preg_replace("/[^0-9,.]/", "", $data['price']);
-            $this->save_custom_field($price,'price',$id);
+			$price = preg_replace("/[^0-9,.]/", "", $data['price']);
+			$this->save_custom_field($price,'price',$id);
 		}
 
 		//Price includes
@@ -751,7 +751,7 @@ 
 			$this->save_custom_field($data['price_includes'],'included',$id);
 		}
 
-        //Price Excludes
+		//Price Excludes
 		if(isset($data['price_excludes']) && ''!== $data['price_excludes']){
 			$this->save_custom_field($data['price_excludes'],'not_included',$id);
 		}
@@ -775,35 +775,35 @@ 
 	 */
 	public function set_accommodation($day,$id) {
 
-	    $ac_id = false;
+		$ac_id = false;
 		$this->current_accommodation = $this->find_current_accommodation();
 		
 		if(isset($day['content_entity_id']) && !empty($day['content_entity_id'])){
 
 			if(false !== $this->current_accommodation && !empty($this->current_accommodation) && array_key_exists($day['content_entity_id'],$this->current_accommodation)){
-                $ac_id = $this->current_accommodation[$day['content_entity_id']];
+				$ac_id = $this->current_accommodation[$day['content_entity_id']];
 			}else{
 				$ac_id = wp_insert_post(array(
-                    'post_type' => 'accommodation',
-                    'post_status' => 'draft',
-                    'post_title' => $day['content_entity_id']
-                ));
+					'post_type' => 'accommodation',
+					'post_status' => 'draft',
+					'post_title' => $day['content_entity_id']
+				));
 				$this->save_custom_field($day['content_entity_id'],'lsx_wetu_id',$ac_id);
 			}
 
 			if('' !== $ac_id && false !== $ac_id){
-			    $this->save_custom_field($ac_id,'accommodation_to_tour',$id,false,false);
+				$this->save_custom_field($ac_id,'accommodation_to_tour',$id,false,false);
 				$this->save_custom_field($id,'tour_to_accommodation',$ac_id,false,false);
-            }
+			}
 		}
 		return $ac_id;
 	}
 
 	/**
 	 * Grab all the current accommodation posts via the lsx_wetu_id field.
-     *
-     * @param $post_type string
-     * @return boolean / array
+	 *
+	 * @param $post_type string
+	 * @return boolean / array
 	 */
 	public function find_current_accommodation($post_type='accommodation') {
 		global $wpdb;
@@ -811,16 +811,16 @@ 
 
 		$return = false;
 		if(!empty($accommodation)){
-		    foreach($accommodation as $key => $acc){
+			foreach($accommodation as $key => $acc){
 				$return[$acc->meta_value] = $acc->post_id;
-            }
-        }
+			}
+		}
 		return $return;
 	}
 
 	/**
 	 * Grab all the current accommodation posts via the lsx_wetu_id field.
-     * @return boolean / array
+	 * @return boolean / array
 	 */
 	public function find_current_destinations() {
 		return $this->find_current_accommodation('destination');
@@ -847,7 +847,7 @@ 
 				$country_wetu_id = get_post_meta($potential_id,'lsx_wetu_id',true);
 				if(false !== $country_wetu_id){
 					$this->set_country($country_wetu_id, $id);
-                }
+				}
 
 			}else {
 
@@ -858,27 +858,27 @@ 
 
 					if (!empty($destination_data) && !isset($destination_data['error'])) {
 
-					    $destination_title = $day['destination_content_entity_id'];
+						$destination_title = $day['destination_content_entity_id'];
 
-					    if(isset($destination_data[0]['name'])){
+						if(isset($destination_data[0]['name'])){
 							$destination_title = $destination_data[0]['name'];
-                        }
+						}
 
-					    if(isset($destination_data[0]['map_object_id']) && isset($destination_data[0]['position']['country_content_entity_id'])
-                            && $destination_data[0]['map_object_id'] !== $destination_data[0]['position']['country_content_entity_id']){
+						if(isset($destination_data[0]['map_object_id']) && isset($destination_data[0]['position']['country_content_entity_id'])
+							&& $destination_data[0]['map_object_id'] !== $destination_data[0]['position']['country_content_entity_id']){
 
 							$country_id = $this->set_country($destination_data[0]['position']['country_content_entity_id'], $id);
-                        }
+						}
 
-                        $dest_post = array(
+						$dest_post = array(
 							'post_type' => 'destination',
 							'post_status' => 'draft',
 							'post_title' => $destination_title
 						);
 
-					    if(false !== $country_id){
+						if(false !== $country_id){
 							$dest_post['post_parent'] = $country_id;
-                        }
+						}
 						$dest_id = wp_insert_post($dest_post);
 
 						//Make sure we register the
@@ -900,50 +900,50 @@ 
 	 * Connects the destinations post type
 	 *
 	 * @param $dest_id string
-     * @param $country_id array
+	 * @param $country_id array
 	 * @param $id string
 	 */
 	public function set_country($country_wetu_id, $id) {
-	    $country_id = false;
+		$country_id = false;
 		$this->current_destinations = $this->find_current_destinations();
 
-        if (false !== $this->current_destinations && !empty($this->current_destinations) && array_key_exists($country_wetu_id, $this->current_destinations)) {
-            $country_id = $this->current_destinations[$country_wetu_id];
-        } else {
+		if (false !== $this->current_destinations && !empty($this->current_destinations) && array_key_exists($country_wetu_id, $this->current_destinations)) {
+			$country_id = $this->current_destinations[$country_wetu_id];
+		} else {
 
-            $country_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=" . $country_wetu_id);
+			$country_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=" . $country_wetu_id);
 
-            if ($country_json) {
-                $country_data = json_decode($country_json, true);
+			if ($country_json) {
+				$country_data = json_decode($country_json, true);
 
-                if (!empty($country_data) && !isset($country_data['error'])) {
+				if (!empty($country_data) && !isset($country_data['error'])) {
 
 					//Format the title of the destination if its available,  otherwise default to the WETU ID.
-                    $country_title = $country_wetu_id;
-                    if (isset($country_data[0]['name'])) {
+					$country_title = $country_wetu_id;
+					if (isset($country_data[0]['name'])) {
 						$country_title = $country_data[0]['name'];
-                    }
+					}
 
 					$country_id = wp_insert_post(array(
-                        'post_type' => 'destination',
-                        'post_status' => 'draft',
-                        'post_title' => $country_title
-                    ));
+						'post_type' => 'destination',
+						'post_status' => 'draft',
+						'post_title' => $country_title
+					));
 					//add the country to the current destination stack
 					$this->current_destinations[$country_wetu_id] = $country_id;
 
 					//Save the wetu field
-                    $this->save_custom_field($country_wetu_id, 'lsx_wetu_id', $country_id);
-                }
-            }
-        }
+					$this->save_custom_field($country_wetu_id, 'lsx_wetu_id', $country_id);
+				}
+			}
+		}
 
-        if ('' !== $country_id && false !== $country_id) {
-            $this->save_custom_field($country_id, 'destination_to_tour', $id, false, false);
-            $this->save_custom_field($id, 'tour_to_destination', $country_id, false, false);
+		if ('' !== $country_id && false !== $country_id) {
+			$this->save_custom_field($country_id, 'destination_to_tour', $id, false, false);
+			$this->save_custom_field($id, 'tour_to_destination', $country_id, false, false);
 
-            return $country_id;
-        }
+			return $country_id;
+		}
 	}
 }
 $wetu_importer_tours = new WETU_Importer_Tours();
\ No newline at end of file

Spacing +200 added lines, -200 removed lines

@@ -82,20 +82,20 @@ 
 	public function __construct() {
 		$this->set_variables();
 
-		add_action( 'lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this,'display_page') );
-		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('lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this, 'display_page'));
+		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'));
 
-		$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];
 		}
 
-		$tour_options = get_option('wetu_importer_tour_settings',false);
-		if(false !== $tour_options){
+		$tour_options = get_option('wetu_importer_tour_settings', false);
+		if (false !== $tour_options) {
 			$this->tour_options = $tour_options;
         }
 	}
@@ -107,11 +107,11 @@ 
 	{
 		parent::set_variables();
 
-		if ( false !== $this->api_username && false !== $this->api_password ) {
+		if (false !== $this->api_username && false !== $this->api_password) {
 			$this->url    = 'https://wetu.com/API/Itinerary/';
-			$this->url_qs = 'username=' . $this->api_username . '&password=' . $this->api_password;
-		} elseif ( false !== $this->api_key ) {
-			$this->url    = 'https://wetu.com/API/Itinerary/' . $this->api_key;
+			$this->url_qs = 'username='.$this->api_username.'&password='.$this->api_password;
+		} elseif (false !== $this->api_key) {
+			$this->url    = 'https://wetu.com/API/Itinerary/'.$this->api_key;
 			$this->url_qs = '';
 		}
 	}
@@ -131,8 +131,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">
@@ -141,11 +141,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">							
@@ -159,8 +159,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> 
 
@@ -172,36 +172,36 @@ 
 						<div style="width:30%;display:block;float:left;">
 							<h3><?php _e('What content to Sync from WETU'); ?></h3>
 							<ul>
-								<li><input class="content" <?php $this->checked($this->tour_options,'description'); ?> type="checkbox" name="content[]" value="description" /> <?php _e('Description','wetu-importer'); ?></li>
-								<li><input class="content" <?php $this->checked($this->tour_options,'excerpt'); ?> type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt','wetu-importer'); ?></li>
+								<li><input class="content" <?php $this->checked($this->tour_options, 'description'); ?> type="checkbox" name="content[]" value="description" /> <?php _e('Description', 'wetu-importer'); ?></li>
+								<li><input class="content" <?php $this->checked($this->tour_options, 'excerpt'); ?> type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt', 'wetu-importer'); ?></li>
 
-                                <li><input class="content" <?php $this->checked($this->tour_options,'price'); ?> type="checkbox" name="content[]" value="price" /> <?php _e('Price','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'duration'); ?> type="checkbox" name="content[]" value="duration" /> <?php _e('Duration','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'price'); ?> type="checkbox" name="content[]" value="price" /> <?php _e('Price', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'duration'); ?> type="checkbox" name="content[]" value="duration" /> <?php _e('Duration', 'wetu-importer'); ?></li>
 
-								<li><input class="content" <?php $this->checked($this->tour_options,'category'); ?> type="checkbox" name="content[]" value="category" /> <?php _e('Category','wetu-importer'); ?></li>
+								<li><input class="content" <?php $this->checked($this->tour_options, 'category'); ?> type="checkbox" name="content[]" value="category" /> <?php _e('Category', 'wetu-importer'); ?></li>
 
-                                <li><input class="content" <?php $this->checked($this->tour_options,'itineraries'); ?> type="checkbox" name="content[]" value="itineraries" /> <?php _e('Itinerary Days','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'itineraries'); ?> type="checkbox" name="content[]" value="itineraries" /> <?php _e('Itinerary Days', 'wetu-importer'); ?></li>
 
-								<?php if(class_exists('TO_Maps')){ ?>
-                                    <li><input class="content" <?php $this->checked($this->tour_options,'map'); ?> type="checkbox" name="content[]" value="map" /> <?php _e('Map Coordinates (generates a KML file)','wetu-importer'); ?></li>
+								<?php if (class_exists('TO_Maps')) { ?>
+                                    <li><input class="content" <?php $this->checked($this->tour_options, 'map'); ?> type="checkbox" name="content[]" value="map" /> <?php _e('Map Coordinates (generates a KML file)', 'wetu-importer'); ?></li>
 								<?php } ?>
 							</ul>
 						</div>
                         <div style="width:30%;display:block;float:left;">
                             <h3><?php _e('Itinerary Info'); ?></h3>
                             <ul>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'itinerary_description'); ?> type="checkbox" name="content[]" value="itinerary_description" /> <?php _e('Description','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'itinerary_included'); ?> type="checkbox" name="content[]" value="itinerary_included" /> <?php _e('Included','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'itinerary_excluded'); ?> type="checkbox" name="content[]" value="itinerary_excluded" /> <?php _e('Excluded','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'itinerary_description'); ?> type="checkbox" name="content[]" value="itinerary_description" /> <?php _e('Description', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'itinerary_included'); ?> type="checkbox" name="content[]" value="itinerary_included" /> <?php _e('Included', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'itinerary_excluded'); ?> type="checkbox" name="content[]" value="itinerary_excluded" /> <?php _e('Excluded', 'wetu-importer'); ?></li>
                             </ul>
 
                             <h4><?php _e('Additional Content'); ?></h4>
                             <ul>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'accommodation'); ?> type="checkbox" name="content[]" value="accommodation" /> <?php _e('Sync Accommodation','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->tour_options,'destination'); ?> type="checkbox" name="content[]" value="destination" /> <?php _e('Sync Destinations','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'accommodation'); ?> type="checkbox" name="content[]" value="accommodation" /> <?php _e('Sync Accommodation', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->tour_options, 'destination'); ?> type="checkbox" name="content[]" value="destination" /> <?php _e('Sync Destinations', 'wetu-importer'); ?></li>
                             </ul>
                         </div>
-                        <?php if(class_exists('TO_Team')){ ?>
+                        <?php if (class_exists('TO_Team')) { ?>
                             <div style="width:30%;display:block;float:left;">
                                 <h3><?php _e('Assign a Team Member'); ?></h3>
                                 <?php $this->team_member_checkboxes($this->tour_options); ?>
@@ -213,7 +213,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(); ?>
 
@@ -225,12 +225,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','wetu-importer'); ?> - <small><?php _e('Import your','wetu-importer'); ?> <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation'); ?></a> <?php _e('next','wetu-importer'); ?></small></h3>
+				<h3><?php _e('Completed', 'wetu-importer'); ?> - <small><?php _e('Import your', 'wetu-importer'); ?> <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation'); ?></a> <?php _e('next', 'wetu-importer'); ?></small></h3>
 				<ul>
 				</ul>
 			</div>
@@ -243,17 +243,17 @@ 
 	 */
 	public function update_options_form() {
 		$tours = get_transient('lsx_ti_tours');
-		echo '<div class="wetu-status"><h3>'.__('Wetu Status','wetu-importer').' - ';
-		if('' === $tours || false === $tours || isset($_GET['refresh_tours'])){
+		echo '<div class="wetu-status"><h3>'.__('Wetu Status', 'wetu-importer').' - ';
+		if ('' === $tours || false === $tours || isset($_GET['refresh_tours'])) {
 			$result = $this->update_options();
 
-			if(true === $result){
-			    echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
-            }else{
+			if (true === $result) {
+			    echo '<span style="color:green;">'.esc_attr('Connected', 'wetu-importer').'</span>';
+            }else {
 			    echo '<span style="color:red;">'.wp_kses_post($result).'</span>';
             }
-		}else{
-			echo '<span style="color:green;">'.esc_attr('Connected','wetu-importer').'</span>';
+		}else {
+			echo '<span style="color:green;">'.esc_attr('Connected', 'wetu-importer').'</span>';
         }
 		echo '</h3></div>';
 	}
@@ -262,13 +262,13 @@ 
 	 * Save the list of Tours into an option
 	 */
 	public function update_options() {
-		$data = file_get_contents( $this->url . '/V7/List?' . $this->url_qs . '&own=true&type=All' );
+		$data = file_get_contents($this->url.'/V7/List?'.$this->url_qs.'&own=true&type=All');
 		$tours = json_decode($data, true);
 
-		if(isset($tours['error'])){
+		if (isset($tours['error'])) {
 		    return $tours['error'];
         }elseif (isset($tours['itineraries']) && !empty($tours['itineraries'])) {
-			set_transient('lsx_ti_tours',$tours['itineraries'],60*60*2);
+			set_transient('lsx_ti_tours', $tours['itineraries'], 60 * 60 * 2);
 			return true;
 		}
 	}
@@ -292,8 +292,8 @@ 
 
 					LIMIT 0,500
 		");
-		if(null !== $current_tours && !empty($current_tours)){
-			foreach($current_tours as $tour){
+		if (null !== $current_tours && !empty($current_tours)) {
+			foreach ($current_tours as $tour) {
 				$return[$tour->meta_value] = $tour;
 			}
 		}
@@ -306,36 +306,36 @@ 
 	public function process_ajax_search() {
 		$return = false;
 
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug) {
 			$tours = get_transient('lsx_ti_tours');
-			if ( false !== $tours) {
+			if (false !== $tours) {
 
 				$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';
 				}
 
@@ -343,9 +343,9 @@ 
 				if (!empty($tours)) {
 					$current_tours = $this->find_current_tours();
 
-					foreach($tours as $row_key => $row){
+					foreach ($tours as $row_key => $row) {
 
-					    if(isset($row['is_disabled']) && true === $row['is_disabled']){
+					    if (isset($row['is_disabled']) && true === $row['is_disabled']) {
                             continue;
                         }
 
@@ -355,29 +355,29 @@ 
 
                         //If this is a current tour, add its ID to the row.
 						$row['post_id'] = 0;
-						if(false !== $current_tours && array_key_exists($row['identifier'], $current_tours)){
+						if (false !== $current_tours && array_key_exists($row['identifier'], $current_tours)) {
 							$row['post_id'] = $current_tours[$row['identifier']]->post_id;
 						}
 
 						//If we are searching for
-						if(false !== $post_status){
+						if (false !== $post_status) {
 
-                            if('import' === $post_status){
+                            if ('import' === $post_status) {
 
-								if(0 !== $row['post_id']){
+								if (0 !== $row['post_id']) {
 								    continue;
-								}else{
+								}else {
 									$searched_items[sanitize_title($row['name']).'-'.$row['identifier']] = $this->format_row($row);
                                 }
 
 
-                            }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;
                                     }
 
@@ -386,17 +386,17 @@ 
 
                             }
 
-                        }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['identifier']] = $this->format_row($row);
 								}
 							}
@@ -404,7 +404,7 @@ 
 					}		
 				}
 
-				if(false !== $searched_items){
+				if (false !== $searched_items) {
 					ksort($searched_items);
 					$return = implode($searched_items);
 				}
@@ -417,11 +417,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>';
 			}
 
@@ -435,7 +435,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['identifier'].'
@@ -450,31 +450,31 @@ 
 	 */
 	public function process_ajax_import($force = false) {
 		$return = false;
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug && isset($_POST['wetu_id'])){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === $this->tab_slug && 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['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_tour_settings',$content);
-			}else{
+				add_option('wetu_importer_tour_settings', $content);
+			}else {
 				delete_option('wetu_importer_tour_settings');
 				$content = false;
 			}
 
-            $jdata=file_get_contents("http://wetu.com/API/Itinerary/V7/Get?id=".$wetu_id);
+            $jdata = file_get_contents("http://wetu.com/API/Itinerary/V7/Get?id=".$wetu_id);
 
-            if($jdata)
+            if ($jdata)
             {
-				$jdata=json_decode($jdata,true);
-                if(!empty($jdata))
+				$jdata = json_decode($jdata, true);
+                if (!empty($jdata))
                 {
-                	$return = $this->import_row($jdata,$wetu_id,$post_id,$content);
+                	$return = $this->import_row($jdata, $wetu_id, $post_id, $content);
                 	$this->format_completed_row($return);
                 }
             }
@@ -489,7 +489,7 @@ 
      * @param $data array
      * @param $wetu_id string
 	 */
-	public function import_row($data,$wetu_id,$id=0,$importable_content=false,$old1=false,$old2=false) {
+	public function import_row($data, $wetu_id, $id = 0, $importable_content = false, $old1 = false, $old2 = false) {
         $post_name = $data_post_content = $data_post_excerpt = '';
         $post = array(
           'post_type'		=> 'tour',
@@ -497,29 +497,29 @@ 
 
         //Set the post_content
 		$content_used_general_description = false;
-        if(false !== $importable_content && in_array('description',$importable_content)){
+        if (false !== $importable_content && in_array('description', $importable_content)) {
             $data_post_content = '';
 
-            if(isset($data['description'])){
+            if (isset($data['description'])) {
                 $data_post_content = $data['description'];
-            }elseif(isset($data['summary'])){
+            }elseif (isset($data['summary'])) {
                 $data_post_content = $data['summary'];
             }
             $post['post_content'] = $data_post_content;
         }
 
         //Create or update the post
-        if(false !== $id && '0' !== $id){
+        if (false !== $id && '0' !== $id) {
             $post['ID'] = $id;
 	        $post['post_status'] = 'publish';
             $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['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['last_modified']), $prev_date);
+        }else {
 
             //Set the name
-            if(isset($data['name'])){
-                $post_name = wp_unique_post_slug(sanitize_title($data['name']),$id, 'draft', 'tour', 0);
+            if (isset($data['name'])) {
+                $post_name = wp_unique_post_slug(sanitize_title($data['name']), $id, 'draft', 'tour', 0);
             }
             $post['post_name'] = $post_name;
             $post['post_title'] = $data['name'];
@@ -527,51 +527,51 @@ 
             $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['last_modified']));
+            if (false !== $id) {
+                add_post_meta($id, 'lsx_wetu_id', $wetu_id);
+                add_post_meta($id, 'lsx_wetu_modified_date', strtotime($data['last_modified']));
             }
         }
 
 
 		//Set the price
-		if(false !== $importable_content && in_array('price',$importable_content)){
-			$this->set_price($data,$id);
+		if (false !== $importable_content && in_array('price', $importable_content)) {
+			$this->set_price($data, $id);
 		}
 
 		//Set the Duration
-		if(false !== $importable_content && in_array('duration',$importable_content)){
-			$this->set_duration($data,$id);
+		if (false !== $importable_content && in_array('duration', $importable_content)) {
+			$this->set_duration($data, $id);
 		}
 
-        if(in_array('itineraries',$importable_content) && isset($data['legs']) && !empty($data['legs'])){
-            $this->process_itineraries($data,$id,$importable_content);
+        if (in_array('itineraries', $importable_content) && isset($data['legs']) && !empty($data['legs'])) {
+            $this->process_itineraries($data, $id, $importable_content);
         }
 
-		if(in_array('map',$importable_content) && isset($data['routes']) && !empty($data['routes'])){
-			$this->process_map_points($data,$id);
+		if (in_array('map', $importable_content) && isset($data['routes']) && !empty($data['routes'])) {
+			$this->process_map_points($data, $id);
 		}
 
 		//TODO Test These
 		//Setup some default for use in the import
-		if(false !== $importable_content && (in_array('itinerary_gallery',$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('itinerary_gallery', $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 featured image
         //TODO Test These
-        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);
         }
 
 		//TODO Test These
-        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);
         }
 
 		//TODO Test These
         //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;
@@ -580,149 +580,149 @@ 
 	/**
 	 * A loop which runs through each leg on the tour.
 	 */
-	public function process_itineraries($data,$id,$importable_content) {
+	public function process_itineraries($data, $id, $importable_content) {
 		$day_counter = 1;
 		$leg_counter = 0;
 
-		delete_post_meta($id,'itinerary');
+		delete_post_meta($id, 'itinerary');
 
-		if(false !== $importable_content && in_array('accommodation',$importable_content)){
-			delete_post_meta($id,'accommodation_to_tour');
+		if (false !== $importable_content && in_array('accommodation', $importable_content)) {
+			delete_post_meta($id, 'accommodation_to_tour');
 		}
-		if(false !== $importable_content && in_array('destination',$importable_content)){
-			delete_post_meta($id,'destination_to_tour');
-			delete_post_meta($id,'departs_from');
-			delete_post_meta($id,'ends_in');
+		if (false !== $importable_content && in_array('destination', $importable_content)) {
+			delete_post_meta($id, 'destination_to_tour');
+			delete_post_meta($id, 'departs_from');
+			delete_post_meta($id, 'ends_in');
 		}
 
 		$departs_from = false;
 		$ends_in = false;
 
-		foreach($data['legs'] as $leg){
+		foreach ($data['legs'] as $leg) {
 
-			if(isset($leg['days']) && !empty($leg['days'])){
+			if (isset($leg['days']) && !empty($leg['days'])) {
 
 				//Itinerary Accommodation
 				$current_accommodation = false;
-				if(false !== $importable_content && in_array('accommodation',$importable_content)){
-					$current_accommodation = $this->set_accommodation($leg,$id);
+				if (false !== $importable_content && in_array('accommodation', $importable_content)) {
+					$current_accommodation = $this->set_accommodation($leg, $id);
 				}
 
 				//Itinerary Destination
 				$current_destination = false;
-				if(false !== $importable_content && in_array('destination',$importable_content)){
-					$current_destination = $this->set_destination($leg,$id);
+				if (false !== $importable_content && in_array('destination', $importable_content)) {
+					$current_destination = $this->set_destination($leg, $id);
 				}
 
 				//If the Nights are the same mount of days in the array,  then it isnt "By Destination"
-				if($leg['nights'] === count($leg['days']) || 0 === $leg['itinerary_leg_id']){
+				if ($leg['nights'] === count($leg['days']) || 0 === $leg['itinerary_leg_id']) {
 
-					foreach($leg['days'] as $day){
+					foreach ($leg['days'] as $day) {
 
 						$current_day = array();
 
-						$current_day['title'] =  esc_attr('Day ','wetu-importer').$day_counter;
+						$current_day['title'] = esc_attr('Day ', 'wetu-importer').$day_counter;
 
 						//Description
-						if(false !== $importable_content && in_array('itinerary_description',$importable_content) && isset($day['notes']) && '' !== $day['notes']){
+						if (false !== $importable_content && in_array('itinerary_description', $importable_content) && isset($day['notes']) && '' !== $day['notes']) {
 							$current_day['description'] = strip_tags($day['notes']);
-						}else{
+						}else {
 							$current_day['description'] = '';
 						}
 
 						//Itinerary Gallery
-						if(false !== $importable_content && in_array('itinerary_gallery',$importable_content) && isset($day['images'])){
+						if (false !== $importable_content && in_array('itinerary_gallery', $importable_content) && isset($day['images'])) {
 							$current_day['featured_image'] = '';
-						}else{
+						}else {
 							$current_day['featured_image'] = '';
 						}
 
 						//Accommodation
-						if(false !== $current_accommodation){
+						if (false !== $current_accommodation) {
 							$current_day['accommodation_to_tour'] = array($current_accommodation);
-						}else{
+						}else {
 							$current_day['accommodation_to_tour'] = array();
 						}
 
 						//Destination
-						if(false !== $current_destination){
+						if (false !== $current_destination) {
 							$current_day['destination_to_tour'] = array($current_destination);
-						}else{
+						}else {
 							$current_day['destination_to_tour'] = array();
 						}
 
 						//Included
-						if(false !== $importable_content && in_array('itinerary_included',$importable_content) && isset($day['included']) && '' !== $day['included']){
+						if (false !== $importable_content && in_array('itinerary_included', $importable_content) && isset($day['included']) && '' !== $day['included']) {
 							$current_day['included'] = strip_tags($day['included']);
-						}else{
+						}else {
 							$current_day['description'] = '';
 						}
 
 						//Excluded
-						if(false !== $importable_content && in_array('itinerary_excluded',$importable_content) && isset($day['excluded']) && '' !== $day['excluded']){
+						if (false !== $importable_content && in_array('itinerary_excluded', $importable_content) && isset($day['excluded']) && '' !== $day['excluded']) {
 							$current_day['excluded'] = strip_tags($day['excluded']);
-						}else{
+						}else {
 							$current_day['excluded'] = '';
 						}
 
-						$this->set_itinerary_day($current_day,$id);
+						$this->set_itinerary_day($current_day, $id);
 						$day_counter++;
 					}
 
-				}else{
-					$day_counter = $day_counter + (int)$leg['nights'];
+				}else {
+					$day_counter = $day_counter + (int) $leg['nights'];
 				}
 
 			}
 
 			//If we are in the first leg,  and the destination was attached then save it as the departure field.
-			if( 0 === $leg_counter && false !== $current_destination){
+			if (0 === $leg_counter && false !== $current_destination) {
 				$departs_from = $current_destination;
 			}
 
 			//If its the last leg then save it as the ends in.
-			if( $leg_counter === (count($data['legs'])-2) && false !== $current_destination){
+			if ($leg_counter === (count($data['legs']) - 2) && false !== $current_destination) {
 				$ends_in = $current_destination;
 			}
 			$leg_counter++;
 		}
 
-		if(false !== $departs_from){
-			add_post_meta($id,'departs_from',$departs_from,true);
+		if (false !== $departs_from) {
+			add_post_meta($id, 'departs_from', $departs_from, true);
 		}
-		if(false !== $ends_in){
-			add_post_meta($id,'ends_in',$ends_in,true);
+		if (false !== $ends_in) {
+			add_post_meta($id, 'ends_in', $ends_in, true);
 		}
 	}
 
 	/**
 	 * Run through your routes and save the points as a KML file.
 	 */
-	public function process_map_points($data,$id) {
+	public function process_map_points($data, $id) {
 
-	    if(!empty($data['routes'])){
+	    if (!empty($data['routes'])) {
 
-	        delete_post_meta($id,'wetu_map_points');
+	        delete_post_meta($id, 'wetu_map_points');
 
 	        $points = array();
 
-	        foreach($data['routes'] as $route){
+	        foreach ($data['routes'] as $route) {
 
 
-	            if(isset($route['points']) && '' !== $route['points']){
+	            if (isset($route['points']) && '' !== $route['points']) {
 
-	                $temp_points = explode(';',$route['points']);
+	                $temp_points = explode(';', $route['points']);
 	                $point_counter = count($temp_points);
 
 					for ($x = 0; $x <= $point_counter; $x++) {
-					    $y = $x+1;
+					    $y = $x + 1;
 						$points[] = $temp_points[$x].','.$temp_points[$y];
 						$x++;
 					}
 				}
             }
-            if(!empty($points)){
-				$this->save_custom_field(implode(' ',$points),'wetu_map_points',$id,false,true);
+            if (!empty($points)) {
+				$this->save_custom_field(implode(' ', $points), 'wetu_map_points', $id, false, true);
             }
         }
 
@@ -731,28 +731,28 @@ 
 	/**
 	 * Set the Itinerary Day
 	 */
-	public function set_itinerary_day($day,$id) {
-        $this->save_custom_field($day,'itinerary',$id,false,false);
+	public function set_itinerary_day($day, $id) {
+        $this->save_custom_field($day, 'itinerary', $id, false, false);
 	}
 
 	/**
 	 * Set the price
 	 */
-	public function set_price($data,$id) {
+	public function set_price($data, $id) {
 	    //Price
-		if(isset($data['price']) && ''!== $data['price']){
+		if (isset($data['price']) && '' !== $data['price']) {
             $price = preg_replace("/[^0-9,.]/", "", $data['price']);
-            $this->save_custom_field($price,'price',$id);
+            $this->save_custom_field($price, 'price', $id);
 		}
 
 		//Price includes
-		if(isset($data['price_includes']) && ''!== $data['price_includes']){
-			$this->save_custom_field($data['price_includes'],'included',$id);
+		if (isset($data['price_includes']) && '' !== $data['price_includes']) {
+			$this->save_custom_field($data['price_includes'], 'included', $id);
 		}
 
         //Price Excludes
-		if(isset($data['price_excludes']) && ''!== $data['price_excludes']){
-			$this->save_custom_field($data['price_excludes'],'not_included',$id);
+		if (isset($data['price_excludes']) && '' !== $data['price_excludes']) {
+			$this->save_custom_field($data['price_excludes'], 'not_included', $id);
 		}
 
 	}
@@ -760,11 +760,11 @@ 
 	/**
 	 * Set the duration
 	 */
-	public function set_duration($data,$id) {
-		if(isset($data['days']) && !empty($data['days'])){
+	public function set_duration($data, $id) {
+		if (isset($data['days']) && !empty($data['days'])) {
 			$price = $data['days'];
 			$price = preg_replace("/[^0-9,.]/", "", $price);
-			$this->save_custom_field($price,'duration',$id);
+			$this->save_custom_field($price, 'duration', $id);
 		}
 	}
 
@@ -772,27 +772,27 @@ 
 	/**
 	 * Connects the Accommodation if its available
 	 */
-	public function set_accommodation($day,$id) {
+	public function set_accommodation($day, $id) {
 
 	    $ac_id = false;
 		$this->current_accommodation = $this->find_current_accommodation();
 		
-		if(isset($day['content_entity_id']) && !empty($day['content_entity_id'])){
+		if (isset($day['content_entity_id']) && !empty($day['content_entity_id'])) {
 
-			if(false !== $this->current_accommodation && !empty($this->current_accommodation) && array_key_exists($day['content_entity_id'],$this->current_accommodation)){
+			if (false !== $this->current_accommodation && !empty($this->current_accommodation) && array_key_exists($day['content_entity_id'], $this->current_accommodation)) {
                 $ac_id = $this->current_accommodation[$day['content_entity_id']];
-			}else{
+			}else {
 				$ac_id = wp_insert_post(array(
                     'post_type' => 'accommodation',
                     'post_status' => 'draft',
                     'post_title' => $day['content_entity_id']
                 ));
-				$this->save_custom_field($day['content_entity_id'],'lsx_wetu_id',$ac_id);
+				$this->save_custom_field($day['content_entity_id'], 'lsx_wetu_id', $ac_id);
 			}
 
-			if('' !== $ac_id && false !== $ac_id){
-			    $this->save_custom_field($ac_id,'accommodation_to_tour',$id,false,false);
-				$this->save_custom_field($id,'tour_to_accommodation',$ac_id,false,false);
+			if ('' !== $ac_id && false !== $ac_id) {
+			    $this->save_custom_field($ac_id, 'accommodation_to_tour', $id, false, false);
+				$this->save_custom_field($id, 'tour_to_accommodation', $ac_id, false, false);
             }
 		}
 		return $ac_id;
@@ -804,13 +804,13 @@ 
      * @param $post_type string
      * @return boolean / array
 	 */
-	public function find_current_accommodation($post_type='accommodation') {
+	public function find_current_accommodation($post_type = 'accommodation') {
 		global $wpdb;
 		$accommodation = parent::find_current_accommodation($post_type);
 
 		$return = false;
-		if(!empty($accommodation)){
-		    foreach($accommodation as $key => $acc){
+		if (!empty($accommodation)) {
+		    foreach ($accommodation as $key => $acc) {
 				$return[$acc->meta_value] = $acc->post_id;
             }
         }
@@ -832,25 +832,25 @@ 
 	 * @param $id string
 	 * @return boolean / string
 	 */
-	public function set_destination($day,$id) {
+	public function set_destination($day, $id) {
 		$dest_id = false;
 		$country_id = false;
 		$this->current_destinations = $this->find_current_destinations();
 
-		if(isset($day['destination_content_entity_id']) && !empty($day['destination_content_entity_id'])){
+		if (isset($day['destination_content_entity_id']) && !empty($day['destination_content_entity_id'])) {
 
-			if(false !== $this->current_destinations && !empty($this->current_destinations) && array_key_exists($day['destination_content_entity_id'],$this->current_destinations)){
+			if (false !== $this->current_destinations && !empty($this->current_destinations) && array_key_exists($day['destination_content_entity_id'], $this->current_destinations)) {
 				$dest_id = $this->current_destinations[$day['destination_content_entity_id']];
 
 				$potential_id = wp_get_post_parent_id($dest_id);
-				$country_wetu_id = get_post_meta($potential_id,'lsx_wetu_id',true);
-				if(false !== $country_wetu_id){
+				$country_wetu_id = get_post_meta($potential_id, 'lsx_wetu_id', true);
+				if (false !== $country_wetu_id) {
 					$this->set_country($country_wetu_id, $id);
                 }
 
 			}else {
 
-				$destination_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=" . $day['destination_content_entity_id']);
+				$destination_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=".$day['destination_content_entity_id']);
 
 				if ($destination_json) {
 					$destination_data = json_decode($destination_json, true);
@@ -859,12 +859,12 @@ 
 
 					    $destination_title = $day['destination_content_entity_id'];
 
-					    if(isset($destination_data[0]['name'])){
+					    if (isset($destination_data[0]['name'])) {
 							$destination_title = $destination_data[0]['name'];
                         }
 
-					    if(isset($destination_data[0]['map_object_id']) && isset($destination_data[0]['position']['country_content_entity_id'])
-                            && $destination_data[0]['map_object_id'] !== $destination_data[0]['position']['country_content_entity_id']){
+					    if (isset($destination_data[0]['map_object_id']) && isset($destination_data[0]['position']['country_content_entity_id'])
+                            && $destination_data[0]['map_object_id'] !== $destination_data[0]['position']['country_content_entity_id']) {
 
 							$country_id = $this->set_country($destination_data[0]['position']['country_content_entity_id'], $id);
                         }
@@ -875,7 +875,7 @@ 
 							'post_title' => $destination_title
 						);
 
-					    if(false !== $country_id){
+					    if (false !== $country_id) {
 							$dest_post['post_parent'] = $country_id;
                         }
 						$dest_id = wp_insert_post($dest_post);
@@ -908,9 +908,9 @@ 
 
         if (false !== $this->current_destinations && !empty($this->current_destinations) && array_key_exists($country_wetu_id, $this->current_destinations)) {
             $country_id = $this->current_destinations[$country_wetu_id];
-        } else {
+        }else {
 
-            $country_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=" . $country_wetu_id);
+            $country_json = file_get_contents("http://wetu.com/API/Pins/".$this->api_key."/Get?ids=".$country_wetu_id);
 
             if ($country_json) {
                 $country_data = json_decode($country_json, true);

classes/lsx-banners-integration.php

Doc Comments +3 added lines

@@ -222,6 +222,9 @@
 	  }
 	}	
 
+	/**
+	 * @param string $url
+	 */
 	public function attach_external_image2( $url = null, $post_data = array() ) {
 	
 		if ( !$url ) { return new WP_Error('missing', "Need a valid URL"); }

Indentation +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
 			
             <h2><?php _e('Download new banners straight from WETU','wetu-importer'); ?></h2>
@@ -211,14 +211,14 @@ 
 		$base = rawurlencode($base);
 	  $type = get_post_mime_type($post_id);
 	  switch ($type) {
-	    case 'image/jpeg':
-	    	return $base . ".jpg"; break;
-	    case 'image/png':
-	    	return $base . ".png"; break;
-	    case 'image/gif':
-	      	return $base . ".gif"; break;
-	    default:
-	      return false;
+		case 'image/jpeg':
+			return $base . ".jpg"; break;
+		case 'image/png':
+			return $base . ".png"; break;
+		case 'image/gif':
+		  	return $base . ".gif"; break;
+		default:
+		  return false;
 	  }
 	}	
 

Spacing +51 added lines, -51 removed lines

@@ -27,10 +27,10 @@ 
 	 */
 	public function __construct() {
 		
-		add_action( 'lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this,'display_page') );
+		add_action('lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this, 'display_page'));
 
-		add_action('wp_ajax_lsx_import_sync_banners',array($this,'sync_new_banner'));	
-		add_action('wp_ajax_nopriv_lsx_import_sync_banners',array($this,'sync_new_banner'));		
+		add_action('wp_ajax_lsx_import_sync_banners', array($this, 'sync_new_banner'));	
+		add_action('wp_ajax_nopriv_lsx_import_sync_banners', array($this, 'sync_new_banner'));		
 	}	
 
 	/**
@@ -40,13 +40,13 @@ 
         ?>
         <div class="wrap">
 			
-            <h2><?php _e('Download new banners straight from WETU','wetu-importer'); ?></h2>
+            <h2><?php _e('Download new banners straight from WETU', 'wetu-importer'); ?></h2>
 
 			<form method="get" action="" id="banners-filter">
 				<input type="hidden" name="post_type" class="post_type" value="<?php echo $this->tab_slug; ?>" />
 
 	           <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>  				
 				
 				<table class="wp-list-table widefat fixed posts">
@@ -64,7 +64,7 @@ 
 					<?php 
 						$accommodation_args = array(
 							'post_type' => 'accommodation',
-							'post_status' => array('publish','pending','draft','future','private'),
+							'post_status' => array('publish', 'pending', 'draft', 'future', 'private'),
 							'nopagin' => 'true',
 							'posts_per_page' => '1000',
 							'meta_query' => array(
@@ -89,8 +89,8 @@ 
 
 					<tbody id="the-list">
 						<?php
-							if($accommodation->have_posts()){ 
-								while($accommodation->have_posts()) {
+							if ($accommodation->have_posts()) { 
+								while ($accommodation->have_posts()) {
 									$accommodation->the_post();
 								?>
 								<tr class="post-<?php the_ID(); ?> type-tour status-none" id="post-<?php the_ID(); ?>">	
@@ -99,22 +99,22 @@ 
 									$min_width = '1920';
 									$min_height = '500';
 
-									$img_group = get_post_meta(get_the_ID(),'image_group',true);
+									$img_group = get_post_meta(get_the_ID(), 'image_group', true);
 
 									$thumbnails_html = false;
 
-									if(false !== $img_group){
-										foreach($img_group['banner_image'] as $banner_image){
-											$large = wp_get_attachment_image_src($banner_image,'full');
+									if (false !== $img_group) {
+										foreach ($img_group['banner_image'] as $banner_image) {
+											$large = wp_get_attachment_image_src($banner_image, 'full');
 											$real_width = $large[1];
 											$real_height = $large[2];
 
 											$status = 'optimized';
-											if($real_width < intval($real_width)){
+											if ($real_width < intval($real_width)) {
 												$status = 'width not enough.';
 											}
 
-											$thumbnail = wp_get_attachment_image_src($banner_image,'thumbnail');
+											$thumbnail = wp_get_attachment_image_src($banner_image, 'thumbnail');
 											$thumbnails_html[] = '
 												<div style="display:block;float:left;">
 													<img src="'.$thumbnail[0].'" />
@@ -128,10 +128,10 @@ 
 										<input type="checkbox" data-identifier="<?php the_ID(); ?>" value="<?php the_ID(); ?>" name="post[]" id="cb-select-<?php the_ID(); ?>">
 									</th>
 
-									<td class="post-title page-title column-title"><?php echo '<a href="'.admin_url('/post.php?post='.get_the_ID().'&action=edit').'" target="_blank">';the_title(); echo '</a>'; ?></td>
+									<td class="post-title page-title column-title"><?php echo '<a href="'.admin_url('/post.php?post='.get_the_ID().'&action=edit').'" target="_blank">'; the_title(); echo '</a>'; ?></td>
 
 									<td colspan="2" class="thumbnails column-thumbnails">
-										<?php if(false !== $thumbnails_html){ echo implode('',$thumbnails_html); } else { echo '<p>There was an error retrieving your images.</p>'; } ?>
+										<?php if (false !== $thumbnails_html) { echo implode('', $thumbnails_html); }else { echo '<p>There was an error retrieving your images.</p>'; } ?>
 									</td>
 								</tr>
 						<?php 	}
@@ -152,7 +152,7 @@ 
 
 				</table>
 
-				<p><input class="button button-primary download" type="button" value="<?php _e('Download new Banners','wetu-importer'); ?>" />
+				<p><input class="button button-primary download" type="button" value="<?php _e('Download new Banners', 'wetu-importer'); ?>" />
 				</p>
 			</form>
         </div>
@@ -164,33 +164,33 @@ 
 	 */
 	public function sync_new_banner() {
 
-		if(isset($_POST['action']) && 'lsx_import_sync_banners' === $_POST['action'] && isset($_POST['post_id'])){
+		if (isset($_POST['action']) && 'lsx_import_sync_banners' === $_POST['action'] && isset($_POST['post_id'])) {
 
-			$banners = get_post_meta($_POST['post_id'],'image_group',true);
-			$this->wetu_id = get_post_meta($_POST['post_id'],'lsx_wetu_id',true);
+			$banners = get_post_meta($_POST['post_id'], 'image_group', true);
+			$this->wetu_id = get_post_meta($_POST['post_id'], 'lsx_wetu_id', true);
 
 			$new_banner_array = false;
 			$array_index = 0;
 
 
 
-			foreach($banners['banner_image'] as $banner_image){
+			foreach ($banners['banner_image'] as $banner_image) {
 				$image_id = $this->attach_external_image2($this->format_wetu_url($banner_image));
-				if(null !== $image_id && '' !== $image_id){
+				if (null !== $image_id && '' !== $image_id) {
 					$new_banner_array['banner_image']['cmb-field-'.$array_index] = $image_id;
 					$array_index++;
 				}
 			}
 
-			if(false !== $new_banner_array){
-				delete_post_meta($_POST['post_id'],'image_group');
-				add_post_meta($_POST['post_id'],'image_group',$new_banner_array,true);
+			if (false !== $new_banner_array) {
+				delete_post_meta($_POST['post_id'], 'image_group');
+				add_post_meta($_POST['post_id'], 'image_group', $new_banner_array, true);
 				echo true;
-			}else{
+			}else {
 				echo false;
 			}		
 
-		}else{
+		}else {
 			echo false;
 		}
 		die();
@@ -207,28 +207,28 @@ 
 	 * formats the filename
 	 */
 	public function format_filename($post_id) {
-		$base = str_replace('_',' ',get_the_title($post_id));
+		$base = str_replace('_', ' ', get_the_title($post_id));
 		$base = rawurlencode($base);
 	  $type = get_post_mime_type($post_id);
 	  switch ($type) {
 	    case 'image/jpeg':
-	    	return $base . ".jpg"; break;
+	    	return $base.".jpg"; break;
 	    case 'image/png':
-	    	return $base . ".png"; break;
+	    	return $base.".png"; break;
 	    case 'image/gif':
-	      	return $base . ".gif"; break;
+	      	return $base.".gif"; break;
 	    default:
 	      return false;
 	  }
 	}	
 
-	public function attach_external_image2( $url = null, $post_data = array() ) {
+	public function attach_external_image2($url = null, $post_data = array()) {
 	
-		if ( !$url ) { return new WP_Error('missing', "Need a valid URL"); }
+		if (!$url) { return new WP_Error('missing', "Need a valid URL"); }
 
-		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');
 
 		//var_dump($tmp);
 		$tmp = tempnam("/tmp", "FOO");
@@ -236,37 +236,37 @@ 
 		$image = file_get_contents($url);
 		print_r($image);
 		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)
 
 		// 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['post_id'];
 		}
@@ -274,12 +274,12 @@ 
 		// required libraries for media_handle_sideload
 
 		// do the validation and storage stuff
-		$att_id = media_handle_sideload( $file_array, $_POST['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['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
 		}

Braces +3 added lines, -4 removed lines

@@ -186,11 +186,11 @@ 
 				delete_post_meta($_POST['post_id'],'image_group');
 				add_post_meta($_POST['post_id'],'image_group',$new_banner_array,true);
 				echo true;
-			}else{
+			} else{
 				echo false;
 			}		
 
-		}else{
+		} else{
 			echo false;
 		}
 		die();
@@ -250,8 +250,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
 		}

classes/class-importer.php

Spacing +19 added lines, -19 removed lines

@@ -68,16 +68,16 @@ 
 	 */
 	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('init', array($this, 'load_plugin_textdomain'));
 	}
 	
 	/**
@@ -95,7 +95,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;
 		}
 
@@ -109,13 +109,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']);
 				}
 			}
 		}
@@ -128,8 +128,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));
 	}
 	
 	/**
@@ -139,9 +139,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'));
 		}
 	}
 
@@ -149,9 +149,9 @@ 
 	 * Sets the variables used throughout the plugin.
 	 */
 	public function set_variables() {
-		$temp_options = get_option('_lsx-to_settings',false);
+		$temp_options = get_option('_lsx-to_settings', false);
 
-		if(isset($temp_options[$this->plugin_slug])) {
+		if (isset($temp_options[$this->plugin_slug])) {
 			$this->options = $temp_options[$this->plugin_slug];
 
 			$this->api_key = false;
@@ -174,7 +174,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.'/';
 				}
 			}
 		}
@@ -186,7 +186,7 @@ 
 	 * @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');
 	}
 }
 $wetu_importer = new WETU_Importer();

wetu-importer.php

Spacing +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@ 
  * Domain Path: /languages/
  */
 
-define('WETU_IMPORTER_PATH',  plugin_dir_path( __FILE__ ) );
-define('WETU_IMPORTER_CORE',  __FILE__ );
-define('WETU_IMPORTER_URL',  plugin_dir_url( __FILE__ ) );
-define('WETU_IMPORTER_VER',  '1.0.0' );
+define('WETU_IMPORTER_PATH', plugin_dir_path(__FILE__));
+define('WETU_IMPORTER_CORE', __FILE__);
+define('WETU_IMPORTER_URL', plugin_dir_url(__FILE__));
+define('WETU_IMPORTER_VER', '1.0.0');
 
-register_activation_hook( WETU_IMPORTER_CORE, array( 'WETU_Importer', 'register_activation_hook' ) );
+register_activation_hook(WETU_IMPORTER_CORE, array('WETU_Importer', 'register_activation_hook'));
 
 require_once(WETU_IMPORTER_PATH.'classes/class-importer.php');
 require_once(WETU_IMPORTER_PATH.'classes/class-admin.php');
@@ -26,6 +26,6 @@ 
 require_once(WETU_IMPORTER_PATH.'classes/class-connect-accommodation.php');
 require_once(WETU_IMPORTER_PATH.'classes/class-settings.php');
 
-if(class_exists('Lsx_Banners')){
+if (class_exists('Lsx_Banners')) {
 	require_once(WETU_IMPORTER_PATH.'classes/lsx-banners-integration.php');
 }
\ No newline at end of file

classes/class-destination.php

Doc Comments +2 added lines

@@ -545,6 +545,7 @@ 
 
 	/**
 	 * Set the team memberon each item.
+	 * @param boolean $team_members
 	 */
 	public function set_team_member($id,$team_members) {
 
@@ -612,6 +613,7 @@ 
 
 	/**
 	 * Saves the room data
+	 * @param string $meta_key
 	 */
 	public function set_travel_info($data,$id,$meta_key) {
 

Indentation +93 added lines, -93 removed lines

@@ -104,7 +104,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
             <?php screen_icon(); ?>
 
@@ -329,7 +329,7 @@ 
 					$keyphrases = $_POST['keyword'];
 				}else{
 					$keyphrases = array(0);
-                }
+				}
 
 				if(!is_array($keyphrases)){
 					$keyphrases = array($keyphrases);
@@ -358,11 +358,11 @@ 
 						//If we are searching for
 						if(false !== $post_status){
 
-                            $current_status = get_post_status($row->post_id);
-                            if($current_status !== $post_status){
-                                continue;
-                            }
-                            $searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
+							$current_status = get_post_status($row->post_id);
+							if($current_status !== $post_status){
+								continue;
+							}
+							$searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
 
 
 						}else{
@@ -444,7 +444,7 @@ 
 				$team_members = false;
 			}
 
-            $safari_brands = false;
+			$safari_brands = false;
 
 			if(isset($_POST['content']) && is_array($_POST['content']) && !empty($_POST['content'])){
 				$content = $_POST['content'];
@@ -455,16 +455,16 @@ 
 				$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);
-                }
-            }
+			$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);
+				}
+			}
 
 			die();
 		}
@@ -476,82 +476,82 @@ 
 	 */
 	public function import_row($data,$wetu_id,$id=0,$team_members=false,$importable_content=false,$safari_brands=false) {
 
-        if(trim($data[0]['type'])=='Destination')
-        {
-	        $post_name = $data_post_content = $data_post_excerpt = '';
-	        $post = array(
-	          'post_type'		=> 'destination',
-	        );
-
-	        $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']['extended_description'])){
+		if(trim($data[0]['type'])=='Destination')
+		{
+			$post_name = $data_post_content = $data_post_excerpt = '';
+			$post = array(
+			  'post_type'		=> 'destination',
+			);
+
+			$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']['extended_description'])){
 					$data_post_excerpt = $data[0]['content']['extended_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;     	
-	        }
+					$data_post_excerpt = $data[0]['content']['general_description'];
+				}	   
+				$post['post_excerpt'] = $data_post_excerpt;     	
+			}
 
-	        if(false !== $id && '0' !== $id){
-	        	$post['ID'] = $id;
+			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_name'] = wp_unique_post_slug(sanitize_title($data[0]['name']),$id, 'draft', 'destination', 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', 'destination', 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']));
-	        	}
-	        }
-
-	        //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(class_exists('LSX_TO_Maps')){
-	        	$this->set_map_data($data,$id);
-	        }
-
-	        //Set the Room Data
-	        if(false !== $importable_content && in_array('videos',$importable_content)){
-	        	$this->set_video_data($data,$id);
-	    	}
+				$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', 'destination', 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']));
+				}
+			}
+
+			//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(class_exists('LSX_TO_Maps')){
+				$this->set_map_data($data,$id);
+			}
+
+			//Set the Room Data
+			if(false !== $importable_content && in_array('videos',$importable_content)){
+				$this->set_video_data($data,$id);
+			}
 
 			//Set the Electricity
 			if(false !== $importable_content && in_array('electricity',$importable_content)){
@@ -596,7 +596,7 @@ 
 			}
 
 		}
-        return $id;
+		return $id;
 	}
 
 	/**
@@ -606,7 +606,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);			
 		}
 	}
 	
@@ -658,11 +658,11 @@ 
 				'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);
-	        }
+				$prev = get_post_meta($id,'location',true);
+				update_post_meta($id,'location',$location_data,$prev);
+			}else{
+				add_post_meta($id,'location',$location_data,true);
+			}
 		}
 	}
 

Spacing +153 added lines, -153 removed lines

@@ -64,21 +64,21 @@ 
 	public function __construct() {
 		$this->set_variables();
 
-		add_action( 'lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this,'display_page') );
+		add_action('lsx_tour_importer_admin_tab_'.$this->tab_slug, array($this, 'display_page'));
 
-		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_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'));
 
-		$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];
 		}
 
-		$destination_options = get_option('wetu_importer_destination_settings',false);
-		if(false !== $destination_options){
+		$destination_options = get_option('wetu_importer_destination_settings', false);
+		if (false !== $destination_options) {
 			$this->destination_options = $destination_options;
 		}
 	}
@@ -95,7 +95,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 = '';
 		//}
 	}
@@ -113,8 +113,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">
@@ -123,11 +123,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">							
@@ -141,8 +141,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> 
 
@@ -154,39 +154,39 @@ 
 						<div style="width:30%;display:block;float:left;">
 							<h3><?php _e('What content to Sync from WETU'); ?></h3>
 							<ul>
-								<li><input class="content" <?php $this->checked($this->destination_options,'description'); ?> type="checkbox" name="content[]" value="description" /> <?php _e('Description','wetu-importer'); ?></li>
-								<li><input class="content" <?php $this->checked($this->destination_options,'excerpt'); ?> type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'gallery'); ?> type="checkbox" name="content[]" value="gallery" /> <?php _e('Main Gallery','wetu-importer'); ?></li>
-		                        <?php if(class_exists('TO_Maps')){ ?>
-                                    <li><input class="content" <?php $this->checked($this->destination_options,'location'); ?> type="checkbox" name="content[]" value="location" /> <?php _e('Location','wetu-importer'); ?></li>
+								<li><input class="content" <?php $this->checked($this->destination_options, 'description'); ?> type="checkbox" name="content[]" value="description" /> <?php _e('Description', 'wetu-importer'); ?></li>
+								<li><input class="content" <?php $this->checked($this->destination_options, 'excerpt'); ?> type="checkbox" name="content[]" value="excerpt" /> <?php _e('Excerpt', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'gallery'); ?> type="checkbox" name="content[]" value="gallery" /> <?php _e('Main Gallery', 'wetu-importer'); ?></li>
+		                        <?php if (class_exists('TO_Maps')) { ?>
+                                    <li><input class="content" <?php $this->checked($this->destination_options, 'location'); ?> type="checkbox" name="content[]" value="location" /> <?php _e('Location', 'wetu-importer'); ?></li>
 		                        <?php } ?>
 
-		                        <?php if(class_exists('TO_Videos')){ ?>
-								    <li><input class="content" <?php $this->checked($this->destination_options,'videos'); ?> type="checkbox" name="content[]" value="videos" /> <?php _e('Videos','wetu-importer'); ?></li>
+		                        <?php if (class_exists('TO_Videos')) { ?>
+								    <li><input class="content" <?php $this->checked($this->destination_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" <?php $this->checked($this->destination_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" <?php $this->checked($this->destination_options,'banner_image'); ?> type="checkbox" name="content[]" value="banner_image" /> <?php _e('Set Banner Image','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_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" <?php $this->checked($this->destination_options, 'banner_image'); ?> type="checkbox" name="content[]" value="banner_image" /> <?php _e('Set Banner Image', 'wetu-importer'); ?></li>
 								<?php } ?>
                             </ul>
 						</div>
                         <div style="width:30%;display:block;float:left;">
                             <h3><?php _e('Travel Information'); ?></h3>
                             <ul>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'electricity'); ?> type="checkbox" name="content[]" value="electricity" /> <?php _e('Electricity','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'banking'); ?> type="checkbox" name="content[]" value="banking" /> <?php _e('Banking','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'cuisine'); ?> type="checkbox" name="content[]" value="cuisine" /> <?php _e('Cuisine','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'climate'); ?> type="checkbox" name="content[]" value="climate" /> <?php _e('Climate','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'transport'); ?> type="checkbox" name="content[]" value="transport" /> <?php _e('Transport','wetu-importer'); ?></li>
-                                <li><input class="content" <?php $this->checked($this->destination_options,'dress'); ?> type="checkbox" name="content[]" value="dress" /> <?php _e('Dress','wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'electricity'); ?> type="checkbox" name="content[]" value="electricity" /> <?php _e('Electricity', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'banking'); ?> type="checkbox" name="content[]" value="banking" /> <?php _e('Banking', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'cuisine'); ?> type="checkbox" name="content[]" value="cuisine" /> <?php _e('Cuisine', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'climate'); ?> type="checkbox" name="content[]" value="climate" /> <?php _e('Climate', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'transport'); ?> type="checkbox" name="content[]" value="transport" /> <?php _e('Transport', 'wetu-importer'); ?></li>
+                                <li><input class="content" <?php $this->checked($this->destination_options, 'dress'); ?> type="checkbox" name="content[]" value="dress" /> <?php _e('Dress', 'wetu-importer'); ?></li>
                             </ul>
                         </div>
 
-		                <?php if(class_exists('TO_Team')){ ?>
+		                <?php if (class_exists('TO_Team')) { ?>
                             <div style="width:30%;display:block;float:left;">
                                 <h3><?php _e('Assign a Team Member'); ?></h3>
                                 <?php $this->team_member_checkboxes($this->destination_options); ?>
@@ -198,7 +198,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(); ?>
 
@@ -210,7 +210,7 @@ 
 
 					</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>
 
@@ -231,31 +231,31 @@ 
         <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>
             <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>
+                <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>
             </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
@@ -291,7 +291,7 @@ 
 	/**
 	 * Grab all the current destination posts via the lsx_wetu_id field.
 	 */
-	public function find_current_destination($post_type='destination') {
+	public function find_current_destination($post_type = 'destination') {
 		global $wpdb;
 		$return = array();
 
@@ -307,8 +307,8 @@ 
 
 					LIMIT 0,500
 		");
-		if(null !== $current_destination && !empty($current_destination)){
-			foreach($current_destination as $accom){
+		if (null !== $current_destination && !empty($current_destination)) {
+			foreach ($current_destination as $accom) {
 				$return[$accom->meta_value] = $accom;
 			}
 		}
@@ -320,32 +320,32 @@ 
 	 */
 	public function process_ajax_search() {
 		$return = false;
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === 'destination'){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_tour_importer' && isset($_POST['type']) && $_POST['type'] === 'destination') {
 
-			if ( isset($_POST['keyword'] )) {
+			if (isset($_POST['keyword'])) {
 				$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';
 				}
 
@@ -353,29 +353,29 @@ 
 
 				if (!empty($destination)) {
 
-					foreach($destination as $row){
+					foreach ($destination as $row) {
 
 						//If we are searching for
-						if(false !== $post_status){
+						if (false !== $post_status) {
 
                             $current_status = get_post_status($row->post_id);
-                            if($current_status !== $post_status){
+                            if ($current_status !== $post_status) {
                                 continue;
                             }
                             $searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $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->meta_value] = $this->format_row($row);
 								}
 							}
@@ -383,7 +383,7 @@ 
 					}		
 				}
 
-				if(false !== $searched_items){
+				if (false !== $searched_items) {
 					ksort($searched_items);
 					$return = implode($searched_items);
 				}
@@ -396,11 +396,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>';
 			}
 
@@ -414,7 +414,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->meta_value.'
@@ -429,39 +429,39 @@ 
 	 */
 	public function process_ajax_import() {
 		$return = false;
-		if(isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === 'destination' && isset($_POST['wetu_id'])){
+		if (isset($_POST['action']) && $_POST['action'] === 'lsx_import_items' && isset($_POST['type']) && $_POST['type'] === 'destination' && 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;
 			}
 
             $safari_brands = false;
 
-			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'];
 				delete_option('wetu_importer_destination_settings');
-				add_option('wetu_importer_destination_settings',$content);
-			}else{
+				add_option('wetu_importer_destination_settings', $content);
+			}else {
 				delete_option('wetu_importer_destination_settings');
 				$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);
                 }
             }
@@ -474,9 +474,9 @@ 
 	/**
 	 * 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) {
 
-        if(trim($data[0]['type'])=='Destination')
+        if (trim($data[0]['type']) == 'Destination')
         {
 	        $post_name = $data_post_content = $data_post_excerpt = '';
 	        $post = array(
@@ -486,46 +486,46 @@ 
 	        $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']['extended_description'])){
+		        }elseif (isset($data[0]['content']['extended_description'])) {
 					$data_post_excerpt = $data[0]['content']['extended_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', 'destination', 0);
+					$post['post_name'] = wp_unique_post_slug(sanitize_title($data[0]['name']), $id, 'draft', 'destination', 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', 'destination', 0);
+		        if (isset($data[0]['name'])) {
+		            $post_name = wp_unique_post_slug(sanitize_title($data[0]['name']), $id, 'draft', 'destination', 0);
 		        }
 	        	$post['post_name'] = $post_name;
 	        	$post['post_title'] = $data[0]['name'];
@@ -533,65 +533,65 @@ 
 	        	$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']));
 	        	}
 	        }
 
 	        //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);
 	    	}
 
-	        if(class_exists('LSX_TO_Maps')){
-	        	$this->set_map_data($data,$id);
+	        if (class_exists('LSX_TO_Maps')) {
+	        	$this->set_map_data($data, $id);
 	        }
 
 	        //Set the Room Data
-	        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);
 	    	}
 
 			//Set the Electricity
-			if(false !== $importable_content && in_array('electricity',$importable_content)){
-				$this->set_travel_info($data,$id,'electricity');
+			if (false !== $importable_content && in_array('electricity', $importable_content)) {
+				$this->set_travel_info($data, $id, 'electricity');
 			}
 			//Set the cuisine
-			if(false !== $importable_content && in_array('cuisine',$importable_content)){
-				$this->set_travel_info($data,$id,'cuisine');
+			if (false !== $importable_content && in_array('cuisine', $importable_content)) {
+				$this->set_travel_info($data, $id, 'cuisine');
 			}
 			//Set the banking
-			if(false !== $importable_content && in_array('banking',$importable_content)){
-				$this->set_travel_info($data,$id,'banking');
+			if (false !== $importable_content && in_array('banking', $importable_content)) {
+				$this->set_travel_info($data, $id, 'banking');
 			}
 			//Set the transport
-			if(false !== $importable_content && in_array('transport',$importable_content)){
-				$this->set_travel_info($data,$id,'transport');
+			if (false !== $importable_content && in_array('transport', $importable_content)) {
+				$this->set_travel_info($data, $id, 'transport');
 			}
 			//Set the dress
-			if(false !== $importable_content && in_array('dress',$importable_content)){
-				$this->set_travel_info($data,$id,'dress');
+			if (false !== $importable_content && in_array('dress', $importable_content)) {
+				$this->set_travel_info($data, $id, 'dress');
 			}
 			//Set the climate
-			if(false !== $importable_content && in_array('climate',$importable_content)){
-				$this->set_travel_info($data,$id,'climate');
+			if (false !== $importable_content && in_array('climate', $importable_content)) {
+				$this->set_travel_info($data, $id, 'climate');
 			}
 
 			//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 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);
 				}
 			}
 
@@ -602,54 +602,54 @@ 
 	/**
 	 * 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);			
 		}
 	}
 	
 	/**
 	 * Saves the longitude and lattitude, as well as sets the map marker.
 	 */
-	public function set_map_data($data,$id) {
+	public function set_map_data($data, $id) {
 		$longitude = $latitude = $address = false;
 		$zoom = '15';	
 
-		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'	=>	$address,
 				'lat'		=>	$latitude,
@@ -657,11 +657,11 @@ 
 				'zoom'		=>	$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);
 	        }
 		}
 	}
@@ -669,11 +669,11 @@ 
 	/**
 	 * Saves the room data
 	 */
-	public function set_travel_info($data,$id,$meta_key) {
+	public function set_travel_info($data, $id, $meta_key) {
 
-		if(!empty($data[0]['travel_information']) && isset($data[0]['travel_information'][$meta_key])){
+		if (!empty($data[0]['travel_information']) && isset($data[0]['travel_information'][$meta_key])) {
 			$content = $data[0]['travel_information'][$meta_key];
-			$this->save_custom_field($content,$meta_key,$id);
+			$this->save_custom_field($content, $meta_key, $id);
 		}
 	}
 

Braces +13 added lines, -13 removed lines

@@ -327,7 +327,7 @@ 
 
 				if(isset($_POST['keyword'] )) {
 					$keyphrases = $_POST['keyword'];
-				}else{
+				} else{
 					$keyphrases = array(0);
                 }
 
@@ -365,7 +365,7 @@ 
                             $searched_items[sanitize_title($row->name).'-'.$row->meta_value] = $this->format_row($row);
 
 
-						}else{
+						} else{
 							//Search through each keyword.
 							foreach($keyphrases as $keyphrase){
 
@@ -434,13 +434,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;
 			}
 
@@ -450,7 +450,7 @@ 
 				$content = $_POST['content'];
 				delete_option('wetu_importer_destination_settings');
 				add_option('wetu_importer_destination_settings',$content);
-			}else{
+			} else{
 				delete_option('wetu_importer_destination_settings');
 				$content = false;
 			}
@@ -490,10 +490,10 @@ 
 		        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);
@@ -503,9 +503,9 @@ 
 	        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']['extended_description'])){
+		        } elseif(isset($data[0]['content']['extended_description'])){
 					$data_post_excerpt = $data[0]['content']['extended_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;     	
@@ -521,7 +521,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'])){
@@ -621,13 +621,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'];
 			}		
 
@@ -660,7 +660,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);
 	        }
 		}

classes/class-settings.php

Spacing +14 added lines, -14 removed lines

@@ -17,24 +17,24 @@ 
 	 * @access private
 	 */
 	public function __construct() {
-		$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];
 			$this->set_variables();
 		}
 
-		add_filter( 'lsx_to_framework_settings_tabs', array( $this, 'settings_page_array') );
-		add_action('lsx_to_framework_api_tab_content',array( $this, 'api_settings'),10,1);
+		add_filter('lsx_to_framework_settings_tabs', array($this, 'settings_page_array'));
+		add_action('lsx_to_framework_api_tab_content', array($this, 'api_settings'), 10, 1);
 	}
 
 	/**
 	 * Returns the array of settings to the UIX Class in the lsx framework
 	 */
-	public function settings_page_array($tabs){
+	public function settings_page_array($tabs) {
 		$tabs[$this->plugin_slug] = array(
-			'page_title'        => __('Image Scaling','wetu-importer'),
-			'page_description'  => __('','wetu-importer'),
-			'menu_title'        => __('Importer','wetu-importer'),
+			'page_title'        => __('Image Scaling', 'wetu-importer'),
+			'page_description'  => __('', 'wetu-importer'),
+			'menu_title'        => __('Importer', 'wetu-importer'),
 			'template'          => WETU_IMPORTER_PATH.'settings/wetu.php',
 			'default'	 		=> false
 		);
@@ -44,16 +44,16 @@ 
 	/**
 	 * Adds the API key to the API Tab
 	 */
-	public function api_settings($tab='general') {
-		if('settings' === $tab){ ?>
+	public function api_settings($tab = 'general') {
+		if ('settings' === $tab) { ?>
 			<tr class="form-field-wrap">
 				<th class="tour-operator_table_heading" style="padding-bottom:0px;" scope="row" colspan="2">
-					<h4 style="margin-bottom:0px;"><span><?php _e( 'WETU API', 'wetu-importer' ); ?></span></h4>
+					<h4 style="margin-bottom:0px;"><span><?php _e('WETU API', 'wetu-importer'); ?></span></h4>
 				</th>
 			</tr>
 			<tr class="form-field">
 				<th scope="row">
-                    <i class="dashicons-before dashicons-admin-network"></i> <label for="wetu_api_key"> <?php _e( 'Key', 'wetu-importer' ); ?></label>
+                    <i class="dashicons-before dashicons-admin-network"></i> <label for="wetu_api_key"> <?php _e('Key', 'wetu-importer'); ?></label>
 				</th>
 				<td>
                     <input type="text" {{#if wetu_api_key}} value="{{wetu_api_key}}" {{/if}} name="wetu_api_key" />
@@ -61,7 +61,7 @@ 
 			</tr>
 			<tr class="form-field">
 				<th scope="row">
-                    <i class="dashicons-before dashicons-admin-users"></i> <label for="wetu_api_username"> <?php _e( 'Username', 'wetu-importer' ); ?></label>
+                    <i class="dashicons-before dashicons-admin-users"></i> <label for="wetu_api_username"> <?php _e('Username', 'wetu-importer'); ?></label>
 				</th>
 				<td>
                     <input type="text" {{#if wetu_api_username}} value="{{wetu_api_username}}" {{/if}} name="wetu_api_username" />
@@ -69,7 +69,7 @@ 
 			</tr>
 			<tr class="form-field">
 				<th scope="row">
-                    <i class="dashicons-before dashicons-lock"></i> <label for="wetu_api_password"> <?php _e( 'Password', 'wetu-importer' ); ?></label>
+                    <i class="dashicons-before dashicons-lock"></i> <label for="wetu_api_password"> <?php _e('Password', 'wetu-importer'); ?></label>
 				</th>
 				<td>
                     <input type="text" {{#if wetu_api_password}} value="{{wetu_api_password}}" {{/if}} name="wetu_api_password" />

classes/class-admin.php

Braces +6 added lines, -9 removed lines

@@ -161,18 +161,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);
                 }
@@ -199,7 +196,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 }
     				?>
@@ -220,7 +217,7 @@ 
 				foreach($terms as $term){
 					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected,$term->term_id).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
 				}
-			}else{
+			} else{
 				$return .= '<li><input type="checkbox" value="" /> '.__('None','wetu-importer').'</li>';
 			}
 			$return .= '</ul>';
@@ -241,7 +238,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);
 			}
 		}

Indentation +70 added lines, -70 removed lines

@@ -78,7 +78,7 @@ 
 	 * Display the importer administration screen
 	 */
 	public function display_page() {
-        ?>
+		?>
         <div class="wrap">
             <?php screen_icon(); ?>
 
@@ -100,8 +100,8 @@ 
 		            </ul> 
 	             	            
             <?php } else {
-            	do_action('lsx_tour_importer_admin_tab_'.$_GET['tab']);
-            } ?>
+				do_action('lsx_tour_importer_admin_tab_'.$_GET['tab']);
+			} ?>
         </div>
         <?php
 	}
@@ -148,37 +148,37 @@ 
 	 * set_taxonomy with some terms
 	 */
 	public function set_taxonomy($taxonomy,$terms,$id) {
-        $result=array();
-        if(!empty($data))
-        {
-            foreach($data as $k)
-            {
-                if($id)
-                {
-                    if(!$term = term_exists(trim($k), $tax))
-                    {
-                        $term = wp_insert_term(trim($k), $tax);
-                        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);
-                    }
-                }
-                else
-                {
-                    $result[]=trim($k);
-                }
-            }
-        }
-        return $result;
+		$result=array();
+		if(!empty($data))
+		{
+			foreach($data as $k)
+			{
+				if($id)
+				{
+					if(!$term = term_exists(trim($k), $tax))
+					{
+						$term = wp_insert_term(trim($k), $tax);
+						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);
+					}
+				}
+				else
+				{
+					$result[]=trim($k);
+				}
+			}
+		}
+		return $result;
 	}
 
 	/**
@@ -188,21 +188,21 @@ 
 		if(post_type_exists('team')) { ?>
     		<ul>
     			<?php
-    				$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){ ?>
+					$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>
     						<?php }
-    					}else{ ?>
+						}else{ ?>
     							<li><input class="team" type="checkbox" value="0" /> <?php _e('None','wetu-importer'); ?></li>
     					<?php }
-    				?>
+					?>
     		</ul>
     	<?php }		
 	}
@@ -254,22 +254,22 @@ 
 		if(false !== $id){
 			if(empty($this->found_attachments)){
 
-		    	$attachments_args = array(
-		    			'post_parent' => $id,
-		    			'post_status' => 'inherit',
-		    			'post_type' => 'attachment',
-		    			'order' => 'ASC',
-                        'nopagin' => 'true',
-                        'posts_per_page' => '-1'
-		    	);   	
+				$attachments_args = array(
+						'post_parent' => $id,
+						'post_status' => 'inherit',
+						'post_type' => 'attachment',
+						'order' => 'ASC',
+						'nopagin' => 'true',
+						'posts_per_page' => '-1'
+				);   	
 		    	 
-		    	$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);
-		    			$this->gallery_meta[] = $attachment->ID;
-		    		}
-		    	}
+				$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);
+						$this->gallery_meta[] = $attachment->ID;
+					}
+				}
 			}
 
 			print_r($this->found_attachments);
@@ -278,20 +278,20 @@ 
 
 	/**
 	 * Checks to see if an item is selected.
-     *
-     * @param $haystack array|string
-     * @param $needle string
-     * @return string
+	 *
+	 * @param $haystack array|string
+	 * @param $needle string
+	 * @return string
 	 */
 	public function checked($haystack=false,$needle='') {
-	    $return = '';
-	    if(!is_array($haystack)){
+		$return = '';
+		if(!is_array($haystack)){
 			$haystack = array($haystack);
-        }
-        if(in_array($needle,$haystack)){
+		}
+		if(in_array($needle,$haystack)){
 			$return = 'checked="checked"';
-        }
-	    echo $return;
+		}
+		echo $return;
 	}
 }
 $wetu_importer_admin = new WETU_Importer_Admin();
\ No newline at end of file

Spacing +62 added lines, -62 removed lines

@@ -45,32 +45,32 @@ 
 	 * @access private
 	 */
 	public function __construct() {
-		add_action( 'admin_enqueue_scripts', array($this,'admin_scripts') ,11 );
-		add_action( 'admin_menu', array( $this, 'register_importer_page' ),20 );
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts'), 11);
+		add_action('admin_menu', array($this, 'register_importer_page'), 20);
 	}
 
 	/**
 	 * 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';
 		}
 
-		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'),
-			) );			
+			));			
 		}
 	}			
 
@@ -82,24 +82,24 @@ 
         <div class="wrap">
             <?php screen_icon(); ?>
 
-            <?php if(!isset($_GET['tab'])){ ?>
-	            <h2><?php _e('Welcome to the LSX Wetu Importer','wetu-importer'); ?></h2>
+            <?php if (!isset($_GET['tab'])) { ?>
+	            <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>
 
-		            <h3><?php _e('Additional Tools','wetu-importer'); ?></h3>
+		            <h3><?php _e('Additional Tools', 'wetu-importer'); ?></h3>
 		            <ul>
-		            	<li><a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=connect_accommodation"><?php _e('Connect Accommodation','wetu-importer'); ?></a> <small><?php _e('If you already have accommodation, you can "connect" it with its WETU counter part, so it works with the importer.','wetu-importer'); ?></small></li>
-		            	<?php if(class_exists('Lsx_Banners')){ ?>
-		            		<li><a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=banners"><?php _e('Sync High Res Banner Images','wetu-importer'); ?></a></li>
+		            	<li><a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=connect_accommodation"><?php _e('Connect Accommodation', 'wetu-importer'); ?></a> <small><?php _e('If you already have accommodation, you can "connect" it with its WETU counter part, so it works with the importer.', 'wetu-importer'); ?></small></li>
+		            	<?php if (class_exists('Lsx_Banners')) { ?>
+		            		<li><a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=banners"><?php _e('Sync High Res Banner Images', 'wetu-importer'); ?></a></li>
 		            	<?php } ?>
 		            </ul> 
 	             	            
-            <?php } else {
+            <?php }else {
             	do_action('lsx_tour_importer_admin_tab_'.$_GET['tab']);
             } ?>
         </div>
@@ -147,34 +147,34 @@ 
 	/**
 	 * 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);
                 }
             }
         }
@@ -184,23 +184,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>
@@ -210,18 +210,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).' 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).' 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>';
 		}
@@ -231,18 +231,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);
 			}
 		}
 	}
@@ -250,9 +250,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,
@@ -264,9 +264,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;
 		    		}
 		    	}
@@ -283,12 +283,12 @@ 
      * @param $needle string
      * @return string
 	 */
-	public function checked($haystack=false,$needle='') {
+	public function checked($haystack = false, $needle = '') {
 	    $return = '';
-	    if(!is_array($haystack)){
+	    if (!is_array($haystack)) {
 			$haystack = array($haystack);
         }
-        if(in_array($needle,$haystack)){
+        if (in_array($needle, $haystack)) {
 			$return = 'checked="checked"';
         }
 	    echo $return;