GeoDirectory / geodirectory

geodirectory-functions/custom_fields_input_functions.php

Indentation +709 added lines, -709 removed lines

@@ -19,35 +19,35 @@ 
  */
 function geodir_cfi_fieldset($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
             gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
             <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
-            } ?></h5>
+				echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+			} ?></h5>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
 
@@ -64,47 +64,47 @@ 
  */
 function geodir_cfi_text($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-
-        $value = geodir_get_cf_value($cf);
-        $type = $cf['type'];
-        //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
-
-        //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
-            $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
-
-        // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
-            $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+
+		$value = geodir_get_cf_value($cf);
+		$type = $cf['type'];
+		//number and float validation $validation_pattern
+		if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
+		elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+
+		//validation
+		if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+			$validation = 'pattern="'.$cf['validation_pattern'].'"';
+		}else{$validation='';}
+
+		// validation message
+		if(isset($cf['validation_msg']) && $cf['validation_msg']){
+			$validation_msg = 'title="'.$cf['validation_msg'].'"';
+		}else{$validation_msg='';}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -116,10 +116,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
 
@@ -135,35 +135,35 @@ 
  */
 function geodir_cfi_email($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -175,10 +175,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
 
@@ -195,35 +195,35 @@ 
  */
 function geodir_cfi_phone($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -235,10 +235,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
 
@@ -255,35 +255,35 @@ 
  */
 function geodir_cfi_url($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -298,10 +298,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
 
@@ -317,48 +317,48 @@ 
  */
 function geodir_cfi_radio($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($cf['option_values']) {
-                $option_values = geodir_string_values_to_options($cf['option_values'], true);
+				$option_values = geodir_string_values_to_options($cf['option_values'], true);
 
-                if (!empty($option_values)) {
-                    foreach ($option_values as $option_value) {
-                        if (empty($option_value['optgroup'])) {
-                            ?>
+				if (!empty($option_values)) {
+					foreach ($option_values as $option_value) {
+						if (empty($option_value['optgroup'])) {
+							?>
                             <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked(stripslashes($value), $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
-                        }
-                    }
-                }
-            }
-            ?>
+						}
+					}
+				}
+			}
+			?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
@@ -366,10 +366,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
 
@@ -385,46 +385,46 @@ 
  */
 function geodir_cfi_checkbox($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
 
-        if ($value == '' && $cf['default']) {
-            $value = '1';
-        }
-        ?>
+		if ($value == '' && $cf['default']) {
+			$value = '1';
+		}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($value != '1') {
-                $value = '0';
-            }?>
+				$value = '0';
+			}?>
             <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
             <input  <?php if ($value == '1') {
-                echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
+				echo 'checked="checked"';
+			}?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
                  onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
@@ -433,10 +433,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
 
@@ -452,52 +452,52 @@ 
  */
 function geodir_cfi_textarea($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        ?>
+		$extra_fields = unserialize($cf['extra_fields']);
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label><?php
 
 
-            if (is_array($extra_fields) && in_array('1', $extra_fields)) {
+			if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
 
             <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
-            } else {
+			} else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
+				?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
                             id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
 
-            }?>
+			}?>
 
 
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
@@ -507,10 +507,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
 
@@ -526,53 +526,53 @@ 
  */
 function geodir_cfi_select($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php
-            $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-            $select_options = '';
-            if (!empty($option_values_arr)) {
-                foreach ($option_values_arr as $option_row) {
-                    if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                    } else {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                        $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                        $selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
-
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                    }
-                }
-            }
-            ?>
+			$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+			$select_options = '';
+			if (!empty($option_values_arr)) {
+				foreach ($option_values_arr as $option_row) {
+					if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+						$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+					} else {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+						$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+						$selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
+
+						$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+					}
+				}
+			}
+			?>
             <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                     class="geodir_textfield textfield_x chosen_select"
                     data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
@@ -584,10 +584,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
 
@@ -603,36 +603,36 @@ 
  */
 function geodir_cfi_multiselect($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $multi_display = 'select';
-        if (!empty($cf['extra_fields'])) {
-            $multi_display = unserialize($cf['extra_fields']);
-        }
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$multi_display = 'select';
+		if (!empty($cf['extra_fields'])) {
+			$multi_display = unserialize($cf['extra_fields']);
+		}
+		?>
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <input type="hidden" name="gd_field_<?php echo $cf['name']; ?>" value="1"/>
@@ -643,63 +643,63 @@ 
                         data-placeholder="<?php _e('Select', 'geodirectory'); ?>"
                         option-ajaxchosen="false">
                     <?php
-                    } else {
-                        echo '<ul class="gd_multi_choice">';
-                    }
-
-                    $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-                    $select_options = '';
-                    if (!empty($option_values_arr)) {
-                        foreach ($option_values_arr as $option_row) {
-                            if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                                } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
-                                }
-                            } else {
-                                if (!is_array($value) && $value != '') {
-                                    $value = trim($value);
-                                }
+					} else {
+						echo '<ul class="gd_multi_choice">';
+					}
+
+					$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+					$select_options = '';
+					if (!empty($option_values_arr)) {
+						foreach ($option_values_arr as $option_row) {
+							if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+								if ($multi_display == 'select') {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+								} else {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+								}
+							} else {
+								if (!is_array($value) && $value != '') {
+									$value = trim($value);
+								}
                                 
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                                $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                                $selected = $option_value == $value ? 'selected="selected"' : '';
-                                $selected = '';
-                                $checked = '';
-
-                                if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
-                                    if (!is_array($value)) {
-                                        $value_array = explode(',', $value);
-                                    } else {
-                                        $value_array = $value;
-                                    }
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+								$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+								$selected = $option_value == $value ? 'selected="selected"' : '';
+								$selected = '';
+								$checked = '';
+
+								if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
+									if (!is_array($value)) {
+										$value_array = explode(',', $value);
+									} else {
+										$value_array = $value;
+									}
                                     
-                                    $value_array = stripslashes_deep($value_array);
+									$value_array = stripslashes_deep($value_array);
 
-                                    if (is_array($value_array)) {
-                                        $value_array = array_map('trim', $value_array);
+									if (is_array($value_array)) {
+										$value_array = array_map('trim', $value_array);
                                         
-                                        if (in_array($option_value, $value_array)) {
-                                            $selected = 'selected="selected"';
-                                            $checked = 'checked="checked"';
-                                        }
-                                    }
-                                }
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                                } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
-                                }
-                            }
-                        }
-                    }
-                    echo $select_options;
-
-                    if ($multi_display == 'select') { ?></select></div>
+										if (in_array($option_value, $value_array)) {
+											$selected = 'selected="selected"';
+											$checked = 'checked="checked"';
+										}
+									}
+								}
+
+								if ($multi_display == 'select') {
+									$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+								} else {
+									$select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+								}
+							}
+						}
+					}
+					echo $select_options;
+
+					if ($multi_display == 'select') { ?></select></div>
         <?php } else { ?></ul><?php } ?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
@@ -707,10 +707,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
 
@@ -726,32 +726,32 @@ 
  */
 function geodir_cfi_html($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        ?>
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		?>
 
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
@@ -769,10 +769,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
 
@@ -789,68 +789,68 @@ 
  */
 function geodir_cfi_datepicker($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        $name = $cf['name'];
+		$extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
 
-        if ($extra_fields['date_format'] == '')
-            $extra_fields['date_format'] = 'yy-mm-dd';
+		if ($extra_fields['date_format'] == '')
+			$extra_fields['date_format'] = 'yy-mm-dd';
 
-        $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+		$date_format = $extra_fields['date_format'];
+		$jquery_date_format  = $date_format;
 
 
-        // check if we need to change the format or not
-        $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+		// check if we need to change the format or not
+		$date_format_len = strlen(str_replace(' ', '', $date_format));
+		if($date_format_len>5){// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+			$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+			$replace = array('d','j','l','m','n','F','Y');//PHP date format
 
-            $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
-        }
+			$date_format = str_replace($search, $replace, $date_format);
+		}else{
+			$jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+		}
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
-            //$time = strtotime($value);
-            //$value = date_i18n($date_format, $time);
-        }
-        $value = geodir_date($value, 'Y-m-d', $date_format);
+		if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
+		if($value && !isset($_REQUEST['backandedit'])) {
+			//$time = strtotime($value);
+			//$value = date_i18n($date_format, $time);
+		}
+		$value = geodir_date($value, 'Y-m-d', $date_format);
 
-        ?>
+		?>
         <script type="text/javascript">
 
             jQuery(function () {
 
                 jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
-                    /**
-                     * Used to add extra option to datepicker per custom field.
-                     *
-                     * @since 1.5.7
-                     * @param string $name The custom field name.
-                     */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+					/**
+					 * Used to add extra option to datepicker per custom field.
+					 *
+					 * @since 1.5.7
+					 * @param string $name The custom field name.
+					 */
+					echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
 
                 jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
 
@@ -866,7 +866,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
 
@@ -880,10 +880,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
 
@@ -899,31 +899,31 @@ 
  */
 function geodir_cfi_time($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
+		$name = $cf['name'];
 
-        if ($value != '')
-            $value = date('H:i', strtotime($value));
-        ?>
+		if ($value != '')
+			$value = date('H:i', strtotime($value));
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
@@ -939,7 +939,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
@@ -951,10 +951,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
 
@@ -970,100 +970,100 @@ 
  */
 function geodir_cfi_address($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        global $gd_session;
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        $name = $cf['name'];
-        $type = $cf['type'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $site_title = $cf['site_title'];
-        $is_admin = $cf['is_admin'];
-        $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
-
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
-        ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
-
-        $address = '';
-        $zip = '';
-        $mapview = '';
-        $mapzoom = '';
-        $lat = '';
-        $lng = '';
-
-        if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
-            $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
-        } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
-        }
-
-        $location = geodir_get_default_location();
-        if (empty($city)) $city = isset($location->city) ? $location->city : '';
-        if (empty($region)) $region = isset($location->region) ? $location->region : '';
-        if (empty($country)) $country = isset($location->country) ? $location->country : '';
-
-        $lat_lng_blank = false;
-        if (empty($lat) && empty($lng)) {
-            $lat_lng_blank = true;
-        }
-
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
-
-        /**
-         * Filter the default latitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default latitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
-        /**
-         * Filter the default longitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default longitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
-
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		global $gd_session;
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		$name = $cf['name'];
+		$type = $cf['type'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$site_title = $cf['site_title'];
+		$is_admin = $cf['is_admin'];
+		$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+		$prefix = $name . '_';
+
+		($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
+		($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+		($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
+		($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+
+		$address = '';
+		$zip = '';
+		$mapview = '';
+		$mapzoom = '';
+		$lat = '';
+		$lng = '';
+
+		if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
+			$post = $gd_ses_listing;
+			$address = $post[$prefix . 'address'];
+			$zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
+			$lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
+			$lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
+			$mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+		} else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
+			$post_info = (array)$post_info;
+
+			$address = $post_info[$prefix . 'address'];
+			$zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
+			$lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
+			$lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
+			$mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+		}
+
+		$location = geodir_get_default_location();
+		if (empty($city)) $city = isset($location->city) ? $location->city : '';
+		if (empty($region)) $region = isset($location->region) ? $location->region : '';
+		if (empty($country)) $country = isset($location->country) ? $location->country : '';
+
+		$lat_lng_blank = false;
+		if (empty($lat) && empty($lng)) {
+			$lat_lng_blank = true;
+		}
+
+		if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
+		if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+
+		/**
+		 * Filter the default latitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default latitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
+		/**
+		 * Filter the default longitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default longitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
+
+		?>
 
         <div id="geodir_<?php echo $prefix . 'address';?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
@@ -1082,17 +1082,17 @@ 
 
 
         <?php
-        /**
-         * Called after the address input on the add listings.
-         *
-         * This is used by the location manage to add further locations info etc.
-         *
-         * @since 1.0.0
-         * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
-         */
-        do_action('geodir_address_extra_listing_fields', $cf);
-
-        if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
+		/**
+		 * Called after the address input on the add listings.
+		 *
+		 * This is used by the location manage to add further locations info etc.
+		 *
+		 * @since 1.0.0
+		 * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
+		 */
+		do_action('geodir_address_extra_listing_fields', $cf);
+
+		if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
             <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
@@ -1113,22 +1113,22 @@ 
 
             <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
-                /**
-                 * Contains add listing page map functions.
-                 *
-                 * @since 1.0.0
-                 */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
-                if ($lat_lng_blank) {
-                    $lat = '';
-                    $lng = '';
-                }
-                ?>
+				/**
+				 * Contains add listing page map functions.
+				 *
+				 * @since 1.0.0
+				 */
+				include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+				if ($lat_lng_blank) {
+					$lat = '';
+					$lng = '';
+				}
+				?>
                 <span class="geodir_message_note"><?php echo stripslashes(GET_MAP_MSG); ?></span>
             </div>
             <?php
-            /* show lat lng */
-            $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
+			/* show lat lng */
+			$style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
             <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
@@ -1169,27 +1169,27 @@ 
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
-                            echo 'checked="checked"';
-                        } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
                                                              name="<?php echo $prefix . 'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
-                            echo 'checked="checked"';
-                        } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
-                            echo 'checked="checked"';
-                        } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
-                            echo 'checked="checked"';
-                        } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
 
 
             </div>
