lightspeeddevelopment / wetu-importer

classes/class-importer.php

Indentation +30 added lines, -30 removed lines

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

Spacing +259 added lines, -259 removed lines

@@ -162,31 +162,31 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'admin_init', array( $this, 'compatible_version_check' ) );
+		add_action('admin_init', array($this, 'compatible_version_check'));
 
 		// Don't run anything else in the plugin, if we're on an incompatible PHP version
-		if ( ! self::compatible_version() ) {
+		if (!self::compatible_version()) {
 			return;
 		}
 
 		$this->set_variables();
 
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
-		add_action( 'admin_enqueue_scripts', array($this,'admin_scripts') ,11 );
-		add_action( 'admin_menu', array( $this, 'register_importer_page' ),20 );
+		add_action('init', array($this, 'load_plugin_textdomain'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts'), 11);
+		add_action('admin_menu', array($this, 'register_importer_page'), 20);
 
 		require_once(WETU_IMPORTER_PATH.'classes/class-accommodation.php');
 		require_once(WETU_IMPORTER_PATH.'classes/class-destination.php');
 		require_once(WETU_IMPORTER_PATH.'classes/class-tours.php');
 
-		add_action( 'init', array( $this, 'load_class' ) );
+		add_action('init', array($this, 'load_class'));
 
-		if('default' !== $this->tab_slug){
-			add_action('wp_ajax_lsx_tour_importer',array($this,'process_ajax_search'));
-			add_action('wp_ajax_nopriv_lsx_tour_importer',array($this,'process_ajax_search'));
+		if ('default' !== $this->tab_slug) {
+			add_action('wp_ajax_lsx_tour_importer', array($this, 'process_ajax_search'));
+			add_action('wp_ajax_nopriv_lsx_tour_importer', array($this, 'process_ajax_search'));
 
-			add_action('wp_ajax_lsx_import_items',array($this,'process_ajax_import'));
-			add_action('wp_ajax_nopriv_lsx_import_items',array($this,'process_ajax_import'));
+			add_action('wp_ajax_lsx_import_items', array($this, 'process_ajax_import'));
+			add_action('wp_ajax_nopriv_lsx_import_items', array($this, 'process_ajax_import'));
 		}
 	}
 
@@ -198,25 +198,25 @@ 
 	 * @since 1.0.0
 	 */
 	public function load_plugin_textdomain() {
-		load_plugin_textdomain( 'wetu-importer', FALSE, basename( WETU_IMPORTER_PATH ) . '/languages');
+		load_plugin_textdomain('wetu-importer', FALSE, basename(WETU_IMPORTER_PATH).'/languages');
 	}
 
 	/**
 	 * Sets the variables used throughout the plugin.
 	 */
 	public function set_variables() {
-		$this->post_types = array('accommodation','destination','tour');
-		$temp_options = get_option('_lsx-to_settings',false);
+		$this->post_types = array('accommodation', 'destination', 'tour');
+		$temp_options = get_option('_lsx-to_settings', false);
 
 		//Set the options.
-		if(false !== $temp_options && isset($temp_options[$this->plugin_slug])) {
+		if (false !== $temp_options && isset($temp_options[$this->plugin_slug])) {
 			$this->options = $temp_options[$this->plugin_slug];
 
 			$this->api_key = false;
 			$this->api_username = false;
 			$this->api_password = false;
 
-            if(!defined('WETU_API_KEY')) {
+            if (!defined('WETU_API_KEY')) {
 
 				if (isset($temp_options['api']['wetu_api_key']) && '' !== $temp_options['api']['wetu_api_key']) {
 					$this->api_key = $temp_options['api']['wetu_api_key'];
@@ -227,15 +227,15 @@ 
 				if (isset($temp_options['api']['wetu_api_password']) && '' !== $temp_options['api']['wetu_api_password']) {
 					$this->api_password = $temp_options['api']['wetu_api_password'];
 				}
-			}else{
+			}else {
 				$this->api_key = WETU_API_KEY;
             }
 
 			//Set the tab slug
-			if(isset($_GET['tab']) || isset($_POST['type'])) {
+			if (isset($_GET['tab']) || isset($_POST['type'])) {
 				if (isset($_GET['tab'])) {
 					$this->tab_slug = $_GET['tab'];
-				} else {
+				}else {
 					$this->tab_slug = $_POST['type'];
 				}
 
@@ -259,7 +259,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.'/';
             }
 
 		}
@@ -282,7 +282,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;
 		}
 
@@ -296,13 +296,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']);
 				}
 			}
 		}
@@ -315,8 +315,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));
 	}
 	
 	/**
@@ -326,9 +326,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'));
 		}
 	}
 
@@ -337,9 +337,9 @@ 
     /*
      * Load the importer class you want to use
      */
-    public function load_class(){
+    public function load_class() {
 
-		switch($this->tab_slug){
+		switch ($this->tab_slug) {
 			case 'accommodation':
 				$this->current_importer = new WETU_Importer_Accommodation();
 				break;
@@ -363,25 +363,25 @@ 
 	 * Registers the admin page which will house the importer form.
 	 */
 	public function register_importer_page() {
-		add_submenu_page( 'tour-operator',esc_html__( 'Importer', 'tour-operator' ), esc_html__( 'Importer', 'tour-operator' ), 'manage_options', 'wetu-importer', array( $this, 'display_page' ) );
+		add_submenu_page('tour-operator', esc_html__('Importer', 'tour-operator'), esc_html__('Importer', 'tour-operator'), 'manage_options', 'wetu-importer', array($this, 'display_page'));
 	}
 
 	/**
 	 * Enqueue the JS needed to contact wetu and return your result.
 	 */
 	public function admin_scripts() {
-		if ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) {
+		if (defined('WP_DEBUG') && true === WP_DEBUG) {
 			$min = '';
-		} else {
+		}else {
 			$min = '.min';
 		}
 		$min = '';
 
-		if(is_admin() && isset($_GET['page']) && $this->plugin_slug === $_GET['page']){
-			wp_enqueue_script( 'wetu-importers-script', WETU_IMPORTER_URL . 'assets/js/wetu-importer' . $min . '.js', array( 'jquery' ), WETU_IMPORTER_VER, true );
-			wp_localize_script( 'wetu-importers-script', 'lsx_tour_importer_params', array(
+		if (is_admin() && isset($_GET['page']) && $this->plugin_slug === $_GET['page']) {
+			wp_enqueue_script('wetu-importers-script', WETU_IMPORTER_URL.'assets/js/wetu-importer'.$min.'.js', array('jquery'), WETU_IMPORTER_VER, true);
+			wp_localize_script('wetu-importers-script', 'lsx_tour_importer_params', array(
 				'ajax_url' => admin_url('admin-ajax.php'),
-			) );
+			));
 		}
 	}
 
@@ -393,14 +393,14 @@ 
         <div class="wrap">
 			<?php screen_icon(); ?>
 
-			<?php if(!is_object($this->current_importer)){
+			<?php if (!is_object($this->current_importer)) {
 				?>
-                <h2><?php _e('Welcome to the LSX Wetu Importer','wetu-importer'); ?></h2>
+                <h2><?php _e('Welcome to the LSX Wetu Importer', 'wetu-importer'); ?></h2>
                 <p>If this is the first time you are running the import, then follow the steps below.</p>
                 <ul>
-                    <li>Step 1 - Import your <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=tour"><?php _e('Tours','wetu-importer'); ?></a></li>
-                    <li>Step 2 - The tour import will have created draft <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation','wetu-importer'); ?></a> that will need to be imported.</li>
-                    <li>Step 3 - Lastly import the <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations','wetu-importer'); ?></a> draft posts created during the previous two steps.</li>
+                    <li>Step 1 - Import your <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=tour"><?php _e('Tours', 'wetu-importer'); ?></a></li>
+                    <li>Step 2 - The tour import will have created draft <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=accommodation"><?php _e('accommodation', 'wetu-importer'); ?></a> that will need to be imported.</li>
+                    <li>Step 3 - Lastly import the <a href="<?php echo admin_url('admin.php'); ?>?page=<?php echo $this->plugin_slug; ?>&tab=destination"><?php _e('destinations', 'wetu-importer'); ?></a> draft posts created during the previous two steps.</li>
                 </ul>
 
                 <?php /*<h3><?php _e('Additional Tools','wetu-importer'); ?></h3>
@@ -411,7 +411,7 @@ 
 					<?php } ?>
                 </ul>
 				<?php*/
-			}else{
+			}else {
 			   $this->current_importer->display_page();
             }; ?>
         </div>
@@ -426,38 +426,38 @@ 
         <form class="ajax-form" id="<?php echo $this->plugin_slug; ?>-search-form" method="get" action="tools.php" data-type="<?php echo $this->tab_slug; ?>">
             <input type="hidden" name="page" value="<?php echo $this->tab_slug; ?>" />
 
-            <h3><span class="dashicons dashicons-search"></span> <?php _e('Search','wetu-importer'); ?></h3>
+            <h3><span class="dashicons dashicons-search"></span> <?php _e('Search', 'wetu-importer'); ?></h3>
 
-			<?php do_action('wetu_importer_search_form',$this); ?>
+			<?php do_action('wetu_importer_search_form', $this); ?>
 
             <div class="normal-search">
-                <input pattern=".{3,}" placeholder="3 characters minimum" class="keyword" name="keyword" value=""> <input class="button button-primary submit" type="submit" value="<?php _e('Search','wetu-importer'); ?>" />
+                <input pattern=".{3,}" placeholder="3 characters minimum" class="keyword" name="keyword" value=""> <input class="button button-primary submit" type="submit" value="<?php _e('Search', 'wetu-importer'); ?>" />
             </div>
             <div class="advanced-search hidden" style="display:none;">
-                <p><?php _e('Enter several keywords, each on a new line.','wetu-importer'); ?></p>
+                <p><?php _e('Enter several keywords, each on a new line.', 'wetu-importer'); ?></p>
                 <textarea rows="10" cols="40" name="bulk-keywords"></textarea>
-                <input class="button button-primary submit" type="submit" value="<?php _e('Search','wetu-importer'); ?>" />
+                <input class="button button-primary submit" type="submit" value="<?php _e('Search', 'wetu-importer'); ?>" />
             </div>
 
             <p>
-                <a class="advanced-search-toggle" href="#"><?php _e('Bulk Search','wetu-importer'); ?></a> |
-                <a class="published search-toggle" href="#publish"><?php esc_attr_e('Published','wetu-importer'); ?></a> |
-                <a class="pending search-toggle"  href="#pending"><?php esc_attr_e('Pending','wetu-importer'); ?></a> |
-                <a class="draft search-toggle"  href="#draft"><?php esc_attr_e('Draft','wetu-importer'); ?></a>
-
-                <?php if('tour'===$this->tab_slug){ ?>
-                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU','wetu-importer'); ?></a>
-                <?php }else if(!empty($this->queued_imports)) { ?>
-                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue','wetu-importer'); ?></a>
+                <a class="advanced-search-toggle" href="#"><?php _e('Bulk Search', 'wetu-importer'); ?></a> |
+                <a class="published search-toggle" href="#publish"><?php esc_attr_e('Published', 'wetu-importer'); ?></a> |
+                <a class="pending search-toggle"  href="#pending"><?php esc_attr_e('Pending', 'wetu-importer'); ?></a> |
+                <a class="draft search-toggle"  href="#draft"><?php esc_attr_e('Draft', 'wetu-importer'); ?></a>
+
+                <?php if ('tour' === $this->tab_slug) { ?>
+                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU', 'wetu-importer'); ?></a>
+                <?php }else if (!empty($this->queued_imports)) { ?>
+                    | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue', 'wetu-importer'); ?></a>
                 <?php } ?>
             </p>
 
             <div class="ajax-loader" style="display:none;width:100%;text-align:center;">
-                <img style="width:64px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif';?>" />
+                <img style="width:64px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif'; ?>" />
             </div>
 
             <div class="ajax-loader-small" style="display:none;width:100%;text-align:center;">
-                <img style="width:32px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif';?>" />
+                <img style="width:32px;" src="<?php echo WETU_IMPORTER_URL.'assets/images/ajaxloader.gif'; ?>" />
             </div>
         </form> 
 		<?php
@@ -506,15 +506,15 @@ 
 	 *
 	 * @param $tab string
 	 */
-	public function navigation($tab='') {
+	public function navigation($tab = '') {
 		$post_types = array(
-			'tour'              => esc_attr('Tours','wetu-importer'),
-			'accommodation'     => esc_attr('Accommodation','wetu-importer'),
-			'destination'       => esc_attr('Destinations','wetu-importer'),
+			'tour'              => esc_attr('Tours', 'wetu-importer'),
+			'accommodation'     => esc_attr('Accommodation', 'wetu-importer'),
+			'destination'       => esc_attr('Destinations', 'wetu-importer'),
 		);
-		echo '<div class="wet-navigation"><div class="subsubsub"><a class="'.$this->itemd($tab,'','current',false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'">'.esc_attr('Home','wetu-importer').'</a>';
-		foreach($post_types as $post_type => $label){
-			echo ' | <a class="'.$this->itemd($tab,$post_type,'current',false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'&tab='.$post_type.'">'.$label.'</a>';
+		echo '<div class="wet-navigation"><div class="subsubsub"><a class="'.$this->itemd($tab, '', 'current', false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'">'.esc_attr('Home', 'wetu-importer').'</a>';
+		foreach ($post_types as $post_type => $label) {
+			echo ' | <a class="'.$this->itemd($tab, $post_type, 'current', false).'" href="'.admin_url('admin.php').'?page='.$this->plugin_slug.'&tab='.$post_type.'">'.$label.'</a>';
 		}
 		echo '</div><br clear="both"/></div>';
 	}
@@ -522,23 +522,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>
@@ -555,12 +555,12 @@ 
 	 * @param $needle string
 	 * @param $echo bool
 	 */
-	public function checked($haystack=false,$needle='',$echo=true) {
-		$return = $this->itemd($haystack,$needle,'checked');
-		if('' !== $return) {
+	public function checked($haystack = false, $needle = '', $echo = true) {
+		$return = $this->itemd($haystack, $needle, 'checked');
+		if ('' !== $return) {
 			if (true === $echo) {
 				echo $return;
-			} else {
+			}else {
 				return $return;
 			}
 		}
@@ -573,12 +573,12 @@ 
 	 * @param $needle string
 	 * @param $echo bool
 	 */
-	public function selected($haystack=false,$needle='',$echo=true) {
-		$return = $this->itemd($haystack,$needle,'selected');
-		if('' !== $return) {
+	public function selected($haystack = false, $needle = '', $echo = true) {
+		$return = $this->itemd($haystack, $needle, 'selected');
+		if ('' !== $return) {
 			if (true === $echo) {
 				echo $return;
-			} else {
+			}else {
 				return $return;
 			}
 		}
@@ -593,16 +593,16 @@ 
 	 * @param $wrap bool
 	 * @return $html string
 	 */
-	public function itemd($haystack=false,$needle='',$type='',$wrap=true) {
+	public function itemd($haystack = false, $needle = '', $type = '', $wrap = true) {
 		$html = '';
-		if('' !== $type) {
+		if ('' !== $type) {
 			if (!is_array($haystack)) {
 				$haystack = array($haystack);
 			}
 			if (in_array($needle, $haystack)) {
-				if(true === $wrap || 'true' === $wrap) {
-					$html = $type . '="' . $type . '"';
-				}else{
+				if (true === $wrap || 'true' === $wrap) {
+					$html = $type.'="'.$type.'"';
+				}else {
 					$html = $type;
 				}
 			}
@@ -614,9 +614,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,
@@ -628,9 +628,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;
 					}
 				}
@@ -644,18 +644,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);
 			}
 		}
 	}
@@ -664,12 +664,12 @@ 
 	 * Grabs the custom fields,  and resaves an array of unique items.
 	 */
 	public function cleanup_posts() {
-		if(!empty($this->cleanup_posts)){
-			foreach($this->cleanup_posts as $id => $key) {
+		if (!empty($this->cleanup_posts)) {
+			foreach ($this->cleanup_posts as $id => $key) {
 				$prev_items = get_post_meta($id, $key, false);
 				$new_items = array_unique($prev_items);
 				delete_post_meta($id, $key);
-				foreach($new_items as $new_item) {
+				foreach ($new_items as $new_item) {
 					add_post_meta($id, $key, $new_item, false);
 				}
 			}
@@ -681,51 +681,51 @@ 
 	/**
 	 * set_taxonomy with some terms
 	 */
-	public function set_taxonomy($taxonomy,$terms,$id) {
-		$result=array();
-		if(!empty($data))
+	public function set_taxonomy($taxonomy, $terms, $id) {
+		$result = array();
+		if (!empty($data))
 		{
-			foreach($data as $k)
+			foreach ($data as $k)
 			{
-				if($id)
+				if ($id)
 				{
-					if(!$term = term_exists(trim($k), $tax))
+					if (!$term = term_exists(trim($k), $tax))
 					{
 						$term = wp_insert_term(trim($k), $tax);
-						if ( is_wp_error($term) )
+						if (is_wp_error($term))
 						{
 							echo $term->get_error_message();
 						}
 						else
 						{
-							wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+							wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 						}
 					}
 					else
 					{
-						wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+						wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 					}
 				}
 				else
 				{
-					$result[]=trim($k);
+					$result[] = trim($k);
 				}
 			}
 		}
 		return $result;
 	}
 
-	public function set_term($id=false,$name=false,$taxonomy=false,$parent=false){
-		if(!$term = term_exists($name, $taxonomy))
+	public function set_term($id = false, $name = false, $taxonomy = false, $parent = false) {
+		if (!$term = term_exists($name, $taxonomy))
 		{
-			if(false !== $parent){ $parent = array('parent'=>$parent); }
-			$term = wp_insert_term(trim($name), $taxonomy,$parent);
-			if ( is_wp_error($term) ){echo $term->get_error_message();}
-			else { wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true); }
+			if (false !== $parent) { $parent = array('parent'=>$parent); }
+			$term = wp_insert_term(trim($name), $taxonomy, $parent);
+			if (is_wp_error($term)) {echo $term->get_error_message(); }
+			else { wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true); }
 		}
 		else
 		{
-			wp_set_object_terms( $id, intval($term['term_id']), $taxonomy,true);
+			wp_set_object_terms($id, intval($term['term_id']), $taxonomy, true);
 		}
 		return $term['term_id'];
 	}
@@ -733,18 +733,18 @@ 
 	/**
 	 * set_taxonomy with some terms
 	 */
-	public function taxonomy_checkboxes($taxonomy=false,$selected=array()) {
+	public function taxonomy_checkboxes($taxonomy = false, $selected = array()) {
 		$return = '';
-		if(false !== $taxonomy){
+		if (false !== $taxonomy) {
 			$return .= '<ul>';
-			$terms = get_terms(array('taxonomy'=>$taxonomy,'hide_empty'=>false));
+			$terms = get_terms(array('taxonomy'=>$taxonomy, 'hide_empty'=>false));
 
-			if(!is_wp_error($terms)){
-				foreach($terms as $term){
-					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected,$term->term_id,false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
+			if (!is_wp_error($terms)) {
+				foreach ($terms as $term) {
+					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected, $term->term_id, false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
 				}
-			}else{
-				$return .= '<li><input type="checkbox" value="" /> '.__('None','wetu-importer').'</li>';
+			}else {
+				$return .= '<li><input type="checkbox" value="" /> '.__('None', 'wetu-importer').'</li>';
 			}
 			$return .= '</ul>';
 		}
@@ -755,53 +755,53 @@ 
 	/**
 	 * Saves the longitude and lattitude, as well as sets the map marker.
 	 */
-	public function set_map_data($data,$id,$zoom = '10') {
+	public function set_map_data($data, $id, $zoom = '10') {
 		$longitude = $latitude = $address = false;
 
-		if(isset($data[0]['position'])){
+		if (isset($data[0]['position'])) {
 
-			if(isset($data[0]['position']['driving_latitude'])){
+			if (isset($data[0]['position']['driving_latitude'])) {
 				$latitude = $data[0]['position']['driving_latitude'];
-			}elseif(isset($data[0]['position']['latitude'])){
+			}elseif (isset($data[0]['position']['latitude'])) {
 				$latitude = $data[0]['position']['latitude'];
 			}
 
-			if(isset($data[0]['position']['driving_longitude'])){
+			if (isset($data[0]['position']['driving_longitude'])) {
 				$longitude = $data[0]['position']['driving_longitude'];
-			}elseif(isset($data[0]['position']['longitude'])){
+			}elseif (isset($data[0]['position']['longitude'])) {
 				$longitude = $data[0]['position']['longitude'];
 			}
 
 		}
-		if(isset($data[0]['content']) && isset($data[0]['content']['contact_information'])){
-			if(isset($data[0]['content']['contact_information']['address'])){
+		if (isset($data[0]['content']) && isset($data[0]['content']['contact_information'])) {
+			if (isset($data[0]['content']['contact_information']['address'])) {
 				$address = strip_tags($data[0]['content']['contact_information']['address']);
 
-				$address = explode("\n",$address);
-				foreach($address as $bitkey => $bit){
+				$address = explode("\n", $address);
+				foreach ($address as $bitkey => $bit) {
 					$bit = ltrim(rtrim($bit));
-					if(false === $bit || '' === $bit || null === $bit or empty($bit)){
+					if (false === $bit || '' === $bit || null === $bit or empty($bit)) {
 						unset($address[$bitkey]);
 					}
 				}
-				$address = implode(', ',$address);
+				$address = implode(', ', $address);
 				$address = str_replace(', , ', ', ', $address);
 			}
 		}
 
-		if(false !== $longitude){
+		if (false !== $longitude) {
 			$location_data = array(
-				'address'	=>	(string)$address,
-				'lat'		=>	(string)$latitude,
-				'long'		=>	(string)$longitude,
-				'zoom'		=>	(string)$zoom,
+				'address'	=>	(string) $address,
+				'lat'		=>	(string) $latitude,
+				'long'		=>	(string) $longitude,
+				'zoom'		=>	(string) $zoom,
 				'elevation'	=>	'',
 			);
-			if(false !== $id && '0' !== $id){
-				$prev = get_post_meta($id,'location',true);
-				update_post_meta($id,'location',$location_data,$prev);
-			}else{
-				add_post_meta($id,'location',$location_data,true);
+			if (false !== $id && '0' !== $id) {
+				$prev = get_post_meta($id, 'location', true);
+				update_post_meta($id, 'location', $location_data, $prev);
+			}else {
+				add_post_meta($id, 'location', $location_data, true);
 			}
 		}
 	}
@@ -811,22 +811,22 @@ 
 	/**
 	 * Creates the main gallery data
 	 */
-	public function set_featured_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if('tour' === $this->tab_slug){
+	public function set_featured_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+		    if ('tour' === $this->tab_slug) {
 		        $key = array_rand($data[0]['content']['images']);
-                $this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
-            }else{
-				$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
+                $this->featured_image = $this->attach_image($data[0]['content']['images'][$key], $id);
+            }else {
+				$this->featured_image = $this->attach_image($data[0]['content']['images'][0], $id);
             }
 
 
-			if(false !== $this->featured_image){
-				delete_post_meta($id,'_thumbnail_id');
-				add_post_meta($id,'_thumbnail_id',$this->featured_image,true);
+			if (false !== $this->featured_image) {
+				delete_post_meta($id, '_thumbnail_id');
+				add_post_meta($id, '_thumbnail_id', $this->featured_image, true);
 
-				if(!empty($this->gallery_meta) && !in_array($this->featured_image,$this->gallery_meta)){
-					add_post_meta($id,'gallery',$this->featured_image,false);
+				if (!empty($this->gallery_meta) && !in_array($this->featured_image, $this->gallery_meta)) {
+					add_post_meta($id, 'gallery', $this->featured_image, false);
 					$this->gallery_meta[] = $this->featured_image;
 				}
 			}
@@ -836,29 +836,29 @@ 
 	/**
 	 * Sets a banner image
 	 */
-	public function set_banner_image($data,$id) {
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
-		    if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
+	public function set_banner_image($data, $id) {
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
+		    if (isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
 				$temp_banner = $this->attach_image($data[0]['destination_image'], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-			}else{
+			}else {
 				if ('tour' === $this->tab_slug) {
 					$key = array_rand($data[0]['content']['images']);
 					$temp_banner = $this->attach_image($data[0]['content']['images'][$key], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-				} else {
+				}else {
 					$temp_banner = $this->attach_image($data[0]['content']['images'][1], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
 				}
             }
 
 
-			if(false !== $temp_banner){
+			if (false !== $temp_banner) {
 				$this->banner_image = $temp_banner;
 
-				delete_post_meta($id,'image_group');
+				delete_post_meta($id, 'image_group');
 				$new_banner = array('banner_image'=>array('cmb-field-0'=>$this->banner_image));
-				add_post_meta($id,'image_group',$new_banner,true);
+				add_post_meta($id, 'image_group', $new_banner, true);
 
-				if(!empty($this->gallery_meta) && !in_array($this->banner_image,$this->gallery_meta)){
-					add_post_meta($id,'gallery',$this->banner_image,false);
+				if (!empty($this->gallery_meta) && !in_array($this->banner_image, $this->gallery_meta)) {
+					add_post_meta($id, 'gallery', $this->banner_image, false);
 					$this->gallery_meta[] = $this->banner_image;
 				}
 			}
@@ -868,24 +868,24 @@ 
 	/**
 	 * Creates the main gallery data
 	 */
-	public function create_main_gallery($data,$id) {
+	public function create_main_gallery($data, $id) {
 
-		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
+		if (is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])) {
 			$counter = 0;
-			foreach($data[0]['content']['images'] as $image_data){
-				if($counter === 0 && false !== $this->featured_image){$counter++;continue;}
-				if($counter === 1 && false !== $this->banner_image){$counter++;continue;}
+			foreach ($data[0]['content']['images'] as $image_data) {
+				if ($counter === 0 && false !== $this->featured_image) {$counter++; continue; }
+				if ($counter === 1 && false !== $this->banner_image) {$counter++; continue; }
 
-				$this->gallery_meta[] = $this->attach_image($image_data,$id);
+				$this->gallery_meta[] = $this->attach_image($image_data, $id);
 				$counter++;
 			}
 
-			if(!empty($this->gallery_meta)){
-				delete_post_meta($id,'gallery');
+			if (!empty($this->gallery_meta)) {
+				delete_post_meta($id, 'gallery');
 				$this->gallery_meta = array_unique($this->gallery_meta);
-				foreach($this->gallery_meta as $gallery_id){
-					if(false !== $gallery_id && '' !== $gallery_id && !is_array($gallery_id)){
-						add_post_meta($id,'gallery',$gallery_id,false);
+				foreach ($this->gallery_meta as $gallery_id) {
+					if (false !== $gallery_id && '' !== $gallery_id && !is_array($gallery_id)) {
+						add_post_meta($id, 'gallery', $gallery_id, false);
 					}
 				}
 			}
@@ -895,27 +895,27 @@ 
 	/**
 	 * search_form
 	 */
-	public function get_scaling_url($args=array()) {
+	public function get_scaling_url($args = array()) {
 
 		$defaults = array(
 			'width' => '1024',
 			'height' => '768',
 			'cropping' => 'w'
 		);
-		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'];
@@ -927,43 +927,43 @@ 
 	/**
 	 * Attaches 1 image
 	 */
-	public function attach_image($v=false,$parent_id,$image_sizes=false){
-		if(false !== $v){
-			$temp_fragment = explode('/',$v['url_fragment']);
-			$url_filename = $temp_fragment[count($temp_fragment)-1];
-			$url_filename = str_replace(array('.jpg','.png','.jpeg'),'',$url_filename);
+	public function attach_image($v = false, $parent_id, $image_sizes = false) {
+		if (false !== $v) {
+			$temp_fragment = explode('/', $v['url_fragment']);
+			$url_filename = $temp_fragment[count($temp_fragment) - 1];
+			$url_filename = str_replace(array('.jpg', '.png', '.jpeg'), '', $url_filename);
 			$url_filename = trim($url_filename);
-			$url_filename = str_replace(" ",'_',$url_filename);
+			$url_filename = str_replace(" ", '_', $url_filename);
 
-			if(in_array($url_filename,$this->found_attachments)){
-				return array_search($url_filename,$this->found_attachments);
+			if (in_array($url_filename, $this->found_attachments)) {
+				return array_search($url_filename, $this->found_attachments);
 			}
 
-			$postdata=array();
-			if(empty($v['label']))
+			$postdata = array();
+			if (empty($v['label']))
 			{
-				$v['label']='';
+				$v['label'] = '';
 			}
-			if(!empty($v['description']))
+			if (!empty($v['description']))
 			{
-				$desc=wp_strip_all_tags($v['description']);
-				$posdata=array('post_excerpt'=>$desc);
+				$desc = wp_strip_all_tags($v['description']);
+				$posdata = array('post_excerpt'=>$desc);
 			}
-			if(!empty($v['section']))
+			if (!empty($v['section']))
 			{
-				$desc=wp_strip_all_tags($v['section']);
-				$posdata=array('post_excerpt'=>$desc);
+				$desc = wp_strip_all_tags($v['section']);
+				$posdata = array('post_excerpt'=>$desc);
 			}
 
-			$attachID=NULL;
+			$attachID = NULL;
 			//Resizor - add option to setting if required
-			$fragment = str_replace(' ','%20',$v['url_fragment']);
+			$fragment = str_replace(' ', '%20', $v['url_fragment']);
 			$url = $this->get_scaling_url($image_sizes).$fragment;
 
-			$attachID = $this->attach_external_image2($url,$parent_id,'',$v['label'],$postdata);
+			$attachID = $this->attach_external_image2($url, $parent_id, '', $v['label'], $postdata);
 
 			//echo($attachID.' add image');
-			if($attachID!=NULL)
+			if ($attachID != NULL)
 			{
 				return $attachID;
 			}
@@ -971,13 +971,13 @@ 
 		return 	false;
 	}
 
-	public function attach_external_image2( $url = null, $post_id = null, $thumb = null, $filename = null, $post_data = array() ) {
+	public function attach_external_image2($url = null, $post_id = null, $thumb = null, $filename = null, $post_data = array()) {
 
-		if ( !$url || !$post_id ) { return new WP_Error('missing', "Need a valid URL and post ID..."); }
+		if (!$url || !$post_id) { return new WP_Error('missing', "Need a valid URL and post ID..."); }
 
-		require_once(ABSPATH . 'wp-admin/includes/file.php');
-		require_once(ABSPATH . 'wp-admin/includes/media.php');
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/file.php');
+		require_once(ABSPATH.'wp-admin/includes/media.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 		// Download file to temp location, returns full server path to temp file
 		//$tmp = download_url( $url );
 
@@ -986,53 +986,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;
 		}
@@ -1040,12 +1040,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
 		}
@@ -1074,31 +1074,31 @@ 
 	/**
 	 * Formats the row for the completed list.
 	 */
-	public function format_completed_row($response){
+	public function format_completed_row($response) {
 		echo '<li class="post-'.$response.'"><span class="dashicons dashicons-yes"></span> <a target="_blank" href="'.get_permalink($response).'">'.get_the_title($response).'</a></li>';
 	}
 
 	/**
 	 * Formats the error.
 	 */
-	public function format_error($response){
+	public function format_error($response) {
 		echo '<li class="post-error"><span class="dashicons dashicons-no"></span>'.$response.'</li>';
 	}
 
 	/**
 	 * Does a multine search
 	 */
-	public function multineedle_stripos($haystack, $needles, $offset=0) {
+	public function multineedle_stripos($haystack, $needles, $offset = 0) {
 		$found = false;
 		$needle_count = count($needles);
-		foreach($needles as $needle) {
-			if(false !== stripos($haystack, $needle, $offset)){
+		foreach ($needles as $needle) {
+			if (false !== stripos($haystack, $needle, $offset)) {
 				$found[] = true;
 			}
 		}
-		if(false !== $found && $needle_count === count($found)){
+		if (false !== $found && $needle_count === count($found)) {
 			return true;
-		}else{
+		}else {
 			return false;
 		}
 	}
@@ -1106,7 +1106,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();
 
@@ -1122,8 +1122,8 @@ 
 
 					LIMIT 0,5000
 		");
-		if(null !== $current_accommodation && !empty($current_accommodation)){
-			foreach($current_accommodation as $accom){
+		if (null !== $current_accommodation && !empty($current_accommodation)) {
+			foreach ($current_accommodation as $accom) {
 				$return[$accom->meta_value] = $accom;
 			}
 		}
@@ -1133,31 +1133,31 @@ 
 	/**
 	 * Set the Video date
 	 */
-	public function set_video_data($data,$id) {
-		if(!empty($data[0]['content']['youtube_videos']) && is_array($data[0]['content']['youtube_videos'])){
+	public function set_video_data($data, $id) {
+		if (!empty($data[0]['content']['youtube_videos']) && is_array($data[0]['content']['youtube_videos'])) {
 			$videos = false;
 
-			foreach($data[0]['content']['youtube_videos'] as $video){
+			foreach ($data[0]['content']['youtube_videos'] as $video) {
 				$temp_video = array();
 
-				if(isset($video['label'])){
+				if (isset($video['label'])) {
 					$temp_video['title'] = $video['label'];
 				}
-				if(isset($video['description'])){
+				if (isset($video['description'])) {
 					$temp_video['description'] = strip_tags($video['description']);
 				}
-				if(isset($video['url'])){
+				if (isset($video['url'])) {
 					$temp_video['url'] = $video['url'];
 				}
 				$temp_video['thumbnail'] = '';
 				$videos[] = $temp_video;
 			}
 
-			if(false !== $id && '0' !== $id){
+			if (false !== $id && '0' !== $id) {
 				delete_post_meta($id, 'videos');
 			}
-			foreach($videos as $video){
-				add_post_meta($id,'videos',$video,false);
+			foreach ($videos as $video) {
+				add_post_meta($id, 'videos', $video, false);
 			}
 		}
 	}

Braces +19 added lines, -25 removed lines

@@ -227,7 +227,7 @@ 
 				if (isset($temp_options['api']['wetu_api_password']) && '' !== $temp_options['api']['wetu_api_password']) {
 					$this->api_password = $temp_options['api']['wetu_api_password'];
 				}
-			}else{
+			} else{
 				$this->api_key = WETU_API_KEY;
             }
 
@@ -411,7 +411,7 @@ 
 					<?php } ?>
                 </ul>
 				<?php*/
-			}else{
+			} else{
 			   $this->current_importer->display_page();
             }; ?>
         </div>
@@ -447,7 +447,7 @@ 
 
                 <?php if('tour'===$this->tab_slug){ ?>
                     | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU','wetu-importer'); ?></a>
-                <?php }else if(!empty($this->queued_imports)) { ?>
+                <?php } else if(!empty($this->queued_imports)) { ?>
                     | <a class="import search-toggle"  href="#import"><?php esc_attr_e('WETU Queue','wetu-importer'); ?></a>
                 <?php } ?>
             </p>
@@ -537,7 +537,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 }
 				?>
@@ -602,7 +602,7 @@ 
 			if (in_array($needle, $haystack)) {
 				if(true === $wrap || 'true' === $wrap) {
 					$html = $type . '="' . $type . '"';
-				}else{
+				} else{
 					$html = $type;
 				}
 			}
@@ -654,7 +654,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);
 			}
 		}
@@ -695,18 +695,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);
 				}
@@ -720,10 +717,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);
 		}
@@ -743,7 +738,7 @@ 
 				foreach($terms as $term){
 					$return .= '<li><input class="'.$taxonomy.'" '.$this->checked($selected,$term->term_id,false).' type="checkbox" value="'.$term->term_id.'" /> '.$term->name.'</li>';
 				}
-			}else{
+			} else{
 				$return .= '<li><input type="checkbox" value="" /> '.__('None','wetu-importer').'</li>';
 			}
 			$return .= '</ul>';
@@ -762,13 +757,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'];
 			}
 
@@ -800,7 +795,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);
 			}
 		}
@@ -816,7 +811,7 @@ 
 		    if('tour' === $this->tab_slug){
 		        $key = array_rand($data[0]['content']['images']);
                 $this->featured_image = $this->attach_image($data[0]['content']['images'][$key],$id);
-            }else{
+            } else{
 				$this->featured_image = $this->attach_image($data[0]['content']['images'][0],$id);
             }
 
@@ -840,7 +835,7 @@ 
 		if(is_array($data[0]['content']['images']) && !empty($data[0]['content']['images'])){
 		    if(isset($data[0]['destination_image']) && is_array($data[0]['destination_image'])) {
 				$temp_banner = $this->attach_image($data[0]['destination_image'], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
-			}else{
+			} else{
 				if ('tour' === $this->tab_slug) {
 					$key = array_rand($data[0]['content']['images']);
 					$temp_banner = $this->attach_image($data[0]['content']['images'][$key], $id, array('width' => '1920', 'height' => '600', 'cropping' => 'c'));
@@ -1016,8 +1011,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
 		}
@@ -1098,7 +1092,7 @@ 
 		}
 		if(false !== $found && $needle_count === count($found)){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}