@@ -1197,14 +1197,14 @@ 
 
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
-                echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+				echo esc_attr($mapzoom);
+			} ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
         <?php }
 
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
 
@@ -1221,137 +1221,137 @@ 
  */
 function geodir_cfi_taxonomy($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $is_admin = $cf['is_admin'];
-        $required_msg = $cf['required_msg'];
-
-        if ($value == $cf['default']) {
-            $value = '';
-        } ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$is_admin = $cf['is_admin'];
+		$required_msg = $cf['required_msg'];
+
+		if ($value == $cf['default']) {
+			$value = '';
+		} ?>
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($is_required) echo '<span>*</span>';?>
             </label>
 
             <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
-                global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
+				global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
-                $exclude_cats = array();
+				$exclude_cats = array();
 
-                if ($is_admin == '1') {
+				if ($is_admin == '1') {
 
-                    $post_type = get_post_type();
+					$post_type = get_post_type();
 
-                    $package_info = array();
+					$package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+					$package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
 
-                    if (!empty($package_info)) {
+					if (!empty($package_info)) {
 
-                        if (isset($package_info['cat']) && $package_info['cat'] != '') {
+						if (isset($package_info['cat']) && $package_info['cat'] != '') {
 
-                            $exclude_cats = explode(',', $package_info['cat']);
+							$exclude_cats = explode(',', $package_info['cat']);
 
-                        }
-                    }
-                }
+						}
+					}
+				}
 
-                $cat_display = unserialize($cf['extra_fields']);
+				$cat_display = unserialize($cf['extra_fields']);
 
-                if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {
+				if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {
 
-                    $post_cat = implode(",", $post_cat[$name]);
+					$post_cat = implode(",", $post_cat[$name]);
 
-                } else {
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
-                        $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
-                }
+				} else {
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
+						$post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+				}
 
 
-                global $geodir_addon_list;
-                if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
+				global $geodir_addon_list;
+				if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
 
-                    $catadd_limit = $wpdb->get_var(
-                        $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
-                            array($package_id)
-                        )
-                    );
+					$catadd_limit = $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+							array($package_id)
+						)
+					);
 
 
-                } else {
-                    $catadd_limit = 0;
-                }
+				} else {
+					$catadd_limit = 0;
+				}
 
 
-                if ($cat_display != '' && $cat_display != 'ajax_chained') {
+				if ($cat_display != '' && $cat_display != 'ajax_chained') {
 
-                    $required_limit_msg = '';
-                    if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
+					$required_limit_msg = '';
+					if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+						$required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
 
-                    } else {
-                        $required_limit_msg = $required_msg;
-                    }
+					} else {
+						$required_limit_msg = $required_msg;
+					}
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+					echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
 
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+					if ($cat_display == 'select' || $cat_display == 'multiselect') {
 
-                        $cat_display == '';
-                        $multiple = '';
-                        if ($cat_display == 'multiselect')
-                            $multiple = 'multiple="multiple"';
+						$cat_display == '';
+						$multiple = '';
+						if ($cat_display == 'multiselect')
+							$multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+						echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
 
 
-                        if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+						if ($cat_display == 'select')
+							echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
 
-                    }
+					}
 
-                    echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
+					echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
-                        echo '</select>';
+					if ($cat_display == 'select' || $cat_display == 'multiselect')
+						echo '</select>';
 
-                } else {
+				} else {
 
-                    echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
+					echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
 
-                }
+				}
 
-                ?>
+				?>
             </div>
 
             <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
@@ -1361,10 +1361,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
 
@@ -1380,74 +1380,74 @@ 
  */
 function geodir_cfi_file($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$extra_fields = unserialize($cf['extra_fields']);
 
 
-        // adjust values here
-        $file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
+		// adjust values here
+		$file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
 
-        if ($value != '') {
+		if ($value != '') {
 
-            $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
+			$file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
 
-        } else
-            $file_value = '';
+		} else
+			$file_value = '';
 
-        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
-            $file_multiple = true; // allow multiple files upload
-        else
-            $file_multiple = false;
+		if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
+			$file_multiple = true; // allow multiple files upload
+		else
+			$file_multiple = false;
 
-        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
-            $file_image_limit = $extra_fields['image_limit'];
-        else
-            $file_image_limit = 1;
+		if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
+			$file_image_limit = $extra_fields['image_limit'];
+		else
+			$file_image_limit = 1;
 
-        $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
+		$file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
 
-        $file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
+		$file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
 
-        if (!empty($file_value)) {
-            $curImages = explode(',', $file_value);
-            if (!empty($curImages))
-                $file_totImg = count($curImages);
-        }
+		if (!empty($file_value)) {
+			$curImages = explode(',', $file_value);
+			if (!empty($curImages))
+				$file_totImg = count($curImages);
+		}
 
-        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
-        $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
+		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
+		$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
 
-        ?>
+		?>
         <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit==1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('image with this package').')</small>';} ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit>1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('images with this package').')</small>';} ?>
 				 <?php if($file_image_limit==0){echo '<br /><small>('.__('You can upload unlimited images with this package').')</small>';} ?>
 			</h5>   <?php */
-        ?>
+		?>
 
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
@@ -1455,7 +1455,7 @@ 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+					echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1467,17 +1467,17 @@ 
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
-                           echo esc_attr($file_totImg);
-                       } else {
-                           echo '0';
-                       } ?>"/>
+						   echo esc_attr($file_totImg);
+					   } else {
+						   echo '0';
+					   } ?>"/>
 
                 <div style="float:left; width:55%;">
                     <div
                         class="plupload-upload-uic hide-if-no-js <?php if ($file_multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"
                         id="<?php echo $file_id; ?>plupload-upload-ui" style="float:left; width:30%;">
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
-                        ?>
+						?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
                                value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
@@ -1496,7 +1496,7 @@ 
                         style=" clear:inherit; margin-top:0; margin-left:15px; padding-top:10px; float:left; width:50%;">
                     </div>
                     <?php /*?><span id="upload-msg" ><?php _e('Please drag &amp; drop the images to rearrange the order');?></span><?php */
-                    ?>
+					?>
 
                     <span id="<?php echo $file_id; ?>upload-error" style="display:none"></span>
 
@@ -1510,9 +1510,9 @@ 
 
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file

geodirectory-functions/helper_functions.php

Indentation +355 added lines, -355 removed lines

@@ -14,13 +14,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_add_listing_page_id(){
-    $gd_page_id = get_option('geodir_add_listing_page');
+	$gd_page_id = get_option('geodir_add_listing_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -31,13 +31,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_preview_page_id(){
-    $gd_page_id = get_option('geodir_preview_page');
+	$gd_page_id = get_option('geodir_preview_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -48,13 +48,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_success_page_id(){
-    $gd_page_id = get_option('geodir_success_page');
+	$gd_page_id = get_option('geodir_success_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -65,13 +65,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_location_page_id(){
-    $gd_page_id = get_option('geodir_location_page');
+	$gd_page_id = get_option('geodir_location_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -82,13 +82,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_home_page_id(){
-    $gd_page_id = get_option('geodir_home_page');
+	$gd_page_id = get_option('geodir_home_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -99,13 +99,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_info_page_id(){
-    $gd_page_id = get_option('geodir_info_page');
+	$gd_page_id = get_option('geodir_info_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -116,13 +116,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_page_id(){
-    $gd_page_id = get_option('geodir_login_page');
+	$gd_page_id = get_option('geodir_login_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 
@@ -134,51 +134,51 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_url($args=array()){
-    $gd_page_id = get_option('geodir_login_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $home_url = icl_get_home_url();
-    }else{
-        $home_url = home_url();
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $login_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
-    }
-
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
-    }
-
-    /**
-     * Filter the GeoDirectory login page url.
-     *
-     * This filter can be used to change the GeoDirectory page url.
-     *
-     * @since 1.5.3
-     * @package GeoDirectory
-     * @param string $login_url The url of the login page.
-     * @param array $args The array of query args used.
-     * @param int $gd_page_id The page id of the GD login page.
-     */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	$gd_page_id = get_option('geodir_login_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$home_url = icl_get_home_url();
+	}else{
+		$home_url = home_url();
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$login_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$login_url = trailingslashit($home_url)."?geodir_signup=true";
+	}
+
+	if($args){
+		$login_url = add_query_arg($args,$login_url );
+	}
+
+	/**
+	 * Filter the GeoDirectory login page url.
+	 *
+	 * This filter can be used to change the GeoDirectory page url.
+	 *
+	 * @since 1.5.3
+	 * @package GeoDirectory
+	 * @param string $login_url The url of the login page.
+	 * @param array $args The array of query args used.
+	 * @param int $gd_page_id The page id of the GD login page.
+	 */
+	return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
 }
 
 /**
@@ -190,40 +190,40 @@ 
  * @return string Info page url.
  */
 function geodir_info_url($args=array()){
-    $gd_page_id = get_option('geodir_info_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $home_url = icl_get_home_url();
-    }else{
-        $home_url = home_url();
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $info_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $info_url = trailingslashit($home_url);
-    }
-
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
-    }
-
-    return $info_url;
+	$gd_page_id = get_option('geodir_info_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$home_url = icl_get_home_url();
+	}else{
+		$home_url = home_url();
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$info_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$info_url = trailingslashit($home_url);
+	}
+
+	if($args){
+		$info_url = add_query_arg($args,$info_url );
+	}
+
+	return $info_url;
 }
 
 /**
@@ -239,11 +239,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_ucwords($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_TITLE, $charset);
-    } else {
-        return ucwords($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $charset);
+	} else {
+		return ucwords($string);
+	}
 }
 
 /**
@@ -259,11 +259,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtolower($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_LOWER, $charset);
-    } else {
-        return strtolower($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_LOWER, $charset);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
@@ -279,11 +279,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtoupper($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_UPPER, $charset);
-    } else {
-        return strtoupper($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_UPPER, $charset);
+	} else {
+		return strtoupper($string);
+	}
 }
 
 /**
@@ -462,11 +462,11 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
-        return '_gd_die_handler';
-    } else {
-        die();
-    }
+	if ( defined( 'GD_TESTING_MODE' ) ) {
+		return '_gd_die_handler';
+	} else {
+		die();
+	}
 }
 
 /**
@@ -481,9 +481,9 @@ 
  * @param int $status     Optional. Status code.
  */
 function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+	add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
+	add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
+	wp_die( $message, $title, array( 'response' => $status ));
 }
 
 /*
@@ -652,37 +652,37 @@ 
  * @return string The formatted date.
  */
 function geodir_date($date_input, $date_to, $date_from = '') {
-    if (empty($date_input) || empty($date_to)) {
-        return NULL;
-    }
+	if (empty($date_input) || empty($date_to)) {
+		return NULL;
+	}
     
-    $date = '';
-    if (!empty($date_from)) {
-        $datetime = date_create_from_format($date_from, $date_input);
+	$date = '';
+	if (!empty($date_from)) {
+		$datetime = date_create_from_format($date_from, $date_input);
         
-        if (!empty($datetime)) {
-            $date = $datetime->format($date_to);
-        }
-    }
+		if (!empty($datetime)) {
+			$date = $datetime->format($date_to);
+		}
+	}
     
-    if (empty($date)) {
-        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
-        $date = date_i18n($date_to, strtotime($date));
-    }
+	if (empty($date)) {
+		$date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+		$date = date_i18n($date_to, strtotime($date));
+	}
     
-    $date = geodir_maybe_untranslate_date($date);
-    /**
-     * Filter the the date format conversion.
-     *
-     * @since 1.6.7
-     * @package GeoDirectory
-     *
-     * @param string $date The date string.
-     * @param string $date_input The date input.
-     * @param string $date_to The destination date format.
-     * @param string $date_from The source date format.
-     */
-    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
+	$date = geodir_maybe_untranslate_date($date);
+	/**
+	 * Filter the the date format conversion.
+	 *
+	 * @since 1.6.7
+	 * @package GeoDirectory
+	 *
+	 * @param string $date The date string.
+	 * @param string $date_input The date input.
+	 * @param string $date_to The destination date format.
+	 * @param string $date_from The source date format.
+	 */
+	return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
 }
 
 /**
@@ -707,91 +707,91 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
-        return $text;
-    }
-    $default = array(
-        'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
+	if (!(int)$length > 0) {
+		return $text;
+	}
+	$default = array(
+		'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
 	);
-    if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
-        $default['ellipsis'] = "";
-    }
-    $options += $default;
-
-    $prefix = '';
-    $suffix = $options['ellipsis'];
-
-    if ($options['html']) {
-        $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
-
-        $truncateLength = 0;
-        $totalLength = 0;
-        $openTags = array();
-        $truncate = '';
-
-        preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
-        foreach ($tags as $tag) {
-            $contentLength = geodir_strlen($tag[3], $options);
-
-            if ($truncate === '') {
-                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
-                    if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
-                        array_unshift($openTags, $tag[2]);
-                    } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
-                        $pos = array_search($closeTag[1], $openTags);
-                        if ($pos !== false) {
-                            array_splice($openTags, $pos, 1);
-                        }
-                    }
-                }
-
-                $prefix .= $tag[1];
-
-                if ($totalLength + $contentLength + $ellipsisLength > $length) {
-                    $truncate = $tag[3];
-                    $truncateLength = $length - $totalLength;
-                } else {
-                    $prefix .= $tag[3];
-                }
-            }
-
-            $totalLength += $contentLength;
-            if ($totalLength > $length) {
-                break;
-            }
-        }
-
-        if ($totalLength <= $length) {
-            return $text;
-        }
-
-        $text = $truncate;
-        $length = $truncateLength;
-
-        foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
-        }
-    } else {
-        if (geodir_strlen($text, $options) <= $length) {
-            return $text;
-        }
-        $ellipsisLength = geodir_strlen($options['ellipsis'], $options);
-    }
-
-    $result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
-
-    if (!$options['exact']) {
-        if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
-            $result = geodir_remove_last_word($result);
-        }
-
-        // Do not need to count ellipsis in the cut, if result is empty.
-        if (!strlen($result)) {
-            $result = geodir_substr($text, 0, $length, $options);
-        }
-    }
-
-    return $prefix . $result . $suffix;
+	if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
+		$default['ellipsis'] = "";
+	}
+	$options += $default;
+
+	$prefix = '';
+	$suffix = $options['ellipsis'];
+
+	if ($options['html']) {
+		$ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
+
+		$truncateLength = 0;
+		$totalLength = 0;
+		$openTags = array();
+		$truncate = '';
+
+		preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+		foreach ($tags as $tag) {
+			$contentLength = geodir_strlen($tag[3], $options);
+
+			if ($truncate === '') {
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
+					if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
+						array_unshift($openTags, $tag[2]);
+					} elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
+						$pos = array_search($closeTag[1], $openTags);
+						if ($pos !== false) {
+							array_splice($openTags, $pos, 1);
+						}
+					}
+				}
+
+				$prefix .= $tag[1];
+
+				if ($totalLength + $contentLength + $ellipsisLength > $length) {
+					$truncate = $tag[3];
+					$truncateLength = $length - $totalLength;
+				} else {
+					$prefix .= $tag[3];
+				}
+			}
+
+			$totalLength += $contentLength;
+			if ($totalLength > $length) {
+				break;
+			}
+		}
+
+		if ($totalLength <= $length) {
+			return $text;
+		}
+
+		$text = $truncate;
+		$length = $truncateLength;
+
+		foreach ($openTags as $tag) {
+			$suffix .= '</' . $tag . '>';
+		}
+	} else {
+		if (geodir_strlen($text, $options) <= $length) {
+			return $text;
+		}
+		$ellipsisLength = geodir_strlen($options['ellipsis'], $options);
+	}
+
+	$result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
+
+	if (!$options['exact']) {
+		if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
+			$result = geodir_remove_last_word($result);
+		}
+
+		// Do not need to count ellipsis in the cut, if result is empty.
+		if (!strlen($result)) {
+			$result = geodir_substr($text, 0, $length, $options);
+		}
+	}
+
+	return $prefix . $result . $suffix;
 }
 
 /**
@@ -815,28 +815,28 @@ 
  * @return int
  */
 function geodir_strlen($text, array $options) {
-    if (empty($options['trimWidth'])) {
-        $strlen = 'mb_strlen';
-    } else {
-        $strlen = 'mb_strwidth';
-    }
-
-    if (empty($options['html'])) {
-        return $strlen($text);
-    }
-
-    $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
-    $replace = preg_replace_callback(
-        $pattern,
-        function ($match) use ($strlen) {
-            $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
-
-            return str_repeat(' ', $strlen($utf8, 'UTF-8'));
-        },
-        $text
-    );
-
-    return $strlen($replace);
+	if (empty($options['trimWidth'])) {
+		$strlen = 'mb_strlen';
+	} else {
+		$strlen = 'mb_strwidth';
+	}
+
+	if (empty($options['html'])) {
+		return $strlen($text);
+	}
+
+	$pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
+	$replace = preg_replace_callback(
+		$pattern,
+		function ($match) use ($strlen) {
+			$utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
+
+			return str_repeat(' ', $strlen($utf8, 'UTF-8'));
+		},
+		$text
+	);
+
+	return $strlen($replace);
 }
 
 /**
@@ -857,80 +857,80 @@ 
  * @return string
  */
 function geodir_substr($text, $start, $length, array $options) {
-    if (empty($options['trimWidth'])) {
-        $substr = 'mb_substr';
-    } else {
-        $substr = 'mb_strimwidth';
-    }
-
-    $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
-    if ($start < 0) {
-        $start += $maxPosition;
-        if ($start < 0) {
-            $start = 0;
-        }
-    }
-    if ($start >= $maxPosition) {
-        return '';
-    }
-
-    if ($length === null) {
-        $length = geodir_strlen($text, $options);
-    }
-
-    if ($length < 0) {
-        $text = geodir_substr($text, $start, null, $options);
-        $start = 0;
-        $length += geodir_strlen($text, $options);
-    }
-
-    if ($length <= 0) {
-        return '';
-    }
-
-    if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
-    }
-
-    $totalOffset = 0;
-    $totalLength = 0;
-    $result = '';
-
-    $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
-    $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-    foreach ($parts as $part) {
-        $offset = 0;
-
-        if ($totalOffset < $start) {
-            $len = geodir_strlen($part, array('trimWidth' => false) + $options);
-            if ($totalOffset + $len <= $start) {
-                $totalOffset += $len;
-                continue;
-            }
-
-            $offset = $start - $totalOffset;
-            $totalOffset = $start;
-        }
-
-        $len = geodir_strlen($part, $options);
-        if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
-                // Entities cannot be passed substr.
-                continue;
-            }
-
-            $part = $substr($part, $offset, $length - $totalLength);
-            $len = geodir_strlen($part, $options);
-        }
-
-        $result .= $part;
-        $totalLength += $len;
-        if ($totalLength >= $length) {
-            break;
-        }
-    }
-
-    return $result;
+	if (empty($options['trimWidth'])) {
+		$substr = 'mb_substr';
+	} else {
+		$substr = 'mb_strimwidth';
+	}
+
+	$maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
+	if ($start < 0) {
+		$start += $maxPosition;
+		if ($start < 0) {
+			$start = 0;
+		}
+	}
+	if ($start >= $maxPosition) {
+		return '';
+	}
+
+	if ($length === null) {
+		$length = geodir_strlen($text, $options);
+	}
+
+	if ($length < 0) {
+		$text = geodir_substr($text, $start, null, $options);
+		$start = 0;
+		$length += geodir_strlen($text, $options);
+	}
+
+	if ($length <= 0) {
+		return '';
+	}
+
+	if (empty($options['html'])) {
+		return (string)$substr($text, $start, $length);
+	}
+
+	$totalOffset = 0;
+	$totalLength = 0;
+	$result = '';
+
+	$pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
+	$parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+	foreach ($parts as $part) {
+		$offset = 0;
+
+		if ($totalOffset < $start) {
+			$len = geodir_strlen($part, array('trimWidth' => false) + $options);
+			if ($totalOffset + $len <= $start) {
+				$totalOffset += $len;
+				continue;
+			}
+
+			$offset = $start - $totalOffset;
+			$totalOffset = $start;
+		}
+
+		$len = geodir_strlen($part, $options);
+		if ($offset !== 0 || $totalLength + $len > $length) {
+			if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+				// Entities cannot be passed substr.
+				continue;
+			}
+
+			$part = $substr($part, $offset, $length - $totalLength);
+			$len = geodir_strlen($part, $options);
+		}
+
+		$result .= $part;
+		$totalLength += $len;
+		if ($totalLength >= $length) {
+			break;
+		}
+	}
+
+	return $result;
 }
 
 /**
@@ -943,21 +943,21 @@ 
  * @return string
  */
 function geodir_remove_last_word($text) {
-    $spacepos = mb_strrpos($text, ' ');
+	$spacepos = mb_strrpos($text, ' ');
 
-    if ($spacepos !== false) {
-        $lastWord = mb_strrpos($text, $spacepos);
+	if ($spacepos !== false) {
+		$lastWord = mb_strrpos($text, $spacepos);
 
-        // Some languages are written without word separation.
-        // We recognize a string as a word if it does not contain any full-width characters.
-        if (mb_strwidth($lastWord) === mb_strlen($lastWord)) {
-            $text = mb_substr($text, 0, $spacepos);
-        }
+		// Some languages are written without word separation.
+		// We recognize a string as a word if it does not contain any full-width characters.
+		if (mb_strwidth($lastWord) === mb_strlen($lastWord)) {
+			$text = mb_substr($text, 0, $spacepos);
+		}
 
-        return $text;
-    }
+		return $text;
+	}
 
-    return '';
+	return '';
 }
 
 function geodir_tool_restore_cpt_from_taxonomies(){

geodirectory-templates/listing-filter-form.php

Indentation +36 added lines, -36 removed lines

@@ -13,26 +13,26 @@ 
 global $wp_query, $current_term, $query;

 

 if (function_exists('geodir_location_geo_home_link')) {

-    remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+	remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

 }

 

 if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX){

-    $search_url = icl_get_home_url();

+	$search_url = icl_get_home_url();

 } else {

-    $search_url = get_home_url();

+	$search_url = get_home_url();

 }

 

 $search_url = trailingslashit($search_url);

 

 if (function_exists('geodir_location_geo_home_link')) {

-    add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+	add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

 }

 

 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 $form_class = 'geodir-listing-search';

 

 if($new_style){

-    $form_class .= ' gd-search-bar-style';

+	$form_class .= ' gd-search-bar-style';

 }

 ?>

 <form class="<?php

@@ -49,56 +49,56 @@ 
     <div class="geodir-loc-bar">

 

         <?php

-        /**

-         * Called inside the search form but before any of the fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_search_form') ?>

+		/**

+		 * Called inside the search form but before any of the fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_search_form') ?>

 

         <div class="clearfix geodir-loc-bar-in">

             <div class="geodir-search">

 

                 <?php

 

-                /**

-                 * Adds the input fields to the search form.

-                 *

-                 * @since 1.6.9

-                 */

-                do_action('geodir_search_form_inputs');

+				/**

+				 * Adds the input fields to the search form.

+				 *

+				 * @since 1.6.9

+				 */

+				do_action('geodir_search_form_inputs');

 

 

 

-                /**

-                 * Called on the GD search form just before the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_before_search_button');

+				/**

+				 * Called on the GD search form just before the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_before_search_button');

 

                 

-                /**

-                 * Called on the GD search form just after the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_after_search_button');

+				/**

+				 * Called on the GD search form just after the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_after_search_button');

 

                 

-                ?>

+				?>

             </div>

 

 

         </div>

 

         <?php

-        /**

-         * Called inside the search form but after all the input fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_search_form') ?>

+		/**

+		 * Called inside the search form but after all the input fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_search_form') ?>

 

 

     </div>

geodirectory-functions/shortcode_functions.php

Indentation +416 added lines, -416 removed lines

@@ -9,7 +9,7 @@ 
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 
 /**
@@ -22,22 +22,22 @@ 
  */
 function gdsc_validate_measurements($value)
 {
-    if ((strlen($value) - 1) == strpos(trim($value), '%')) {
-        // $value is entered as a percent, so it can't be less than 0 or more than 100
-        $value = preg_replace('/\D/', '', $value);
-        if (100 < $value) {
-            $value = 100;
-        }
-        // Re-add the percent symbol
-        $value = $value . '%';
-    } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
-        // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
-    } else {
-        $value = preg_replace('/\D/', '', $value);
-    }
+	if ((strlen($value) - 1) == strpos(trim($value), '%')) {
+		// $value is entered as a percent, so it can't be less than 0 or more than 100
+		$value = preg_replace('/\D/', '', $value);
+		if (100 < $value) {
+			$value = 100;
+		}
+		// Re-add the percent symbol
+		$value = $value . '%';
+	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
+		// Get the absint & re-add the 'px'
+		$value = preg_replace('/\D/', '', $value) . 'px';
+	} else {
+		$value = preg_replace('/\D/', '', $value);
+	}
 
-    return $value;
+	return $value;
 }
 
 /**
@@ -52,35 +52,35 @@ 
 function gdsc_validate_map_args($params)
 {
 
-    $params['width'] = gdsc_validate_measurements($params['width']);
-    $params['height'] = gdsc_validate_measurements($params['height']);
+	$params['width'] = gdsc_validate_measurements($params['width']);
+	$params['height'] = gdsc_validate_measurements($params['height']);
 
-    // Only accept our 4 maptypes. Otherwise, revert to the default.
-    if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
-        $params['maptype'] = 'ROADMAP';
-    } else {
-        $params['maptype'] = geodir_strtoupper($params['maptype']);
-    }
+	// Only accept our 4 maptypes. Otherwise, revert to the default.
+	if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
+		$params['maptype'] = 'ROADMAP';
+	} else {
+		$params['maptype'] = geodir_strtoupper($params['maptype']);
+	}
 
-    // Zoom accepts a value between 1 and 19
-    $params['zoom'] = absint($params['zoom']);
-    if (19 < $params['zoom']) {
-        $params['zoom'] = '19';
-    }
-    if (0 == $params['zoom']) {
-        $params['zoom'] = '1';
-    }
+	// Zoom accepts a value between 1 and 19
+	$params['zoom'] = absint($params['zoom']);
+	if (19 < $params['zoom']) {
+		$params['zoom'] = '19';
+	}
+	if (0 == $params['zoom']) {
+		$params['zoom'] = '1';
+	}
 
-    // Child_collapse must be boolean
-    $params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
+	// Child_collapse must be boolean
+	$params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
 
-    // Scrollwheel must be boolean
-    $params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
+	// Scrollwheel must be boolean
+	$params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
 
-    // Scrollwheel must be boolean
-    $params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
+	// Scrollwheel must be boolean
+	$params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
 
-    return $params;
+	return $params;
 }
 
 /**
@@ -99,52 +99,52 @@ 
  */
 function gdsc_to_bool_val($in, $strict = false)
 {
-    $out = null;
-
-    // if not strict, we only have to check if something is false
-    if (in_array($in, array(
-        'false',
-        'False',
-        'FALSE',
-        'no',
-        'No',
-        'n',
-        'N',
-        '0',
-        'off',
-        'Off',
-        'OFF',
-        false,
-        0,
-        null
-    ), true)) {
-        $out = false;
-    } else if ($strict) {
-        // if strict, check the equivalent true values
-        if (in_array($in, array(
-            'true',
-            'True',
-            'TRUE',
-            'yes',
-            'Yes',
-            'y',
-            'Y',
-            '1',
-            'on',
-            'On',
-            'ON',
-            true,
-            1
-        ), true)) {
-            $out = true;
-        }
-    } else {
-        // not strict? let the regular php bool check figure it out (will
-        //     largely default to true)
-        $out = ($in ? true : false);
-    }
+	$out = null;
+
+	// if not strict, we only have to check if something is false
+	if (in_array($in, array(
+		'false',
+		'False',
+		'FALSE',
+		'no',
+		'No',
+		'n',
+		'N',
+		'0',
+		'off',
+		'Off',
+		'OFF',
+		false,
+		0,
+		null
+	), true)) {
+		$out = false;
+	} else if ($strict) {
+		// if strict, check the equivalent true values
+		if (in_array($in, array(
+			'true',
+			'True',
+			'TRUE',
+			'yes',
+			'Yes',
+			'y',
+			'Y',
+			'1',
+			'on',
+			'On',
+			'ON',
+			true,
+			1
+		), true)) {
+			$out = true;
+		}
+	} else {
+		// not strict? let the regular php bool check figure it out (will
+		//     largely default to true)
+		$out = ($in ? true : false);
+	}
 
-    return $out;
+	return $out;
 }
 
 /**
@@ -157,16 +157,16 @@ 
  */
 function gdsc_is_post_type_valid($incoming_post_type)
 {
-    $post_types = geodir_get_posttypes();
-    $post_types = array_map('geodir_strtolower', $post_types);
-    $post_type_found = false;
-    foreach ($post_types as $type) {
-        if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
-            $post_type_found = true;
-        }
-    }
+	$post_types = geodir_get_posttypes();
+	$post_types = array_map('geodir_strtolower', $post_types);
+	$post_type_found = false;
+	foreach ($post_types as $type) {
+		if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
+			$post_type_found = true;
+		}
+	}
 
-    return $post_type_found;
+	return $post_type_found;
 }
 
 /**
@@ -186,52 +186,52 @@ 
  */
 function gdsc_listing_loop_filter($query)
 {
-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
-
-    $geodir_post_type = geodir_get_current_posttype();
-
-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
-
-        if (isset($wp_query->query[$taxonomies[0]])) {
-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
-            $request_term = end($request_term);
-            if (!term_exists($request_term)) {
-                $args = array('number' => '1',);
-                $terms_arr = get_terms($taxonomies[0], $args);
-                foreach ($terms_arr as $location_term) {
-                    $term_arr = $location_term;
-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
-                }
-                $wp_query->queried_object_id = 1;
-                $wp_query->queried_object = $term_arr;
-            }
-        }
+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
+
+	$geodir_post_type = geodir_get_current_posttype();
+
+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
+
+		if (isset($wp_query->query[$taxonomies[0]])) {
+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);
+			$request_term = end($request_term);
+			if (!term_exists($request_term)) {
+				$args = array('number' => '1',);
+				$terms_arr = get_terms($taxonomies[0], $args);
+				foreach ($terms_arr as $location_term) {
+					$term_arr = $location_term;
+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
+				}
+				$wp_query->queried_object_id = 1;
+				$wp_query->queried_object = $term_arr;
+			}
+		}
 
-    }
-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
+	}
+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        add_filter('posts_fields', 'geodir_posts_fields', 1);
-        add_filter('posts_join', 'geodir_posts_join', 1);
-        geodir_post_where();
-        if (!is_admin()) {
-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);
-        }
+		add_filter('posts_fields', 'geodir_posts_fields', 1);
+		add_filter('posts_join', 'geodir_posts_join', 1);
+		geodir_post_where();
+		if (!is_admin()) {
+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+		}
 
-        // advanced filter for popular post view widget
-        global $wp_query;
-        if (!is_admin()) {
-            if (!empty($wp_query->query['with_pics_only'])) {
-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);
-            }
-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);
-        }
+		// advanced filter for popular post view widget
+		global $wp_query;
+		if (!is_admin()) {
+			if (!empty($wp_query->query['with_pics_only'])) {
+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);
+			}
+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);
+		}
 
-    }
+	}
 
-    return $query;
+	return $query;
 }
 
 /**
@@ -245,40 +245,40 @@ 
  */
 function gdsc_manage_category_choice($post_type, $category)
 {
-    if (0 == $category || '' == $category) {
-        return '';
-    }
+	if (0 == $category || '' == $category) {
+		return '';
+	}
 
-    if (!(gdsc_is_post_type_valid($post_type))) {
-        return '';
-    }
+	if (!(gdsc_is_post_type_valid($post_type))) {
+		return '';
+	}
 
-    $taxonomies = geodir_get_taxonomies($post_type);
+	$taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0]));
+	$categories = get_terms(array('taxonomy' => $taxonomies[0]));
 
-    $cat_id = 0;
+	$cat_id = 0;
 
-    foreach ($categories as $cat) {
-        if (is_numeric($category)) {
-            if (absint($category) == $cat->term_id) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        } else {
-            if ($category == $cat->slug) {
-                $cat_id = $cat->term_id;
-                break;
-            }
+	foreach ($categories as $cat) {
+		if (is_numeric($category)) {
+			if (absint($category) == $cat->term_id) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		} else {
+			if ($category == $cat->slug) {
+				$cat_id = $cat->term_id;
+				break;
+			}
 
-            if ($category == $cat->name) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        }
-    }
+			if ($category == $cat->name) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		}
+	}
 
-    return $cat_id;
+	return $cat_id;
 }
 
 // @todo: Extract this
@@ -288,11 +288,11 @@ 
 	 * Adds the script in the page footer for the home page google map.
 	 *
 	 * @since 1.0.0
-     * @return string Print the script in page footer.
+	 * @return string Print the script in page footer.
 	 */
 	function geodir_home_map_add_script()
-    {
-        ?>
+	{
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 geoDirMapSlide();
@@ -365,7 +365,7 @@ 
             }
         </script>
     <?php
-    }
+	}
 }
 
 /**
@@ -376,7 +376,7 @@ 
  */
 function geodir_popular_category_add_scripts()
 {
-    ?>
+	?>
     <script type="text/javascript">
         jQuery(function ($) {
             $('.geodir-showcat').click(function () {
@@ -406,56 +406,56 @@ 
  */
 function gdsc_validate_layout_choice($layout_choice)
 {
-    switch (geodir_strtolower($layout_choice)) {
-        case 'list';
-        case 'one';
-        case 'one_column';
-        case 'onecolumn';
-        case '1';
-            $layout_choice = 'list';
-            break;
-        case 'gridview_onehalf';
-        case 'two';
-        case 'two_column';
-        case 'two_columns';
-        case 'twocolumn';
-        case 'twocolumns';
-        case '2';
-            $layout_choice = 'gridview_onehalf';
-            break;
-        case 'gridview_onethird';
-        case 'three';
-        case 'three_column';
-        case 'three_columns';
-        case 'threecolumn';
-        case 'threecolumns';
-        case '3';
-            $layout_choice = 'gridview_onethird';
-            break;
-        case 'gridview_onefourth';
-        case 'four';
-        case 'four_column';
-        case 'four_columns';
-        case 'fourcolumn';
-        case 'fourcolumns';
-        case '4';
-            $layout_choice = 'gridview_onefourth';
-            break;
-        case 'gridview_onefifth';
-        case 'five';
-        case 'five_column';
-        case 'five_columns';
-        case 'fivecolumn';
-        case 'fivecolumns';
-        case '5';
-            $layout_choice = 'gridview_onefifth';
-            break;
-        default:
-            $layout_choice = 'gridview_onehalf';
-            break;
-    }
+	switch (geodir_strtolower($layout_choice)) {
+		case 'list';
+		case 'one';
+		case 'one_column';
+		case 'onecolumn';
+		case '1';
+			$layout_choice = 'list';
+			break;
+		case 'gridview_onehalf';
+		case 'two';
+		case 'two_column';
+		case 'two_columns';
+		case 'twocolumn';
+		case 'twocolumns';
+		case '2';
+			$layout_choice = 'gridview_onehalf';
+			break;
+		case 'gridview_onethird';
+		case 'three';
+		case 'three_column';
+		case 'three_columns';
+		case 'threecolumn';
+		case 'threecolumns';
+		case '3';
+			$layout_choice = 'gridview_onethird';
+			break;
+		case 'gridview_onefourth';
+		case 'four';
+		case 'four_column';
+		case 'four_columns';
+		case 'fourcolumn';
+		case 'fourcolumns';
+		case '4';
+			$layout_choice = 'gridview_onefourth';
+			break;
+		case 'gridview_onefifth';
+		case 'five';
+		case 'five_column';
+		case 'five_columns';
+		case 'fivecolumn';
+		case 'fivecolumns';
+		case '5';
+			$layout_choice = 'gridview_onefifth';
+			break;
+		default:
+			$layout_choice = 'gridview_onehalf';
+			break;
+	}
 
-    return $layout_choice;
+	return $layout_choice;
 }
 
 /**
@@ -468,20 +468,20 @@ 
  */
 function gdsc_validate_sort_choice($sort_choice)
 {
-    $sorts = array(
-        'az',
-        'latest',
-        'featured',
-        'high_review',
-        'high_rating',
-        'random',
-    );
-
-    if (!(in_array($sort_choice, $sorts))) {
-        $sort_choice = 'latest';
-    }
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (!(in_array($sort_choice, $sorts))) {
+		$sort_choice = 'latest';
+	}
 
-    return $sort_choice;
+	return $sort_choice;
 }
 
 /**
@@ -494,22 +494,22 @@ 
  */
 function gdsc_validate_listing_width($width_choice)
 {
-    if (!(empty($width_choice))) {
-        $width_choice = absint($width_choice);
-    } else {
-        return '';
-    }
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
 
-    if (100 < $width_choice) {
-        $width_choice = 100;
-    }
+	if (100 < $width_choice) {
+		$width_choice = 100;
+	}
 
-    // If listing_width is too narrow, it won't work, arbitrarily set to 10% here
-    if (10 > $width_choice) {
-        $width_choice = 10;
-    }
+	// If listing_width is too narrow, it won't work, arbitrarily set to 10% here
+	if (10 > $width_choice) {
+		$width_choice = 10;
+	}
 
-    return $width_choice;
+	return $width_choice;
 }
 
 /**
@@ -522,18 +522,18 @@ 
  */
 function gdsc_validate_list_filter_choice($filter_choice)
 {
-    $filters = array(
-        'all',
-        'today',
-        'upcoming',
-        'past',
-    );
-
-    if (!(in_array($filter_choice, $filters))) {
-        $filter_choice = 'all';
-    }
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
 
-    return $filter_choice;
+	return $filter_choice;
 }
 
 /**
@@ -555,7 +555,7 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sc_gd_listings_output($args = array()) {
-    $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
+	$title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
 	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
 	$category 			 = !empty($args['category']) ? $args['category'] : '0';
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
@@ -565,17 +565,17 @@ 
 	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
 	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
 	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
-    $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
-    $tags                = !empty($args['tags']) ? $args['tags'] : array();
-    /**
-     * Filter the content text displayed when no listings found.
-     *
-     * @since 1.6.0
-     *
-     * @param string $shortcode_content The shortcode content text.
-     * @param array $args Array of arguements to filter listings.
-     */
-    $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
+	$shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
+	$tags                = !empty($args['tags']) ? $args['tags'] : array();
+	/**
+	 * Filter the content text displayed when no listings found.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @param string $shortcode_content The shortcode content text.
+	 * @param array $args Array of arguements to filter listings.
+	 */
+	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
 	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
@@ -587,92 +587,92 @@ 
 	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
-        'posts_per_page' => $post_number,
-        'is_geodir_loop' => true,
-        'gd_location' => $add_location_filter,
-        'post_type' => $post_type,
-        'order_by' => $list_sort,
+		'posts_per_page' => $post_number,
+		'is_geodir_loop' => true,
+		'gd_location' => $add_location_filter,
+		'post_type' => $post_type,
+		'order_by' => $list_sort,
 		'pageno' => $pageno
-    );
+	);
 
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
     
-    if (!empty($args['post_author'])) {
-        $query_args['post_author'] = $args['post_author'];
-    }
+	if (!empty($args['post_author'])) {
+		$query_args['post_author'] = $args['post_author'];
+	}
 
-    if (!empty($args['show_featured_only'])) {
-        $query_args['show_featured_only'] = 1;
-    }
+	if (!empty($args['show_featured_only'])) {
+		$query_args['show_featured_only'] = 1;
+	}
 
-    if (!empty($args['show_special_only'])) {
-        $query_args['show_special_only'] = 1;
-    }
+	if (!empty($args['show_special_only'])) {
+		$query_args['show_special_only'] = 1;
+	}
 
-    if (!empty($args['with_pics_only'])) {
-        $query_args['with_pics_only'] = 0;
-        $query_args['featured_image_only'] = 1;
-    }
+	if (!empty($args['with_pics_only'])) {
+		$query_args['with_pics_only'] = 0;
+		$query_args['featured_image_only'] = 1;
+	}
 
-    if (!empty($args['with_videos_only'])) {
-        $query_args['with_videos_only'] = 1;
-    }
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
     
-    if (!empty($args['show_favorites_only'])) {
-        $query_args['show_favorites_only'] = 1;
-        $query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['show_favorites_only'])) {
+		$query_args['show_favorites_only'] = 1;
+		$query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
+	}
+	$with_no_results = !empty($args['without_no_results']) ? false : true;
 
-    if (!empty($category) && isset($category[0]) && $category[0] != '0') {
-        $category_taxonomy = geodir_get_taxonomies($post_type);
+	if (!empty($category) && isset($category[0]) && $category[0] != '0') {
+		$category_taxonomy = geodir_get_taxonomies($post_type);
 
-        ######### WPML #########
-        if (function_exists('icl_object_id')) {
-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);
-        }
-        ######### WPML #########
+		######### WPML #########
+		if (function_exists('icl_object_id')) {
+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);
+		}
+		######### WPML #########
 
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $category
-        );
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $category
+		);
 
-        $query_args['tax_query'] = array($tax_query);
-    }
+		$query_args['tax_query'] = array($tax_query);
+	}
     
-    if (!empty($tags)) {
-        // Clean tags
-        if (!is_array($tags)) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $tags = str_replace($comma, ',', $tags);
-            }
-            $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
-            $tags = array_map('trim', $tags);
-        }
+	if (!empty($tags)) {
+		// Clean tags
+		if (!is_array($tags)) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$tags = str_replace($comma, ',', $tags);
+			}
+			$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
+			$tags = array_map('trim', $tags);
+		}
         
-        if (!empty($tags)) {
-            $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
-                'field' => 'name',
-                'terms' => $tags
-            );
-
-            if (!empty($query_args['tax_query'])) {
-                $query_args['tax_query'][] = $tag_query;
-            } else {
-                $query_args['tax_query'] = array($tag_query);
-            }
-        }
-    }
+		if (!empty($tags)) {
+			$tag_query = array(
+				'taxonomy' => $post_type . '_tags',
+				'field' => 'name',
+				'terms' => $tags
+			);
+
+			if (!empty($query_args['tax_query'])) {
+				$query_args['tax_query'][] = $tag_query;
+			} else {
+				$query_args['tax_query'] = array($tag_query);
+			}
+		}
+	}
 
-    global $gridview_columns_widget, $geodir_is_widget_listing;
+	global $gridview_columns_widget, $geodir_is_widget_listing;
 
-    if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
+	if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
 		global $geodir_event_widget_listview;
 		$geodir_event_widget_listview = true;
 		
@@ -687,16 +687,16 @@ 
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
-    ob_start();
+	$identifier = ' gd-wgt-pagi-' . mt_rand();
+	ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
-        /**
-         * Called before the shortcode [gd_listings] content is output.
-         *
-         * @since 1.0.0
-         */
-        do_action('geodir_before_sc_gd_listings');
+		/**
+		 * Called before the shortcode [gd_listings] content is output.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action('geodir_before_sc_gd_listings');
 		?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
             <?php if ($title != '') { ?>
@@ -707,63 +707,63 @@ 
             <div class="gd-sc-loader">
                 <div class="gd-sc-content">
             <?php }
-            if (!(empty($widget_listings) && !empty($shortcode_content))) {
-                if (strstr($layout, 'gridview')) {
-                    $listing_view_exp = explode('_', $layout);
-                    $gridview_columns_widget = $layout;
-                    $layout = $listing_view_exp[0];
-                } else {
-                    $gridview_columns_widget = '';
-                }
-
-                /**
-                 * Filter the widget listing listview template.
-                 *
-                 * @since 1.0.0
-                 *
-                 * @param string The template file to display listing.
-                 */
-                $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+			if (!(empty($widget_listings) && !empty($shortcode_content))) {
+				if (strstr($layout, 'gridview')) {
+					$listing_view_exp = explode('_', $layout);
+					$gridview_columns_widget = $layout;
+					$layout = $listing_view_exp[0];
+				} else {
+					$gridview_columns_widget = '';
+				}
+
+				/**
+				 * Filter the widget listing listview template.
+				 *
+				 * @since 1.0.0
+				 *
+				 * @param string The template file to display listing.
+				 */
+				$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
                             
-                global $post, $map_jason, $map_canvas_arr, $gd_session;
-
-                $current_post = $post;
-                $current_map_jason = $map_jason;
-                $current_map_canvas_arr = $map_canvas_arr;
-                $geodir_is_widget_listing = true;
-                $gd_session->un_set('gd_listing_view');
-
-                if ($with_pagination && $top_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                /**
-                 * Includes listing listview template.
-                 *
-                 * @since 1.0.0
-                 */
-                include($template);
+				global $post, $map_jason, $map_canvas_arr, $gd_session;
+
+				$current_post = $post;
+				$current_map_jason = $map_jason;
+				$current_map_canvas_arr = $map_canvas_arr;
+				$geodir_is_widget_listing = true;
+				$gd_session->un_set('gd_listing_view');
+
+				if ($with_pagination && $top_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				/**
+				 * Includes listing listview template.
+				 *
+				 * @since 1.0.0
+				 */
+				include($template);
                 
-                if ($with_pagination && $bottom_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                $geodir_is_widget_listing = false;
-
-                $GLOBALS['post'] = $current_post;
-                if (!empty($current_post)) {
-                    setup_postdata($current_post);
-                }
-                $map_jason = $current_map_jason;
-                $map_canvas_arr = $current_map_canvas_arr;
-                global $gridview_columns_widget;
-                $gridview_columns_widget = $current_gridview_columns_widget;
-            } else {
-                echo $shortcode_content;
-            }
+				if ($with_pagination && $bottom_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				$geodir_is_widget_listing = false;
+
+				$GLOBALS['post'] = $current_post;
+				if (!empty($current_post)) {
+					setup_postdata($current_post);
+				}
+				$map_jason = $current_map_jason;
+				$map_canvas_arr = $current_map_canvas_arr;
+				global $gridview_columns_widget;
+				$gridview_columns_widget = $current_gridview_columns_widget;
+			} else {
+				echo $shortcode_content;
+			}
 			?>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
@@ -801,10 +801,10 @@ 
             loading.hide();
             jQuery(items).html(response);
             <?php
-              /**
-               * if lazyload images enabled then refresh them once ajax page changed.
-               */
-              if (get_option('geodir_lazy_load', 1)) { ?>
+			  /**
+			   * if lazyload images enabled then refresh them once ajax page changed.
+			   */
+			  if (get_option('geodir_lazy_load', 1)) { ?>
               geodir_init_lazy_load();
               <?php } ?>
         }
@@ -814,11 +814,11 @@ 
 </div>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -845,15 +845,15 @@ 
  * @return string Listings pagination HTML content.
  */
 function geodir_sc_listings_pagination($total_posts, $posts_per_page, $pageno, $before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
 	$numposts = $total_posts;
 
@@ -886,7 +886,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -909,9 +909,9 @@ 
 		echo "</div> $after </div>";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -922,10 +922,10 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sclistings_callback() {
-    check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
-    //set variables
-    $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
-    $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
+	check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
+	//set variables
+	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
+	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
 	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
@@ -937,7 +937,7 @@ 
 	} else {
 		echo 0;
 	}
-    wp_die();
+	wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');
 add_action('wp_ajax_nopriv_geodir_sclistings', 'geodir_sclistings_callback');
\ No newline at end of file

geodirectory_shortcodes.php

Indentation +890 added lines, -890 removed lines

@@ -7,7 +7,7 @@ 
  */
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 require_once('geodirectory-functions/shortcode_functions.php');
 
@@ -32,43 +32,43 @@ 
  */
 function geodir_sc_add_listing($atts)
 {
-    ob_start();
-    $defaults = array(
-        'pid' => '',
-        'listing_type' => 'gd_place',
-        'login_msg' => __('You must login to post.', 'geodirectory'),
-        'show_login' => false,
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    foreach ($params as $key => $value) {
-        $_REQUEST[$key] = $value;
-    }
-
-    $user_id = get_current_user_id();
-    if (!$user_id) {
-        echo $params['login_msg'];
-        if ($params['show_login']) {
-            echo "<br />";
-            $defaults = array(
-                'before_widget' => '',
-                'after_widget' => '',
-                'before_title' => '',
-                'after_title' => '',
-            );
-
-            geodir_loginwidget_output($defaults, $defaults);
-        }
-
-
-    } else {
-       // Add listing page will be used if shortcode is detected in page content, no need to call it here
-    }
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	$defaults = array(
+		'pid' => '',
+		'listing_type' => 'gd_place',
+		'login_msg' => __('You must login to post.', 'geodirectory'),
+		'show_login' => false,
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	foreach ($params as $key => $value) {
+		$_REQUEST[$key] = $value;
+	}
+
+	$user_id = get_current_user_id();
+	if (!$user_id) {
+		echo $params['login_msg'];
+		if ($params['show_login']) {
+			echo "<br />";
+			$defaults = array(
+				'before_widget' => '',
+				'after_widget' => '',
+				'before_title' => '',
+				'after_title' => '',
+			);
+
+			geodir_loginwidget_output($defaults, $defaults);
+		}
+
+
+	} else {
+	   // Add listing page will be used if shortcode is detected in page content, no need to call it here
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -96,136 +96,136 @@ 
  */
 function geodir_sc_home_map($atts)
 {
-    ob_start();
-    $defaults = array(
-        'width' => '960',
-        'height' => '425',
-        'maptype' => 'ROADMAP',
-        'zoom' => '13',
-        'autozoom' => '',
-        'child_collapse' => '0',
-        'scrollwheel' => '0',
+	ob_start();
+	$defaults = array(
+		'width' => '960',
+		'height' => '425',
+		'maptype' => 'ROADMAP',
+		'zoom' => '13',
+		'autozoom' => '',
+		'child_collapse' => '0',
+		'scrollwheel' => '0',
 		'marker_cluster' => false,
-        'latitude' => '',
-        'longitude' => ''
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_home_map',
-        'latitude' => $params['latitude'],
-        'longitude' => $params['longitude'],
-
-        /**
-         * Filter the widget width of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['width'] The map width.
-         */
-        'width' => apply_filters('widget_width', $params['width']),
-        /**
-         * Filter the widget height of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['height'] The map height.
-         */
-        'height' => apply_filters('widget_heigh', $params['height']),
-        /**
-         * Filter the widget maptype of the map on home/listings page.
-         *
-         * @since 1.0.0
+		'latitude' => '',
+		'longitude' => ''
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_home_map',
+		'latitude' => $params['latitude'],
+		'longitude' => $params['longitude'],
+
+		/**
+		 * Filter the widget width of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['width'] The map width.
+		 */
+		'width' => apply_filters('widget_width', $params['width']),
+		/**
+		 * Filter the widget height of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['height'] The map height.
+		 */
+		'height' => apply_filters('widget_heigh', $params['height']),
+		/**
+		 * Filter the widget maptype of the map on home/listings page.
+		 *
+		 * @since 1.0.0
 		 * @since 1.5.2 Added TERRAIN map type.
-         * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
-         */
-        'maptype' => apply_filters('widget_maptype', $params['maptype']),
-        /**
-         * Filter the widget scrollwheel value of the map on home/listings page.
-         *
-         * Should the scrollwheel zoom the map or not.
-         *
-         * @since 1.0.0
-         * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
-         */
-        'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
-        /**
-         * Filter the widget zoom level of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param int $params['zoom'] The zoom level of the map. Between 1-19.
-         */
-        'zoom' => apply_filters('widget_zoom', $params['zoom']),
-        /**
-         * Filter the widget auto zoom value of the map on home/listings page.
-         *
-         * If the map should autozoom to fit the markers shown.
-         *
-         * @since 1.0.0
-         * @param bool $params['autozoom'] True if the map should autozoom, false if not.
-         */
-        'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
-        /**
-         * Filter the widget child_collapse value of the map on home/listings page.
-         *
-         * If the map should auto collapse the child categories if the category bar is present.
-         *
-         * @since 1.0.0
-         * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
-         */
-        'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
-        'enable_cat_filters' => true,
-        'enable_text_search' => true,
-        'enable_post_type_filters' => true,
-        /**
-         * Filter the widget enable_location_filters value of the map on home/listings page.
-         *
-         * This is used when the location addon is used.
-         *
-         * @since 1.0.0
-         * @param bool $val True if location filters should be used, false if not.
-         */
-        'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
-        'enable_jason_on_load' => false,
-        'enable_marker_cluster' => false,
-        'enable_map_resize_button' => true,
-        'map_class_name' => 'geodir-map-home-page',
-        'is_geodir_home_map_widget' => true,
-    );
+		 * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
+		 */
+		'maptype' => apply_filters('widget_maptype', $params['maptype']),
+		/**
+		 * Filter the widget scrollwheel value of the map on home/listings page.
+		 *
+		 * Should the scrollwheel zoom the map or not.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
+		 */
+		'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
+		/**
+		 * Filter the widget zoom level of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param int $params['zoom'] The zoom level of the map. Between 1-19.
+		 */
+		'zoom' => apply_filters('widget_zoom', $params['zoom']),
+		/**
+		 * Filter the widget auto zoom value of the map on home/listings page.
+		 *
+		 * If the map should autozoom to fit the markers shown.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['autozoom'] True if the map should autozoom, false if not.
+		 */
+		'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
+		/**
+		 * Filter the widget child_collapse value of the map on home/listings page.
+		 *
+		 * If the map should auto collapse the child categories if the category bar is present.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
+		 */
+		'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
+		'enable_cat_filters' => true,
+		'enable_text_search' => true,
+		'enable_post_type_filters' => true,
+		/**
+		 * Filter the widget enable_location_filters value of the map on home/listings page.
+		 *
+		 * This is used when the location addon is used.
+		 *
+		 * @since 1.0.0
+		 * @param bool $val True if location filters should be used, false if not.
+		 */
+		'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
+		'enable_jason_on_load' => false,
+		'enable_marker_cluster' => false,
+		'enable_map_resize_button' => true,
+		'map_class_name' => 'geodir-map-home-page',
+		'is_geodir_home_map_widget' => true,
+	);
 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-        $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
-            if ($map_args['autozoom']) {
-                $map_args['enable_marker_cluster_no_reposition'] = false;
-            } else {
-                $map_args['enable_marker_cluster_no_reposition'] = true;
-            }
+		$map_args['enable_marker_cluster'] = true;
+		if(get_option('geodir_marker_cluster_type')) {
+			if ($map_args['autozoom']) {
+				$map_args['enable_marker_cluster_no_reposition'] = false;
+			} else {
+				$map_args['enable_marker_cluster_no_reposition'] = true;
+			}
 
-            $map_args['enable_marker_cluster_server'] = true ;
+			$map_args['enable_marker_cluster_server'] = true ;
 
-        }
+		}
 	} else {
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
-        $map_args['enable_marker_cluster_no_reposition'] = true;
-    }
+	// if lat and long set in shortcode, hack it so the map is not repositioned
+	if(!empty($params['latitude']) && !empty($params['longitude']) ){
+		$map_args['enable_marker_cluster_no_reposition'] = true;
+	}
 
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    add_action('wp_footer', 'geodir_home_map_add_script', 100);
+	add_action('wp_footer', 'geodir_home_map_add_script', 100);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_homepage_map', 'geodir_sc_home_map');
 
@@ -264,243 +264,243 @@ 
  */
 function geodir_sc_listing_map($atts) {
 
-    // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
-
-        global $add_post_in_marker_array, $gd_sc_map_params;
-        $backup_globals                             = array();
-        $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
-        $backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
-
-        $defaults = array(
-            'width'          => '294',
-            'height'         => '370',
-            'zoom'           => '13',
-            'autozoom'       => '',
-            'sticky'         => '',
-            'showall'        => '0',
-            'scrollwheel'    => '0',
-            'maptype'        => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false,
-            'post_type'      => 'gd_place',
-            'category'       => '0',
-            'event_type'     => 'all'
-        );
-
-        $params = shortcode_atts( $defaults, $atts );
-
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
-            $params['post_type'] = 'gd_place';
-        }
-
-        // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
-            'orderby' => 'count',
-            'order'   => 'DESC',
-            'fields'  => 'ids'
-        ) );
-
-        // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
-        }
-
-        // Array_intersect returns only the items in $params['category'] that are also in our category list
-        // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
-
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
-        }
-
-        $params = gdsc_validate_map_args( $params );
-
-        $gd_sc_map_params = $params;
-
-        $query_args = array(
-            'posts_per_page' => 1000000, //@todo kiran why was this added? 
-            'is_geodir_loop' => true,
-            'gd_location'    => false,
-            'post_type'      => $params['post_type'],
-        );
-
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-
-            ######### WPML #########
-            if ( function_exists( 'icl_object_id' ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
-            }
-            ######### WPML #########
-
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field'    => 'id',
-                'terms'    => $params['category']
-            );
-
-            $query_args['tax_query'] = array( $tax_query );
-        }
-
-        $add_post_in_marker_array = true;
-
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
-            global $geodir_event_widget_listview;
-            $geodir_event_widget_listview = true;
-
-            $query_args['geodir_event_type'] = $params['event_type'];
-
-            $listings = geodir_event_get_widget_events( $query_args );
-
-            $geodir_event_widget_listview = false;
-        } else {
-            $listings = geodir_get_widget_listings( $query_args );
-        }
-
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
-            }
-        }
-
-        ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
-
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
-
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
-
-        $default_location = geodir_get_default_location();
-
-        $map_args = array(
-            'map_canvas_name'          => 'gd_listing_map',
-            'width'                    => $params['width'],
-            'height'                   => $params['height'],
-            'zoom'                     => $params['zoom'],
-            'autozoom'                 => $params['autozoom'],
-            'sticky'                   => $params['sticky'],
-            'showall'                  => $params['showall'],
-            'scrollwheel'              => $params['scrollwheel'],
-            'maptype'                  => $params['maptype'],
-            'child_collapse'           => 0,
-            'enable_cat_filters'       => false,
-            'enable_text_search'       => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters'  => false,
-            'enable_jason_on_load'     => true,
-            'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
-            'streetViewControl'        => true,
-            'showPreview'              => '0',
-            'maxZoom'                  => 21,
-            'bubble_size'              => 'small',
-        );
-
-        if ( is_single() ) {
-            global $post;
-            if ( isset( $post->post_latitude ) ) {
-                $map_args['latitude']  = $post->post_latitude;
-                $map_args['longitude'] = $post->post_longitude;
-            }
-
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-
-        // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-
-        geodir_draw_map( $map_args );
-
-        $output = ob_get_contents();
-
-        ob_end_clean();
-
-        foreach ( $backup_globals as $global => $value ) {
-            ${$global} = $value;
-        }
-
-        return $output;
-    }else{
-        ob_start();
-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
-        $defaults = array(
-            'width' => '294',
-            'height' => '370',
-            'zoom' => '13',
-            'autozoom' => '',
-            'sticky' => '',
-            'showall' => '0',
-            'scrollwheel' => '0',
-            'maptype' => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false
-        );
-        $params = shortcode_atts($defaults, $atts);
-        $params = gdsc_validate_map_args($params);
-        $map_args = array(
-            'map_canvas_name' => 'gd_listing_map',
-            'width' => $params['width'],
-            'height' => $params['height'],
-            'zoom' => $params['zoom'],
-            'autozoom' => $params['autozoom'],
-            'sticky' => $params['sticky'],
-            'showall' => $params['showall'],
-            'scrollwheel' => $params['scrollwheel'],
-            'child_collapse' => 0,
-            'enable_cat_filters' => false,
-            'enable_text_search' => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters' => false,
-            'enable_jason_on_load' => true,
-        );
-        if (is_single()) {
-            global $post;
-            $map_default_lat = $address_latitude = $post->post_latitude;
-            $map_default_lng = $address_longitude = $post->post_longitude;
-            $mapview = $post->post_mapview;
-            $map_args['zoom'] = $post->post_mapzoom;
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $default_location = geodir_get_default_location();
-            $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-        if (empty($mapview)) {
-            $mapview = 'ROADMAP';
-        }
-        // Set default map options
-        $map_args['ajax_url'] = geodir_get_ajax_url();
-        $map_args['latitude'] = $map_default_lat;
-        $map_args['longitude'] = $map_default_lng;
-        $map_args['streetViewControl'] = true;
-        $map_args['maptype'] = $mapview;
-        $map_args['showPreview'] = '0';
-        $map_args['maxZoom'] = 21;
-        $map_args['bubble_size'] = 'small';
-
-        // Add marker cluster
-        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-        geodir_draw_map($map_args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        return $output;
-    }
+	// if some params are set then we need a new query, if not then we can use the main query
+	if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+
+		global $add_post_in_marker_array, $gd_sc_map_params;
+		$backup_globals                             = array();
+		$backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
+		$backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
+
+		$defaults = array(
+			'width'          => '294',
+			'height'         => '370',
+			'zoom'           => '13',
+			'autozoom'       => '',
+			'sticky'         => '',
+			'showall'        => '0',
+			'scrollwheel'    => '0',
+			'maptype'        => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false,
+			'post_type'      => 'gd_place',
+			'category'       => '0',
+			'event_type'     => 'all'
+		);
+
+		$params = shortcode_atts( $defaults, $atts );
+
+		if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+			$params['post_type'] = 'gd_place';
+		}
+
+		// Validate the selected category/ies - Grab the current list based on post_type
+		$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+		$categories        = get_terms( $category_taxonomy, array(
+			'orderby' => 'count',
+			'order'   => 'DESC',
+			'fields'  => 'ids'
+		) );
+
+		// Make sure we have an array
+		if ( ! ( is_array( $params['category'] ) ) ) {
+			$params['category'] = explode( ',', $params['category'] );
+		}
+
+		// Array_intersect returns only the items in $params['category'] that are also in our category list
+		// Otherwise it becomes empty and later on that will mean "All"
+		$params['category'] = array_intersect( $params['category'], $categories );
+
+		if ( $params['post_type'] == 'gd_event' ) {
+			$params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+		}
+
+		$params = gdsc_validate_map_args( $params );
+
+		$gd_sc_map_params = $params;
+
+		$query_args = array(
+			'posts_per_page' => 1000000, //@todo kiran why was this added? 
+			'is_geodir_loop' => true,
+			'gd_location'    => false,
+			'post_type'      => $params['post_type'],
+		);
+
+		if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
+			$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+
+			######### WPML #########
+			if ( function_exists( 'icl_object_id' ) ) {
+				$category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+			}
+			######### WPML #########
+
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field'    => 'id',
+				'terms'    => $params['category']
+			);
+
+			$query_args['tax_query'] = array( $tax_query );
+		}
+
+		$add_post_in_marker_array = true;
+
+		if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+			global $geodir_event_widget_listview;
+			$geodir_event_widget_listview = true;
+
+			$query_args['geodir_event_type'] = $params['event_type'];
+
+			$listings = geodir_event_get_widget_events( $query_args );
+
+			$geodir_event_widget_listview = false;
+		} else {
+			$listings = geodir_get_widget_listings( $query_args );
+		}
+
+		if ( ! empty( $listings ) ) {
+			foreach ( $listings as $listing ) {
+				create_marker_jason_of_posts( $listing );
+			}
+		}
+
+		ob_start();
+		add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+
+		add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+
+		add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+
+		$default_location = geodir_get_default_location();
+
+		$map_args = array(
+			'map_canvas_name'          => 'gd_listing_map',
+			'width'                    => $params['width'],
+			'height'                   => $params['height'],
+			'zoom'                     => $params['zoom'],
+			'autozoom'                 => $params['autozoom'],
+			'sticky'                   => $params['sticky'],
+			'showall'                  => $params['showall'],
+			'scrollwheel'              => $params['scrollwheel'],
+			'maptype'                  => $params['maptype'],
+			'child_collapse'           => 0,
+			'enable_cat_filters'       => false,
+			'enable_text_search'       => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters'  => false,
+			'enable_jason_on_load'     => true,
+			'ajax_url'                 => geodir_get_ajax_url(),
+			'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
+			'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+			'streetViewControl'        => true,
+			'showPreview'              => '0',
+			'maxZoom'                  => 21,
+			'bubble_size'              => 'small',
+		);
+
+		if ( is_single() ) {
+			global $post;
+			if ( isset( $post->post_latitude ) ) {
+				$map_args['latitude']  = $post->post_latitude;
+				$map_args['longitude'] = $post->post_longitude;
+			}
+
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+
+		// Add marker cluster
+		if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+
+		geodir_draw_map( $map_args );
+
+		$output = ob_get_contents();
+
+		ob_end_clean();
+
+		foreach ( $backup_globals as $global => $value ) {
+			${$global} = $value;
+		}
+
+		return $output;
+	}else{
+		ob_start();
+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array
+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
+		$defaults = array(
+			'width' => '294',
+			'height' => '370',
+			'zoom' => '13',
+			'autozoom' => '',
+			'sticky' => '',
+			'showall' => '0',
+			'scrollwheel' => '0',
+			'maptype' => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false
+		);
+		$params = shortcode_atts($defaults, $atts);
+		$params = gdsc_validate_map_args($params);
+		$map_args = array(
+			'map_canvas_name' => 'gd_listing_map',
+			'width' => $params['width'],
+			'height' => $params['height'],
+			'zoom' => $params['zoom'],
+			'autozoom' => $params['autozoom'],
+			'sticky' => $params['sticky'],
+			'showall' => $params['showall'],
+			'scrollwheel' => $params['scrollwheel'],
+			'child_collapse' => 0,
+			'enable_cat_filters' => false,
+			'enable_text_search' => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters' => false,
+			'enable_jason_on_load' => true,
+		);
+		if (is_single()) {
+			global $post;
+			$map_default_lat = $address_latitude = $post->post_latitude;
+			$map_default_lng = $address_longitude = $post->post_longitude;
+			$mapview = $post->post_mapview;
+			$map_args['zoom'] = $post->post_mapzoom;
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$default_location = geodir_get_default_location();
+			$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+		if (empty($mapview)) {
+			$mapview = 'ROADMAP';
+		}
+		// Set default map options
+		$map_args['ajax_url'] = geodir_get_ajax_url();
+		$map_args['latitude'] = $map_default_lat;
+		$map_args['longitude'] = $map_default_lng;
+		$map_args['streetViewControl'] = true;
+		$map_args['maptype'] = $mapview;
+		$map_args['showPreview'] = '0';
+		$map_args['maxZoom'] = 21;
+		$map_args['bubble_size'] = 'small';
+
+		// Add marker cluster
+		if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+		geodir_draw_map($map_args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		return $output;
+	}
 }
 
 add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider');
@@ -533,120 +533,120 @@ 
  */
 function geodir_sc_listing_slider($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'slideshow' => '0',
-        'animation_loop' => 0,
-        'direction_nav' => 0,
-        'slideshow_speed' => 5000,
-        'animation_speed' => 600,
-        'animation' => 'slide',
-        'order_by' => 'latest',
-        'show_title' => '',
-        'show_featured_only' => '',
-        'title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-
-    /*
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'slideshow' => '0',
+		'animation_loop' => 0,
+		'direction_nav' => 0,
+		'slideshow_speed' => 5000,
+		'animation_speed' => 600,
+		'animation' => 'slide',
+		'order_by' => 'latest',
+		'show_title' => '',
+		'show_featured_only' => '',
+		'title' => '',
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+
+	/*
      *
      * Now we begin the validation of the attributes.
      */
-    // Check we have a valid post_type
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Check we have a valid sort_order
-    $params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
-
-    // Match the chosen animation to our options
-    $animation_list = array('slide', 'fade');
-    if (!(in_array($params['animation'], $animation_list))) {
-        $params['animation'] = 'slide';
-    }
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Manage the entered categories
-    if (0 != $params['category'] || '' != $params['category']) {
-        $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
-    }
-    // Convert show_title to a bool
-    $params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
-
-    // Convert show_featured_only to a bool
-    $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
-
-    /*
+	// Check we have a valid post_type
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Check we have a valid sort_order
+	$params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
+
+	// Match the chosen animation to our options
+	$animation_list = array('slide', 'fade');
+	if (!(in_array($params['animation'], $animation_list))) {
+		$params['animation'] = 'slide';
+	}
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Manage the entered categories
+	if (0 != $params['category'] || '' != $params['category']) {
+		$params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
+	}
+	// Convert show_title to a bool
+	$params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
+
+	// Convert show_featured_only to a bool
+	$params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
+
+	/*
      * Hopefully all attributes are now valid, and safe to pass forward
      */
 
-    // redeclare vars after validation
-
-    if (isset($params['direction_nav'])) {
-        $params['directionNav'] = $params['direction_nav'];
-    }
-    if (isset($params['animation_loop'])) {
-        $params['animationLoop'] = $params['animation_loop'];
-    }
-    if (isset($params['slideshow_speed'])) {
-        $params['slideshowSpeed'] = $params['slideshow_speed'];
-    }
-    if (isset($params['animation_speed'])) {
-        $params['animationSpeed'] = $params['animation_speed'];
-    }
-    if (isset($params['order_by'])) {
-        $params['list_sort'] = $params['order_by'];
-    }
-
-    $query_args = array(
-        'post_number' => $params['post_number'],
-        'is_geodir_loop' => true,
-        'post_type' => $params['post_type'],
-        'order_by' => $params['order_by']
-    );
-
-    if (1 == $params['show_featured_only']) {
-        $query_args['show_featured_only'] = 1;
-    }
-
-    if (0 != $params['category'] && '' != $params['category']) {
-        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $params['category'],
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
-
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
-
-    $query_args = array_merge($query_args, $params);
-
-    geodir_listing_slider_widget_output($defaults, $query_args);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	// redeclare vars after validation
+
+	if (isset($params['direction_nav'])) {
+		$params['directionNav'] = $params['direction_nav'];
+	}
+	if (isset($params['animation_loop'])) {
+		$params['animationLoop'] = $params['animation_loop'];
+	}
+	if (isset($params['slideshow_speed'])) {
+		$params['slideshowSpeed'] = $params['slideshow_speed'];
+	}
+	if (isset($params['animation_speed'])) {
+		$params['animationSpeed'] = $params['animation_speed'];
+	}
+	if (isset($params['order_by'])) {
+		$params['list_sort'] = $params['order_by'];
+	}
+
+	$query_args = array(
+		'post_number' => $params['post_number'],
+		'is_geodir_loop' => true,
+		'post_type' => $params['post_type'],
+		'order_by' => $params['order_by']
+	);
+
+	if (1 == $params['show_featured_only']) {
+		$query_args['show_featured_only'] = 1;
+	}
+
+	if (0 != $params['category'] && '' != $params['category']) {
+		$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $params['category'],
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
+
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
+
+	$query_args = array_merge($query_args, $params);
+
+	geodir_listing_slider_widget_output($defaults, $query_args);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_login_box', 'geodir_sc_login_box');
@@ -670,22 +670,22 @@ 
  */
 function geodir_sc_login_box($atts)
 {
-    ob_start();
+	ob_start();
 
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
 
-    geodir_loginwidget_output($defaults, $defaults);
+	geodir_loginwidget_output($defaults, $defaults);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category');
@@ -716,31 +716,31 @@ 
  */
 function geodir_sc_popular_post_category($atts)
 {
-    ob_start();
-    global $geodir_post_category_str;
-    $defaults = array(
-        'category_limit' => 15,
-        'category_restrict' => false,
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-        'title' => '',
-        'default_post_type' => '',
-        'parent_only' => false,
-    );
-
-    $params = shortcode_atts($defaults, $atts, 'popular_post_category');
-    $params['category_limit'] = absint($params['category_limit']);
-    $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
-    $params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
-    geodir_popular_post_category_output($params, $params);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'category_restrict' => false,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
+		'default_post_type' => '',
+		'parent_only' => false,
+	);
+
+	$params = shortcode_atts($defaults, $atts, 'popular_post_category');
+	$params['category_limit'] = absint($params['category_limit']);
+	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
+	$params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
+	geodir_popular_post_category_output($params, $params);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -780,97 +780,97 @@ 
  */
 function geodir_sc_popular_post_view($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => '0',
-        'list_sort' => 'latest',
-        'use_viewing_post_type' => '1',
-        'character_count' => '20',
-        'listing_width' => '',
-        'show_featured_only' => '0',
-        'show_special_only' => '0',
-        'with_pics_only' => '0',
-        'with_videos_only' => '0',
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'title' => '',
-        'category_title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => '0',
+		'list_sort' => 'latest',
+		'use_viewing_post_type' => '1',
+		'character_count' => '20',
+		'listing_width' => '',
+		'show_featured_only' => '0',
+		'show_special_only' => '0',
+		'with_pics_only' => '0',
+		'with_videos_only' => '0',
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'title' => '',
+		'category_title' => '',
+	);
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
-    $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
-
-    /**
-     * End of validation
-     */
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Validate our incoming params
+	 */
+
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+	$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
 
-    geodir_popular_postview_output($params, $params);
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category'] = array_intersect($params['category'], $categories);
 
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    $output = ob_get_contents();
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
 
-    ob_end_clean();
+	/**
+	 * End of validation
+	 */
 
-    return $output;
+	geodir_popular_postview_output($params, $params);
+
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -892,37 +892,37 @@ 
  * @return string Recent reviews HTML.
  */
 function geodir_sc_recent_reviews($atts) {
-    ob_start();
-    $defaults = array(
+	ob_start();
+	$defaults = array(
 		'title' => '',
 		'count' => 5,
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts);
+	$params = shortcode_atts($defaults, $atts);
 
-    $count = absint($params['count']);
-    if (0 == $count) {
-        $count = 1;
-    }
+	$count = absint($params['count']);
+	if (0 == $count) {
+		$count = 1;
+	}
 	
 	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
-    $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
+	$comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
-    if ($comments_li) {
-        if ($title != '') { ?>
+	if ($comments_li) {
+		if ($title != '') { ?>
 		<h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3>
 		<?php } ?>
         <div class="geodir_sc_recent_reviews_section">
             <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul>
         </div>
     <?php
-    }
-    $output = ob_get_contents();
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_related_listings', 'geodir_sc_related_listings');
@@ -952,64 +952,64 @@ 
  */
 function geodir_sc_related_listings($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_number' => 5,
-        'relate_to' => 'category',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => 0,
-        'listing_width' => '',
-        'list_sort' => 'latest',
-        'character_count' => 20,
-        'is_widget' => 1,
-        'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
-    );
-    // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Begin validating parameters
-     */
+	ob_start();
+	$defaults = array(
+		'post_number' => 5,
+		'relate_to' => 'category',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => 0,
+		'listing_width' => '',
+		'list_sort' => 'latest',
+		'character_count' => 20,
+		'is_widget' => 1,
+		'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
+	);
+	// The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
 
-    // Validate that post_number is a number and is 1 or higher
-    $params['post_number'] = absint($params['post_number']);
-    if (0 === $params['post_number']) {
-        $params['post_number'] = 1;
-    }
+	$params = shortcode_atts($defaults, $atts);
 
-    // Validate relate_to - only category or tags
-    $params['relate_to'] = geodir_strtolower($params['relate_to']);
-    if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
-        $params['relate_to'] = 'category';
-    }
+	/**
+	 * Begin validating parameters
+	 */
 
-    // Validate layout selection
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
+	// Validate that post_number is a number and is 1 or higher
+	$params['post_number'] = absint($params['post_number']);
+	if (0 === $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    // Validate sorting option
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+	// Validate relate_to - only category or tags
+	$params['relate_to'] = geodir_strtolower($params['relate_to']);
+	if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
+		$params['relate_to'] = 'category';
+	}
+
+	// Validate layout selection
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    // Validate add_location_filter
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	// Validate sorting option
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    // Validate listing_width
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+	// Validate add_location_filter
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
 
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
+	// Validate listing_width
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    if ($related_display = geodir_related_posts_display($params)) {
-        echo $related_display;
-    }
-    $output = ob_get_contents();
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
+
+	if ($related_display = geodir_related_posts_display($params)) {
+		echo $related_display;
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 /**
@@ -1033,13 +1033,13 @@ 
  * @return string Advanced search widget HTML.
  */
 function geodir_sc_advanced_search($atts) {
-    $defaults = array(
+	$defaults = array(
 		'title' => '',
 		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advance_search_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'show_adv_search' => 'default',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'show_adv_search' => 'default',
 		'post_type' => ''
 	);
 	
@@ -1063,9 +1063,9 @@ 
 	the_widget('geodir_advance_search_widget', $params, $params );
 	
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search');
 
@@ -1111,48 +1111,48 @@ 
 		'add_location_filter' => '1',
 		'tab_layout' => 'bestof-tabs-on-top',
 		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 	
 	// Post limit needs to be a positive integer
-    $params['post_limit'] = absint($params['post_limit']);
-    if (0 == $params['post_limit']) {
-        $params['post_limit'] = 5;
-    }
+	$params['post_limit'] = absint($params['post_limit']);
+	if (0 == $params['post_limit']) {
+		$params['post_limit'] = 5;
+	}
 	
 	// Category limit needs to be a positive integer
-    $params['categ_limit'] = absint($params['categ_limit']);
-    if (0 == $params['categ_limit']) {
-        $params['categ_limit'] = 3;
-    }
+	$params['categ_limit'] = absint($params['categ_limit']);
+	if (0 == $params['categ_limit']) {
+		$params['categ_limit'] = 3;
+	}
 	
 	// Tab layout validation
-    $params['tab_layout'] = $params['tab_layout'];
-    if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
-        $params['tab_layout'] = 'bestof-tabs-on-top';
-    }
+	$params['tab_layout'] = $params['tab_layout'];
+	if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
+		$params['tab_layout'] = 'bestof-tabs-on-top';
+	}
 	
 	// Validate character_count
-    $params['character_count'] = $params['character_count'];
+	$params['character_count'] = $params['character_count'];
 
 	ob_start();
 	the_widget('geodir_bestof_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget');
 
@@ -1204,143 +1204,143 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    global $post;
-    $defaults = array(
-        'title'                 => '',
-        'post_type'             => 'gd_place',
-        'category'              => 0,
-        'list_sort'             => 'latest',
-        'event_type'            => '',
-        'post_number'           => 10,
-        'post_author'           => '',
-        'layout'                => 'gridview_onehalf',
-        'listing_width'         => '',
-        'character_count'       => 20,
-        'add_location_filter'   => 1,
-        'show_featured_only'    => '',
-        'show_special_only'     => '',
-        'with_pics_only'        => '',
-        'with_videos_only'      => '',
-        'with_pagination'       => '1',
-        'top_pagination'        => '0',
-        'bottom_pagination'     => '1',
-        'without_no_results'    => 0,
-        'tags'                  => '',
-        'show_favorites_only'   => '',
-        'favorites_by_user'     => '',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    $params['title']        = wp_strip_all_tags($params['title']);
-    $params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy      = geodir_get_taxonomies($params['post_type']);
-    $categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category']     = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number']  = absint($params['post_number']);
-    $params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
+	global $post;
+	$defaults = array(
+		'title'                 => '',
+		'post_type'             => 'gd_place',
+		'category'              => 0,
+		'list_sort'             => 'latest',
+		'event_type'            => '',
+		'post_number'           => 10,
+		'post_author'           => '',
+		'layout'                => 'gridview_onehalf',
+		'listing_width'         => '',
+		'character_count'       => 20,
+		'add_location_filter'   => 1,
+		'show_featured_only'    => '',
+		'show_special_only'     => '',
+		'with_pics_only'        => '',
+		'with_videos_only'      => '',
+		'with_pagination'       => '1',
+		'top_pagination'        => '0',
+		'bottom_pagination'     => '1',
+		'without_no_results'    => 0,
+		'tags'                  => '',
+		'show_favorites_only'   => '',
+		'favorites_by_user'     => '',
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	$params['title']        = wp_strip_all_tags($params['title']);
+	$params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy      = geodir_get_taxonomies($params['post_type']);
+	$categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category']     = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number']  = absint($params['post_number']);
+	$params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
     
-    // Post_number needs to be a positive integer
-    if (!empty($atts['post_author'])) {
-        if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
-            $params['post_author'] = $post->post_author;
-        } else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
-            $params['post_author'] = absint($atts['post_author']);
-        } else {
-            unset($params['post_author']);
-        }
-    } else {
-        unset($params['post_author']);
-    }
-
-    // Validate character_count
-    //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout']           = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
-    $params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
-    $params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
-    $params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
+	// Post_number needs to be a positive integer
+	if (!empty($atts['post_author'])) {
+		if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
+			$params['post_author'] = $post->post_author;
+		} else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
+			$params['post_author'] = absint($atts['post_author']);
+		} else {
+			unset($params['post_author']);
+		}
+	} else {
+		unset($params['post_author']);
+	}
+
+	// Validate character_count
+	//todo: is this necessary?
+	$params['character_count']  = $params['character_count'];
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout']           = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
     
-    // User favorites
-    $params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
-    if (!empty($params['show_favorites_only'])) {
-        if ($params['favorites_by_user'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
-            $params['favorites_by_user'] = $post->post_author;
-        } else if ($params['favorites_by_user'] != 'current' && absint($params['favorites_by_user']) > 0) {
-            $params['favorites_by_user'] = absint($atts['favorites_by_user']);
-        } else if ($params['favorites_by_user'] != 'current' && $current_user_id = get_current_user_id()) {
-            $params['favorites_by_user'] = $current_user_id;
-        } else {
-            $params['favorites_by_user'] = 0;
-        }
-    }
-
-    // Clean tags
-    if (!empty($params['tags'])) {
-        if (!is_array($params['tags'])) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $params['tags'] = str_replace($comma, ',', $params['tags']);
-            }
-            $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
-            $params['tags'] = array_map('trim', $params['tags']);
-        }
-    } else {
-        $params['tags'] = array();
-    }
-
-    /**
-     * End of validation
-     */
-    if (isset($atts['geodir_ajax'])) {
-        $params['geodir_ajax'] = $atts['geodir_ajax'];
-        unset($atts['geodir_ajax']);
-    }
-    if (isset($atts['pageno'])) {
-        $params['pageno'] = $atts['pageno'];
-        unset($atts['pageno']);
-    }
-
-    if ( !empty($atts['shortcode_content']) ) {
-        $content = $atts['shortcode_content'];
-    }
-    $params['shortcode_content'] = trim($content);
-    $atts['shortcode_content'] = trim($content);
+	// User favorites
+	$params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
+	if (!empty($params['show_favorites_only'])) {
+		if ($params['favorites_by_user'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
+			$params['favorites_by_user'] = $post->post_author;
+		} else if ($params['favorites_by_user'] != 'current' && absint($params['favorites_by_user']) > 0) {
+			$params['favorites_by_user'] = absint($atts['favorites_by_user']);
+		} else if ($params['favorites_by_user'] != 'current' && $current_user_id = get_current_user_id()) {
+			$params['favorites_by_user'] = $current_user_id;
+		} else {
+			$params['favorites_by_user'] = 0;
+		}
+	}
+
+	// Clean tags
+	if (!empty($params['tags'])) {
+		if (!is_array($params['tags'])) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$params['tags'] = str_replace($comma, ',', $params['tags']);
+			}
+			$params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
+			$params['tags'] = array_map('trim', $params['tags']);
+		}
+	} else {
+		$params['tags'] = array();
+	}
+
+	/**
+	 * End of validation
+	 */
+	if (isset($atts['geodir_ajax'])) {
+		$params['geodir_ajax'] = $atts['geodir_ajax'];
+		unset($atts['geodir_ajax']);
+	}
+	if (isset($atts['pageno'])) {
+		$params['pageno'] = $atts['pageno'];
+		unset($atts['pageno']);
+	}
+
+	if ( !empty($atts['shortcode_content']) ) {
+		$content = $atts['shortcode_content'];
+	}
+	$params['shortcode_content'] = trim($content);
+	$atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+	$params['shortcode_atts']       = $atts;
 
-    $output = geodir_sc_gd_listings_output($params);
+	$output = geodir_sc_gd_listings_output($params);
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1380,56 +1380,56 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-    $defaults = array(
-        'title' => '',
-        'post_type' => '', // NULL for all
-        'hide_empty' => '',
-        'show_count' => '',
-        'hide_icon' => '',
-        'cpt_left' => '',
-        'sort_by' => 'count',
-        'max_count' => 'all',
-        'max_level' => '1',
-        'no_cpt_filter' => '',
-        'no_cat_filter' => '',
-        'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
-    // Make sure we have an array
-    $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
-     
-    // Validate the checkboxes used on the widget
-    $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
-    $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+	$defaults = array(
+		'title' => '',
+		'post_type' => '', // NULL for all
+		'hide_empty' => '',
+		'show_count' => '',
+		'hide_icon' => '',
+		'cpt_left' => '',
+		'sort_by' => 'count',
+		'max_count' => 'all',
+		'max_level' => '1',
+		'no_cpt_filter' => '',
+		'no_cat_filter' => '',
+		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+	);
+	$params = shortcode_atts($defaults, $atts);
 
-    if ($params['max_count'] != 'all') {
-        $params['max_count'] = absint($params['max_count']);
-    }
+	/**
+	 * Validate our incoming params
+	 */
+	// Make sure we have an array
+	$params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
+     
+	// Validate the checkboxes used on the widget
+	$params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
+	$params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
+	$params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
+	$params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+
+	if ($params['max_count'] != 'all') {
+		$params['max_count'] = absint($params['max_count']);
+	}
 
-    if ($params['max_level'] != 'all') {
-        $params['max_level'] = absint($params['max_level']);
-    }
+	if ($params['max_level'] != 'all') {
+		$params['max_level'] = absint($params['max_level']);
+	}
 
-    $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
-    $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
+	$params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
+	$params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
 
-    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-    ob_start();
-    the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	ob_start();
+	the_widget('geodir_cpt_categories_widget', $params, $params);
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 
@@ -1444,6 +1444,6 @@ 
  * @return string HTML code.
  */
 function geodir_sc_responsive_videos($atts, $content) {
-    return '<div class="geodir-video-wrapper">'.$content.'</div>';
+	return '<div class="geodir-video-wrapper">'.$content.'</div>';
 }
 add_shortcode('gd_video', 'geodir_sc_responsive_videos');
\ No newline at end of file