GeoDirectory / geodirectory

geodirectory-functions/shortcode_functions.php

Doc Comments +1 added lines, -2 removed lines

@@ -46,7 +46,6 @@ 
  * @since 1.0.0
  * @since 1.5.2 Added TERRAIN map type.
  *
- * @param string $value Input value to validate measurement.
  * @return string The measurement valud in valid format.
  */
 function gdsc_validate_map_args($params)
@@ -95,7 +94,7 @@ 
  * @param mixed $in The variable to check
  * @param bool $strict If set to false, consider everything that is not false to be true.
  *
- * @return bool The boolean equivalent or null
+ * @return null|boolean The boolean equivalent or null
  */
 function gdsc_to_bool_val($in, $strict = false)
 {

Spacing +14 added lines, -14 removed lines

@@ -559,19 +559,19 @@ 
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
 	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
 	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
-	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$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'] : '';
+	$character_count = isset($args['character_count']) ? $args['character_count'] : '';
+	$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'] : '';
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+	$bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
 	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
 	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+	$geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
+	$pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
         'posts_per_page' => $post_number,
@@ -722,7 +722,7 @@ 
 			if(!pid > 0 || !(container && typeof container != 'undefined')) {
 			  return false;
 			}
-			var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
+			var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
 			
 			var data = {
 			  'action': 'geodir_sclistings',
@@ -802,7 +802,7 @@ 
 	if ($max_page > 1 || $always_show) {
 		// Extra pagination info
 		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+		$start_no = ($pageno - 1) * $posts_per_page + 1;
 		$end_no = min($pageno * $posts_per_page, $numposts);
 		
 		if ($geodir_pagination_more_info != '') {
@@ -821,7 +821,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-			echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) ($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -829,17 +829,17 @@ 
 				if ($i == $pageno) {
 					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
 				} else {
-					echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$i . ');">' . $i . '</a> ';
+					echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) $i . ');">' . $i . '</a> ';
 				}
 			}
 		}
 		
 		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno + 1) . ');">' . $nxtlabel . '</a>';
+			echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) ($pageno + 1) . ');">' . $nxtlabel . '</a>';
 		}
 		
 		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$max_page . ');">&raquo;</a>';
+			echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) $max_page . ');">&raquo;</a>';
 		}
 		echo "</div> $after";
 	}
@@ -862,7 +862,7 @@ 
     $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;
+	$shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
 	
 	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
 		$shortcode_atts['pageno'] = $pageno;

Indentation +358 added lines, -358 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * All shortcode related functions
- *
- * @since 1.0.0
- *
- * @package GeoDirectory
- */
+	 * All shortcode related functions
+	 *
+	 * @since 1.0.0
+	 *
+	 * @package GeoDirectory
+	 */
  
 // 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);
-    }
-
-    return $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;
 }
 
 /**
@@ -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);
-    }
-
-    return $out;
+	$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;
 }
 
 /**
@@ -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;
-        }
-    }
-
-    return $post_type_found;
+	$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;
 }
 
 /**
@@ -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;
-    }
-
-    return $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;
+	}
+
+	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';
-    }
-
-    return $sort_choice;
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (!(in_array($sort_choice, $sorts))) {
+		$sort_choice = 'latest';
+	}
+
+	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 (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;
-    }
-
-    return $width_choice;
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
+
+	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;
+	}
+
+	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';
-    }
-
-    return $filter_choice;
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
+
+	return $filter_choice;
 }
 
 /**
@@ -553,7 +553,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;
@@ -574,61 +574,61 @@ 
 	$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;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
+	$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);
+	}
 
-    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;
 		
@@ -645,15 +645,15 @@ 
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
 
-    ob_start();
+	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 } ?>
@@ -663,15 +663,15 @@ 
             </div>
 			<?php } ?>
             <?php
-            if (strstr($layout, 'gridview')) {
-                $listing_view_exp = explode('_', $layout);
-                $gridview_columns_widget = $layout;
-                $layout = $listing_view_exp[0];
-            } else {
-                $gridview_columns_widget = '';
-            }
+			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
@@ -680,43 +680,43 @@ 
 			 */
 			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
             			
-            global $post, $map_jason, $map_canvas_arr, $gd_session;
+			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;
+			$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) {				
+			if ($with_pagination && $top_pagination) {				
 				echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
 			}
 
-            /**
-             * Includes listing listview template.
-             *
-             * @since 1.0.0
-             */
+			/**
+			 * 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;
+			$geodir_is_widget_listing = false;
 
-            $GLOBALS['post'] = $current_post;
+			$GLOBALS['post'] = $current_post;
 			if (!empty($current_post)) {
-            	setup_postdata($current_post);
+				setup_postdata($current_post);
 			}
-            $map_jason = $current_map_jason;
-            $map_canvas_arr = $current_map_canvas_arr;
+			$map_jason = $current_map_jason;
+			$map_canvas_arr = $current_map_canvas_arr;
 			global $gridview_columns_widget;
 			$gridview_columns_widget = $current_gridview_columns_widget;
 			?>
 			<p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
         </div>
 		<script type="text/javascript">
@@ -753,11 +753,11 @@ 
 		</script>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -784,15 +784,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;
 
@@ -848,9 +848,9 @@ 
 		echo "</div> $after";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -861,10 +861,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;
 	
@@ -876,7 +876,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-functions/signup_function.php

Doc Comments +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
  * @package GeoDirectory

  * @global object $current_user Current user object.

  * @param bool $redirect Optional. Do you want to redirect to signup page, if user not logged in? Default: false.

- * @return bool

+ * @return null|boolean

  */

 function geodir_is_login($redirect = false)

 {

@@ -69,7 +69,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return string|mixed|void The email ID.

+ * @return string The email ID.

  */

 function geodir_get_site_email_id()

 {

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         if ($redirect) {

             ?>

             <script type="text/javascript">

-                window.location.href = '<?php echo geodir_login_url();?>';

+                window.location.href = '<?php echo geodir_login_url(); ?>';

             </script>

         <?php

         } else

@@ -236,7 +236,7 @@ 
      */

     $message = apply_filters('password_reset_message', $message, $new_pass);

     //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email

 

     return true;

 }

@@ -396,7 +396,7 @@ 
 

         /////////////customer email//////////////

         //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email

         //////REGISTRATION EMAIL END////////

     }

 

@@ -507,7 +507,7 @@ 
                 exit();

             }

 

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+            wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));

             exit();

 

             break;

@@ -725,7 +725,7 @@ 
                 if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

                     wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

                 } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+                    wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));

                 }

                 exit;

             }

Braces +74 added lines, -48 removed lines

@@ -25,11 +25,13 @@ 
                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

-}

+        } else {
+                    return false;
+        }
+    } else {
+            return true;
+    }
+    }

 

 /**

  * Redirect to SSL url, if SSL is being used.

@@ -60,7 +62,9 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) {
+    	echo $message . "\n";
+    }
 

 }

 

@@ -141,14 +145,16 @@ 
     global $wpdb;

 

     $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+    if (empty($_POST['user_login']) && empty($_POST['user_email'])) {
+            $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
+    }
 

     if (strpos($_POST['user_login'], '@')) {

         //$user_data = get_user_by_email(trim($_POST['user_login']));

         $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+        if (empty($user_data)) {
+                    $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
+        }
     } else {

         $login = trim($_POST['user_login']);

         $user_data = get_user_by('email', $login);

@@ -161,8 +167,9 @@ 
      */

     do_action('lostpassword_post');

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

     if (!$user_data) {

         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

@@ -192,8 +199,9 @@ 
         )

     );

 

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+    if (empty($user)) {
+            return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
+    }
 

     $new_pass = wp_generate_password(12, false);

 

@@ -282,13 +290,14 @@ 
     }

 

     // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

+    if ($user_login == '') {
+            $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
+    } elseif (!validate_username($user_login)) {

         $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

         $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+    } elseif (username_exists($user_login)) {
+            $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
+    }
 

     // Check the e-mail address

     if ($user_email == '') {

@@ -296,8 +305,9 @@ 
     } elseif (!is_email($user_email)) {

         $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

         $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+    } elseif (email_exists($user_email)) {
+            $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
+    }
 

     /**

      * Called when registering a new user.

@@ -317,8 +327,9 @@ 
      */

     $errors = apply_filters('registration_errors', $errors);

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

 

     if (!isset($user_pass) || $user_pass == '') {

@@ -423,28 +434,33 @@ 
 

     $errors = new WP_Error();

 

-    if (isset($_GET['key']))

-        $action = 'resetpass';

+    if (isset($_GET['key'])) {
+            $action = 'resetpass';
+    }
 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action)) {
+            $action = 'login';
+    }
 

     nocache_headers();

 

     if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) {
+                    $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);
+        }
 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) {
+                    update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
+        }
     }

 

     //Set a cookie now to see if they are supported by the browser.

     //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+    if (SITECOOKIEPATH != COOKIEPATH) {
+            setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+    }
 

     /**

      * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

@@ -465,8 +481,9 @@ 
 

             $redirect_to = $_SERVER['HTTP_REFERER'];

             //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

+            if (isset($_REQUEST['redirect_to'])) {
+                            $redirect_to = $_REQUEST['redirect_to'];
+            }
             $redirect_to = home_url();

             wp_safe_redirect($redirect_to);

             exit();

@@ -486,7 +503,9 @@ 
                     exit();

                 }

             }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) {
+            	$errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
+            }
         /**

          * Called in the geodir_user_signup() function during the lostpassword case.

          *

@@ -582,8 +601,9 @@ 
                     }

 

 

-                    if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

+                    if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                                            $secure_cookie = false;
+                    }
 

                     $user = wp_signon('', $secure_cookie);

 

@@ -652,22 +672,26 @@ 
                     $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

 

                     $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

+                else {
+                	:

+                    $_REQUEST['redirect_to'] = home_url();
+                }
                 endif;

 

             }

             if (isset($_REQUEST['redirect_to'])) {

                 $redirect_to = $_REQUEST['redirect_to'];

                 // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) {
+                                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+                }
             } else {

                 $redirect_to = admin_url();

             }

 

-            if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

+            if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                            $secure_cookie = false;
+            }
             $user = wp_signon('', $secure_cookie);

 

 

@@ -702,11 +726,13 @@ 
             $errors = $user;

 

             // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

+            if (!empty($_GET['loggedout'])) {
+                            $errors = new WP_Error();
+            }
             // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
+                            $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
+            }
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

Indentation +617 added lines, -617 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Account Signup functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Account Signup functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Check whether the user is logged in or not.

@@ -17,18 +17,18 @@ 
  */

 function geodir_is_login($redirect = false)

 {

-    global $current_user;

-    if (!$current_user->ID) {

-        if ($redirect) {

-            ?>

+	global $current_user;

+	if (!$current_user->ID) {

+		if ($redirect) {

+			?>

             <script type="text/javascript">

                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

+		} else

+			return false;

+	} else

+		return true;

 }

 

 /**

@@ -42,25 +42,25 @@ 
 {

 

 // Redirect to https login if forced to use SSL

-    if (force_ssl_admin() && !is_ssl()) {

-        if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

-            wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

-            exit();

-        } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

-            exit();

-        }

-    }

-

-    /**

-     * Filter the login message.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Login message.

-     */

-    $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+	if (force_ssl_admin() && !is_ssl()) {

+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

+			wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

+			exit();

+		} else {

+			wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+			exit();

+		}

+	}

+

+	/**

+	 * Filter the login message.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Login message.

+	 */

+	$message = apply_filters('login_message', $message);

+	if (!empty($message)) echo $message . "\n";

 

 }

 

@@ -73,59 +73,59 @@ 
  */

 function geodir_get_site_email_id()

 {

-    if (get_option('site_email')) {

+	if (get_option('site_email')) {

 

-        return get_option('site_email');

+		return get_option('site_email');

 

-    } else {

+	} else {

 

-        return get_option('admin_email');

+		return get_option('admin_email');

 

-    }

+	}

 

 }

 

 

 if (!function_exists('get_site_emailName')) {

-    /**

-     * Get site name for sending emails.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Site name.

-     */

-    function get_site_emailName()

+	/**

+	 * Get site name for sending emails.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Site name.

+	 */

+	function get_site_emailName()

 

-    {

+	{

 

-        if (get_option('site_email_name')) {

+		if (get_option('site_email_name')) {

 

-            return stripslashes(get_option('site_email_name'));

+			return stripslashes(get_option('site_email_name'));

 

-        } else {

+		} else {

 

-            return stripslashes(get_option('blogname'));

+			return stripslashes(get_option('blogname'));

 

-        }

+		}

 

-    }

+	}

 }

 

 if (!function_exists('is_allow_user_register')) {

-    /**

-     * Checks whether the site allowing user registration or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool|string

-     */

-    function is_allow_user_register()

+	/**

+	 * Checks whether the site allowing user registration or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool|string

+	 */

+	function is_allow_user_register()

 

-    {

+	{

 

-        return get_option('users_can_register');

+		return get_option('users_can_register');

 

-    }

+	}

 }

 

 /**

@@ -138,107 +138,107 @@ 
  */

 function geodir_retrieve_password()

 {

-    global $wpdb;

-

-    $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

-

-    if (strpos($_POST['user_login'], '@')) {

-        //$user_data = get_user_by_email(trim($_POST['user_login']));

-        $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

-    } else {

-        $login = trim($_POST['user_login']);

-        $user_data = get_user_by('email', $login);

-    }

-

-    /**

-     * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

-     *

-     * @since 1.0.0

-     */

-    do_action('lostpassword_post');

-

-    if ($errors->get_error_code())

-        return $errors;

-

-    if (!$user_data) {

-        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

-        return $errors;

-    }

-

-    // redefining user_login ensures we return the right case in the email

-    $user_login = $user_data->user_login;

-    $user_email = $user_data->user_email;

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param string $user_login The users username.

-     */

-    do_action('retrieve_password', $user_login);

-

-    ////////////////////////////////////

-    $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

-    $user_login = $_POST['user_login'];

-

-    $user = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

-            array($user_login, $user_login)

-        )

-    );

-

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

-

-    $new_pass = wp_generate_password(12, false);

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param object $user The user object.

-     * @param string $new_pass The new pass being sent to the user.

-     */

-    do_action('password_reset', $user, $new_pass);

-

-    wp_set_password($new_pass, $user->ID);

-    update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

-    //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

-    //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

-    $user_email = $user_data->user_email;

-    $user_name = geodir_get_client_name($user->ID);

-    $fromEmail = geodir_get_site_email_id();

-    $fromEmailName = get_site_emailName();

-    $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

-    /**

-     * Filter the password reset email subject part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $title Password reset email subject.

-     */

-    $title = apply_filters('password_reset_title', $title);

-    /**

-     * Filter the password reset email message part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Password reset email message.

-     * @param string $new_pass The new password string.

-     */

-    $message = apply_filters('password_reset_message', $message, $new_pass);

-    //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

-

-    return true;

+	global $wpdb;

+

+	$errors = new WP_Error();

+	if (empty($_POST['user_login']) && empty($_POST['user_email']))

+		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+

+	if (strpos($_POST['user_login'], '@')) {

+		//$user_data = get_user_by_email(trim($_POST['user_login']));

+		$user_data = get_user_by('email', trim($_POST['user_login']));

+		if (empty($user_data))

+			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+	} else {

+		$login = trim($_POST['user_login']);

+		$user_data = get_user_by('email', $login);

+	}

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('lostpassword_post');

+

+	if ($errors->get_error_code())

+		return $errors;

+

+	if (!$user_data) {

+		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

+		return $errors;

+	}

+

+	// redefining user_login ensures we return the right case in the email

+	$user_login = $user_data->user_login;

+	$user_email = $user_data->user_email;

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param string $user_login The users username.

+	 */

+	do_action('retrieve_password', $user_login);

+

+	////////////////////////////////////

+	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

+	$user_login = $_POST['user_login'];

+

+	$user = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

+			array($user_login, $user_login)

+		)

+	);

+

+	if (empty($user))

+		return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+

+	$new_pass = wp_generate_password(12, false);

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param object $user The user object.

+	 * @param string $new_pass The new pass being sent to the user.

+	 */

+	do_action('password_reset', $user, $new_pass);

+

+	wp_set_password($new_pass, $user->ID);

+	update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

+	$message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

+	$message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

+	$message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+	//$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

+	//$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

+	$user_email = $user_data->user_email;

+	$user_name = geodir_get_client_name($user->ID);

+	$fromEmail = geodir_get_site_email_id();

+	$fromEmailName = get_site_emailName();

+	$title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

+	/**

+	 * Filter the password reset email subject part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $title Password reset email subject.

+	 */

+	$title = apply_filters('password_reset_title', $title);

+	/**

+	 * Filter the password reset email message part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Password reset email message.

+	 * @param string $new_pass The new password string.

+	 */

+	$message = apply_filters('password_reset_message', $message, $new_pass);

+	//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

+	geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+

+	return true;

 }

 

 /**

@@ -253,80 +253,80 @@ 
  */

 function geodir_register_new_user($user_login, $user_email)

 {

-    global $wpdb;

-    $errors = new WP_Error();

-

-

-    $user_login = sanitize_user($user_login);

-    $user_login = str_replace(",", "", $user_login);

-    $user_email = str_replace(",", "", $user_email);

-    /**

-     * Filter the user registration email.

-     *

-     * @since 1.0.0

-     *

-     * @param string $user_email User registration email.

-     */

-    $user_email = apply_filters('user_registration_email', $user_email);

-

-

-    if (get_option('geodir_allow_cpass')) {

-        $user_pass = $_REQUEST['user_pass'];

-        $user_pass2 = $_REQUEST['user_pass2'];

-        // Check the password

-        if ($user_pass != $user_pass2) {

-            $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

-        } elseif (strlen($user_pass) < 7) {

-            $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

-        }

-    }

-

-    // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

-        $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

-        $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

-

-    // Check the e-mail address

-    if ($user_email == '') {

-        $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

-    } elseif (!is_email($user_email)) {

-        $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

-        $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

-

-    /**

-     * Called when registering a new user.

-     *

-     * This is a WordPress core hook.

-     *

-     * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

-     * @since 1.0.0

-     */

-    do_action('register_post', $user_login, $user_email, $errors);

-    /**

-     * Filter the registration error messages.

-     *

-     * @since 1.0.0

-     *

-     * @param object $errors Registration error messages.

-     */

-    $errors = apply_filters('registration_errors', $errors);

-

-    if ($errors->get_error_code())

-        return $errors;

-

-

-    if (!isset($user_pass) || $user_pass == '') {

-        $user_pass = wp_generate_password(12, false);

-    }

-    $user_id = wp_create_user($user_login, $user_pass, $user_email);

-    $user_web = '';

-    /*$user_add1 = $_POST['user_add1'];

+	global $wpdb;

+	$errors = new WP_Error();

+

+

+	$user_login = sanitize_user($user_login);

+	$user_login = str_replace(",", "", $user_login);

+	$user_email = str_replace(",", "", $user_email);

+	/**

+	 * Filter the user registration email.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $user_email User registration email.

+	 */

+	$user_email = apply_filters('user_registration_email', $user_email);

+

+

+	if (get_option('geodir_allow_cpass')) {

+		$user_pass = $_REQUEST['user_pass'];

+		$user_pass2 = $_REQUEST['user_pass2'];

+		// Check the password

+		if ($user_pass != $user_pass2) {

+			$errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

+		} elseif (strlen($user_pass) < 7) {

+			$errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

+		}

+	}

+

+	// Check the username

+	if ($user_login == '')

+		$errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

+	elseif (!validate_username($user_login)) {

+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

+		$user_login = '';

+	} elseif (username_exists($user_login))

+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+

+	// Check the e-mail address

+	if ($user_email == '') {

+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

+	} elseif (!is_email($user_email)) {

+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

+		$user_email = '';

+	} elseif (email_exists($user_email))

+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+

+	/**

+	 * Called when registering a new user.

+	 *

+	 * This is a WordPress core hook.

+	 *

+	 * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

+	 * @since 1.0.0

+	 */

+	do_action('register_post', $user_login, $user_email, $errors);

+	/**

+	 * Filter the registration error messages.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param object $errors Registration error messages.

+	 */

+	$errors = apply_filters('registration_errors', $errors);

+

+	if ($errors->get_error_code())

+		return $errors;

+

+

+	if (!isset($user_pass) || $user_pass == '') {

+		$user_pass = wp_generate_password(12, false);

+	}

+	$user_id = wp_create_user($user_login, $user_pass, $user_email);

+	$user_web = '';

+	/*$user_add1 = $_POST['user_add1'];

     $user_add2 = $_POST['user_add2'];

     $user_city = $_POST['user_city'];

     $user_state = $_POST['user_state'];

@@ -335,77 +335,77 @@ 
     $user_web = $_POST['user_web'];

     $user_phone = $_POST['user_phone'];

     $user_twitter = $_POST['user_twitter'];	*/

-    $user_fname = sanitize_user($_POST['user_fname']);

-    $user_fname = str_replace(",", "", $user_fname);

-

-    /**

-     * Filter the submitted user meta.

-     *

-     * @since 1.0.0

-     *

-     * @param int $user_id User ID.

-     */

-    $user_address_info = apply_filters('geodir_manage_user_meta', array(

-        "user_add1" => '',

-        "user_add2" => '',

-        "user_city" => '',

-        "user_state" => '',

-        "user_country" => '',

-        "user_postalcode" => '',

-        "user_phone" => '',

-        "user_twitter" => '',

-        "first_name" => $user_fname,

-        "last_name" => '',

-    ), $user_id);

-    foreach ($user_address_info as $key => $val) {

-        update_user_meta($user_id, $key, $val); // User Address Information Here

-    }

-    //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

-    $userName = $user_fname;

-    update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

-    //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

-

-    // Changed by vikas sharma to enable all type of characters in author permalink...

-    $user_nicename = sanitize_title($userName);

-

-    $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

-

-    $wpdb->query($updateUsersql);

-

-    if (!$user_id) {

-        $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

-        return $errors;

-    }

-    global $upload_folder_path;

-

-    if ($user_id) {

-

-        /**

-         * Called after registering a user and before the registration email is sent.

-         *

-         * @since 1.0.0

-         * @param int $user_id The user ID of the registered user.

-         */

-        do_action('geodir_user_register', $user_id);

-        ///////REGISTRATION EMAIL START//////

-        $fromEmail = geodir_get_site_email_id();

-        $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

+	$user_fname = sanitize_user($_POST['user_fname']);

+	$user_fname = str_replace(",", "", $user_fname);

+

+	/**

+	 * Filter the submitted user meta.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param int $user_id User ID.

+	 */

+	$user_address_info = apply_filters('geodir_manage_user_meta', array(

+		"user_add1" => '',

+		"user_add2" => '',

+		"user_city" => '',

+		"user_state" => '',

+		"user_country" => '',

+		"user_postalcode" => '',

+		"user_phone" => '',

+		"user_twitter" => '',

+		"first_name" => $user_fname,

+		"last_name" => '',

+	), $user_id);

+	foreach ($user_address_info as $key => $val) {

+		update_user_meta($user_id, $key, $val); // User Address Information Here

+	}

+	//update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

+	$userName = $user_fname;

+	update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

+	//update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

+

+	// Changed by vikas sharma to enable all type of characters in author permalink...

+	$user_nicename = sanitize_title($userName);

+

+	$updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

+

+	$wpdb->query($updateUsersql);

+

+	if (!$user_id) {

+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

+		return $errors;

+	}

+	global $upload_folder_path;

+

+	if ($user_id) {

+

+		/**

+		 * Called after registering a user and before the registration email is sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $user_id The user ID of the registered user.

+		 */

+		do_action('geodir_user_register', $user_id);

+		///////REGISTRATION EMAIL START//////

+		$fromEmail = geodir_get_site_email_id();

+		$fromEmailName = get_site_emailName();

+		$message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

 <p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

 <p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

 

-        /////////////customer email//////////////

-        //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

-        //////REGISTRATION EMAIL END////////

-    }

+		/////////////customer email//////////////

+		//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

+		geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+		//////REGISTRATION EMAIL END////////

+	}

 

-    if (get_option('ptthemes_auto_login')) {

-        $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

-        return $errors;

-    }

+	if (get_option('ptthemes_auto_login')) {

+		$errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

+		return $errors;

+	}

 

-    return array($user_id, $user_pass);

+	return array($user_id, $user_pass);

 }

 

 /**

@@ -418,317 +418,317 @@ 
  */

 function geodir_user_signup()

 {

-    global $errors;

-    $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

-

-    $errors = new WP_Error();

-

-    if (isset($_GET['key']))

-        $action = 'resetpass';

-

-    // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

-

-    nocache_headers();

-

-    if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

-

-        $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

-    }

-

-    //Set a cookie now to see if they are supported by the browser.

-    //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

-

-    /**

-     * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

-     *

-     * Used dynamic hook login_form_$action

-     *

-     * @since 1.0.0

-     */

-    do_action('login_form_' . $action);

-

-    $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

-

-    switch ($action):

-

-        case 'logout' :

-            //check_admin_referer('log-out');

-            wp_logout();

-

-            $redirect_to = $_SERVER['HTTP_REFERER'];

-            //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

-            $redirect_to = home_url();

-            wp_safe_redirect($redirect_to);

-            exit();

-

-            break;

-

-        case 'lostpassword' :

-        case 'retrievepassword' :

-            if ($http_post) {

-                $errors = geodir_retrieve_password();

-                $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

-                if (!is_wp_error($errors)) {

-                    wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

-                    gd_die();

-                } else {

-                    wp_redirect(geodir_login_url(array('emsg'=>'fw')));

-                    gd_die();

-                }

-            }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

-        /**

-         * Called in the geodir_user_signup() function during the lostpassword case.

-         *

-         * @since 1.0.0

-         */

-        do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

-            $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

-

-            break;

-

-        case 'resetpass' :

-        case 'rp' :

-            $errors = reset_password($_GET['key'], $_GET['login']);

-

-            if (!is_wp_error($errors)) {

-                wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

-                exit();

-            }

-

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

-            exit();

-

-            break;

-

-        case 'register' :

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            if (!get_option('users_can_register')) {

-                wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

-                exit();

-            }

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            global $user_email, $user_fname;

-            $user_login = '';

-            $user_email = '';

-            if ($http_post) {

-                $user_login = $_POST['user_email'];

-                $user_email = $_POST['user_email'];

-                $user_fname = $_POST['user_fname'];

-

-                $errors = geodir_register_new_user($user_login, $user_email);

-

-                /* display error in registration form */

-                if (is_wp_error($errors)) {

-                    $error_code = $errors->get_error_code();

-                    $error_message = $errors->get_error_message($error_code);

-                    if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

-                        if ($error_code == 'empty_username') {

-                            $error_code = 'empty_email';

-                        } else if ($error_code == 'invalid_username') {

-                            $error_code = 'invalid_email';

-                        } else if ($error_code == 'username_exists') {

-                            $error_code = 'email_exists';

-                        }

-

-                        $error_message = $errors->get_error_message($error_code);

-                    }

-                    global $geodir_signup_error;

-                    $geodir_signup_error = $error_message;

-                }

-

-                if (!is_wp_error($errors)) {

-                    $_POST['log'] = $user_login;

-                    $_POST['pwd'] = $errors[1];

-                    $_POST['testcookie'] = 1;

-

-                    $secure_cookie = '';

-                    // If the user wants ssl but the session is not ssl, force a secure cookie.

-                    if (!empty($_POST['log'])) {

-                        $user_name = sanitize_user($_POST['log']);

-                        if ($user = get_user_by('email', $user_name)) {

-                            if (get_user_option('use_ssl', $user->ID)) {

-                                $secure_cookie = true;

-                                force_ssl_admin(true);

-                            }

-                        }

-                    }

-

-                    $redirect_to = $_REQUEST['redirect_to'];

-

-                    if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                        if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

-                            $redirect_to = $_SERVER['HTTP_REFERER'];

-                        } else {

-                            $redirect_to = home_url();

-                        }

-

-                    }

-

-                    if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

-

-                        $redirect_to = $_REQUEST['redirect_add_listing'];

-                    }

-

-

-                    if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

-

-                    $user = wp_signon('', $secure_cookie);

-

-                    $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

-                    /**

-                     * Filter the login redirect URL.

-                     *

-                     * @since 1.4.9

-                     * @param string $redirect_to The redirect destination URL.

-                     * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

-                     * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-                     */

-                    $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

-

-

-                    if (!is_wp_error($user)) {

-                        wp_safe_redirect($redirect_to);

-                        exit();

-                    }

-                    exit();

-                }

-            }

-

-            break;

-

-        case 'login' :

-        default:

-            $secure_cookie = '';

-

-            if (!empty($_POST['log'])) {

-                $user_name = sanitize_user($_POST['log']);

-                if ($user = get_user_by('login', $user_name)) {

-

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                } elseif ($user = get_user_by('email', $user_name)) {

-                    $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                }

-            }

-            ///////////////////////////

-            if (isset($_REQUEST['redirect_add_listing'])) {

-                $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

-            }

-

-

-            if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                if (is_user_logged_in()) :

-                    $user_ID = isset($user->ID) ? $user->ID : '';

-                    $author_link = get_author_posts_url($user_ID);

-                    $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

-

-                    /**

-                     * Filter the author link.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $default_author_link Default author link.

-                     * @param int $user_ID The user ID.

-                     */

-                    $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

-

-                    $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

-                endif;

-

-            }

-            if (isset($_REQUEST['redirect_to'])) {

-                $redirect_to = $_REQUEST['redirect_to'];

-                // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

-            } else {

-                $redirect_to = admin_url();

-            }

-

-            if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

-            $user = wp_signon('', $secure_cookie);

-

-

-            /**

-             * Filter the login redirect URL.

-             *

-             * @since 1.4.9

-             * @param string $redirect_to The redirect destination URL.

-             * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-             */

-            $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

-

-            if (is_wp_error($user)) {

-                if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

-                }

-            }

-            if (!is_wp_error($user)) {

-

-                // Some servers are not logging the user in properly after wp_signon, se we set the user here.

-                //wp_set_current_user($user->ID);

-                //echo '###';exit;

-

-                if ($redirect_to) {

-                    wp_redirect($redirect_to);

-                } else {

-                    wp_redirect(home_url());

-                }

-                gd_die();

-            }

-

-            $errors = $user;

-

-            // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

-            // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

-

-            // Some parts of this script use the main login form to display a message

-            if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

-            } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

-                $successmsg = USER_REG_NOT_ALLOW_MSG;

-            } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

-                $successmsg = EMAIL_CONFIRM_LINK_MSG;

-            } elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

-                $successmsg = NEW_PW_EMAIL_MSG;

-            } elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

-                $successmsg = REG_COMPLETE_MSG;

-            }

-

-            if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

-                if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

-                } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

-                }

-                gd_die();

-            }

-            break;

-    endswitch; // end action switch

+	global $errors;

+	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

+

+	$errors = new WP_Error();

+

+	if (isset($_GET['key']))

+		$action = 'resetpass';

+

+	// validate action so as to default to the login screen

+	if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+		$action = 'login';

+

+	nocache_headers();

+

+	if (defined('RELOCATE')) { // Move flag is set

+		if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

+			$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+

+		$schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

+		if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

+			update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+	}

+

+	//Set a cookie now to see if they are supported by the browser.

+	//setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

+	if (SITECOOKIEPATH != COOKIEPATH)

+		setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+

+	/**

+	 * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

+	 *

+	 * Used dynamic hook login_form_$action

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('login_form_' . $action);

+

+	$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

+

+	switch ($action):

+

+		case 'logout' :

+			//check_admin_referer('log-out');

+			wp_logout();

+

+			$redirect_to = $_SERVER['HTTP_REFERER'];

+			//$redirect_to = home_url().'/?ptype=login&loggedout=true';

+			if (isset($_REQUEST['redirect_to']))

+				$redirect_to = $_REQUEST['redirect_to'];

+			$redirect_to = home_url();

+			wp_safe_redirect($redirect_to);

+			exit();

+

+			break;

+

+		case 'lostpassword' :

+		case 'retrievepassword' :

+			if ($http_post) {

+				$errors = geodir_retrieve_password();

+				$error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

+				if (!is_wp_error($errors)) {

+					wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

+					gd_die();

+				} else {

+					wp_redirect(geodir_login_url(array('emsg'=>'fw')));

+					gd_die();

+				}

+			}

+			if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+		/**

+		 * Called in the geodir_user_signup() function during the lostpassword case.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('lost_password');

+			$message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+			$user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

+

+			break;

+

+		case 'resetpass' :

+		case 'rp' :

+			$errors = reset_password($_GET['key'], $_GET['login']);

+

+			if (!is_wp_error($errors)) {

+				wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

+				exit();

+			}

+

+			wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+			exit();

+

+			break;

+

+		case 'register' :

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			if (!get_option('users_can_register')) {

+				wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

+				exit();

+			}

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			global $user_email, $user_fname;

+			$user_login = '';

+			$user_email = '';

+			if ($http_post) {

+				$user_login = $_POST['user_email'];

+				$user_email = $_POST['user_email'];

+				$user_fname = $_POST['user_fname'];

+

+				$errors = geodir_register_new_user($user_login, $user_email);

+

+				/* display error in registration form */

+				if (is_wp_error($errors)) {

+					$error_code = $errors->get_error_code();

+					$error_message = $errors->get_error_message($error_code);

+					if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

+						if ($error_code == 'empty_username') {

+							$error_code = 'empty_email';

+						} else if ($error_code == 'invalid_username') {

+							$error_code = 'invalid_email';

+						} else if ($error_code == 'username_exists') {

+							$error_code = 'email_exists';

+						}

+

+						$error_message = $errors->get_error_message($error_code);

+					}

+					global $geodir_signup_error;

+					$geodir_signup_error = $error_message;

+				}

+

+				if (!is_wp_error($errors)) {

+					$_POST['log'] = $user_login;

+					$_POST['pwd'] = $errors[1];

+					$_POST['testcookie'] = 1;

+

+					$secure_cookie = '';

+					// If the user wants ssl but the session is not ssl, force a secure cookie.

+					if (!empty($_POST['log'])) {

+						$user_name = sanitize_user($_POST['log']);

+						if ($user = get_user_by('email', $user_name)) {

+							if (get_user_option('use_ssl', $user->ID)) {

+								$secure_cookie = true;

+								force_ssl_admin(true);

+							}

+						}

+					}

+

+					$redirect_to = $_REQUEST['redirect_to'];

+

+					if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+						if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

+							$redirect_to = $_SERVER['HTTP_REFERER'];

+						} else {

+							$redirect_to = home_url();

+						}

+

+					}

+

+					if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

+

+						$redirect_to = $_REQUEST['redirect_add_listing'];

+					}

+

+

+					if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+						$secure_cookie = false;

+

+					$user = wp_signon('', $secure_cookie);

+

+					$requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

+					/**

+					 * Filter the login redirect URL.

+					 *

+					 * @since 1.4.9

+					 * @param string $redirect_to The redirect destination URL.

+					 * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

+					 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+					 */

+					$redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

+

+

+					if (!is_wp_error($user)) {

+						wp_safe_redirect($redirect_to);

+						exit();

+					}

+					exit();

+				}

+			}

+

+			break;

+

+		case 'login' :

+		default:

+			$secure_cookie = '';

+

+			if (!empty($_POST['log'])) {

+				$user_name = sanitize_user($_POST['log']);

+				if ($user = get_user_by('login', $user_name)) {

+

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				} elseif ($user = get_user_by('email', $user_name)) {

+					$_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				}

+			}

+			///////////////////////////

+			if (isset($_REQUEST['redirect_add_listing'])) {

+				$_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

+			}

+

+

+			if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+				if (is_user_logged_in()) :

+					$user_ID = isset($user->ID) ? $user->ID : '';

+					$author_link = get_author_posts_url($user_ID);

+					$default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

+

+					/**

+					 * Filter the author link.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $default_author_link Default author link.

+					 * @param int $user_ID The user ID.

+					 */

+					$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

+

+					$_REQUEST['redirect_to'] = $default_author_link;

+				else:

+					$_REQUEST['redirect_to'] = home_url();

+				endif;

+

+			}

+			if (isset($_REQUEST['redirect_to'])) {

+				$redirect_to = $_REQUEST['redirect_to'];

+				// Redirect to https if user wants ssl

+				if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+			} else {

+				$redirect_to = admin_url();

+			}

+

+			if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+				$secure_cookie = false;

+			$user = wp_signon('', $secure_cookie);

+

+

+			/**

+			 * Filter the login redirect URL.

+			 *

+			 * @since 1.4.9

+			 * @param string $redirect_to The redirect destination URL.

+			 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+			 */

+			$redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

+

+			if (is_wp_error($user)) {

+				if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

+					wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+				}

+			}

+			if (!is_wp_error($user)) {

+

+				// Some servers are not logging the user in properly after wp_signon, se we set the user here.

+				//wp_set_current_user($user->ID);

+				//echo '###';exit;

+

+				if ($redirect_to) {

+					wp_redirect($redirect_to);

+				} else {

+					wp_redirect(home_url());

+				}

+				gd_die();

+			}

+

+			$errors = $user;

+

+			// Clear errors if loggedout is set.

+			if (!empty($_GET['loggedout']))

+				$errors = new WP_Error();

+			// If cookies are disabled we can't log in even with a valid user+pass

+			if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

+				$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+

+			// Some parts of this script use the main login form to display a message

+			if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

+				$successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+			} elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

+				$successmsg = USER_REG_NOT_ALLOW_MSG;

+			} elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

+				$successmsg = EMAIL_CONFIRM_LINK_MSG;

+			} elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

+				$successmsg = NEW_PW_EMAIL_MSG;

+			} elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

+				$successmsg = REG_COMPLETE_MSG;

+			}

+

+			if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

+				if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

+					wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+				} else {

+					wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+				}

+				gd_die();

+			}

+			break;

+	endswitch; // end action switch

 }
\ No newline at end of file

geodirectory-functions/template_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
  * @global object $post The current post object.

  * @global object $geodirectory Not yet implemented.

  * @param string $slug The template slug.

- * @param null $name The template name.

+ * @param string $name The template name.

  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
                 $listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+				preg_match('/' . $regex_pattern . '/s', $post->post_content, $regex_matches);

 				

 				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

@@ -55,7 +55,7 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

@@ -410,7 +410,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -524,7 +524,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -589,7 +589,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option ' . selected((int) ($i + 1), (int) $default, false) . ' value="' . (int) ($i + 1) . '">' . $text . '</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -618,14 +618,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

Indentation +361 added lines, -361 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Template functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Template functions

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Locates template based on the template type.

@@ -19,18 +19,18 @@ 
  */

 function geodir_locate_template($template = '')

 {

-    global $post_type, $wp, $post;

-    $fields = array();

+	global $post_type, $wp, $post;

+	$fields = array();

 

-    switch ($template):

-        case 'signup':

-            return $template = locate_template(array("geodirectory/geodir-signup.php"));

-            break;

-        case 'add-listing':

+	switch ($template):

+		case 'signup':

+			return $template = locate_template(array("geodirectory/geodir-signup.php"));

+			break;

+		case 'add-listing':

 

-            $sc_post_type = '';

+			$sc_post_type = '';

 			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-                $listing_page_id = $post->ID;

+				$listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

 				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

@@ -39,100 +39,100 @@ 
 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

 					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

 				}

-            } else {

-                $listing_page_id = geodir_add_listing_page_id();

-            }

+			} else {

+				$listing_page_id = geodir_add_listing_page_id();

+			}

 			

 			$is_wpml = function_exists('icl_object_id') ? true : false;

 

-            if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            if (empty($post_type) && !isset($_REQUEST['pid'])) {

-                $pagename = $wp->query_vars['pagename'];

-                $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+			if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			if (empty($post_type) && !isset($_REQUEST['pid'])) {

+				$pagename = $wp->query_vars['pagename'];

+				$post_types = geodir_get_posttypes();

+				if (!empty($post_types))

+					$post_type = $post_types[0];

 					

 				if($sc_post_type != '' )

 					$post_type = $sc_post_type;

 				

-                if ($is_wpml && !empty($wp->query_vars['page_id'])) {

+				if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

 					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

 				}

-                exit();

-            }

-            return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

-            break;

-        case 'success':

-            $success_page_id = geodir_success_page_id();

-            if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

-            break;

-        case 'detail':

-        case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

-            return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

-            break;

-        case 'listing':

-            $templates = array();

-            if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

-                $post_type = get_post_type();

-                $templates[] = "geodirectory/archive-$post_type.php";

-            }

-

-

-            if (is_tax() && geodir_get_taxonomy_posttype()) {

-                $query_obj = get_queried_object();

-                $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

-                $curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

-            }

-

-            $templates[] = "geodirectory/geodir-listing.php";

-

-            return $template = locate_template($templates);

-            break;

-        case 'information':

-            return $template = locate_template(array("geodirectory/geodir-information.php"));

-            break;

-        case 'author':

-            return $template = locate_template(array("geodirectory/geodir-author.php"));

-            break;

-        case 'search':

-            return $template = locate_template(array("geodirectory/geodir-search.php"));

-            break;

-        case 'location':

-            return $template = locate_template(array("geodirectory/geodir-location.php"));

-            break;

-        case 'geodir-home':

-            return $template = locate_template(array("geodirectory/geodir-home.php"));

-            break;

-        case 'listing-listview':

-            $template = locate_template(array("geodirectory/listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

-            }

-            return $template;

-            break;

-        case 'widget-listing-listview':

-            $template = locate_template(array("geodirectory/widget-listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

-            }

-            return $template;

-            break;

-    endswitch;

-

-    return false;

+				exit();

+			}

+			return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

+			break;

+		case 'success':

+			$success_page_id = geodir_success_page_id();

+			if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

+			break;

+		case 'detail':

+		case 'preview':

+			if (in_array(get_post_type(), geodir_get_posttypes()))

+				$post_type = get_post_type();

+			return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

+			break;

+		case 'listing':

+			$templates = array();

+			if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

+				$post_type = get_post_type();

+				$templates[] = "geodirectory/archive-$post_type.php";

+			}

+

+

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

+				$query_obj = get_queried_object();

+				$curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

+				$curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

+			}

+

+			$templates[] = "geodirectory/geodir-listing.php";

+

+			return $template = locate_template($templates);

+			break;

+		case 'information':

+			return $template = locate_template(array("geodirectory/geodir-information.php"));

+			break;

+		case 'author':

+			return $template = locate_template(array("geodirectory/geodir-author.php"));

+			break;

+		case 'search':

+			return $template = locate_template(array("geodirectory/geodir-search.php"));

+			break;

+		case 'location':

+			return $template = locate_template(array("geodirectory/geodir-location.php"));

+			break;

+		case 'geodir-home':

+			return $template = locate_template(array("geodirectory/geodir-home.php"));

+			break;

+		case 'listing-listview':

+			$template = locate_template(array("geodirectory/listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+			}

+			return $template;

+			break;

+		case 'widget-listing-listview':

+			$template = locate_template(array("geodirectory/widget-listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+			}

+			return $template;

+			break;

+	endswitch;

+

+	return false;

 

 }

 

@@ -151,238 +151,238 @@ 
 function geodir_template_loader($template)

 {

 

-    global $wp_query;

-

-    /**

-     * Filter the custom page list.

-     *

-     * @since 1.0.0

-     */

-    $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

-        'geodir_signup_page' =>

-            apply_filters('geodir_set_custom_signup_page', false),

-        'geodir_add_listing_page' =>

-            apply_filters('geodir_set_custom_add_listing_page', false),

-        'geodir_preview_page' =>

-            apply_filters('geodir_set_custom_preview_page', false),

-        'geodir_listing_success_page' =>

-            apply_filters('geodir_set_custom_listing_success_page', false),

-        'geodir_listing_detail_page' =>

-            apply_filters('geodir_set_custom_listing_detail_page', false),

-        'geodir_listing_page' =>

-            apply_filters('geodir_set_custom_listing_page', false),

-        'geodir_search_page' =>

-            apply_filters('geodir_set_custom_search_page', false),

-        'geodir_author_page' =>

-            apply_filters('geodir_set_custom_author_page', false),

-        'geodir_home_map_page' =>

-            apply_filters('geodir_set_custom_home_map_page', false)

-    ));

-

-

-    if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

-

-        $template = geodir_locate_template('signup');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

-

-        /**

-         * Filter the signup template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_signup', $template);

-    }

-

-    if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

-        if (!geodir_is_default_location_set()) {

-            global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

-

-            $template = geodir_locate_template('information');

-

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-            /**

-             * Filter the information template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_information', $template);

-        }

-        // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            global $information;

-            $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

-            $is_current_user_owner = geodir_listing_belong_to_current_user();

-            if (!$is_current_user_owner) {

-                $template = geodir_locate_template('information');

-

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-                /**

-                 * Filter the information template path.

-                 *

-                 * @since 1.0.0

-                 * @param string $template The template path.

-                 */

-                return $template = apply_filters('geodir_template_information', $template);

-            }

-

-

-        }

-

-        //geodir_is_login(true);

-        global $current_user;

-        if (!$current_user->ID) {

-            wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

-            exit;

-        }

-

-        $template = geodir_locate_template('add-listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

-        /**

-         * Filter the add listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_add_listing', $template);

-    }

-

-

-    if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

-        global $preview;

-        $preview = true;

-

-        $template = geodir_locate_template('preview');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the preview template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_preview', $template);

-

-    }

-

-

-    if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

-

-        $template = geodir_locate_template('success');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

-        /**

-         * Filter the success template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_success', $template);

-

-    }

-

-    if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

-

-        $template = geodir_locate_template('detail');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the detail template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_detail', $template);

-

-    }

-

-    if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

-

-        $template = geodir_locate_template('listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

-        /**

-         * Filter the listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_listing', $template);

+	global $wp_query;

+

+	/**

+	 * Filter the custom page list.

+	 *

+	 * @since 1.0.0

+	 */

+	$geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

+		'geodir_signup_page' =>

+			apply_filters('geodir_set_custom_signup_page', false),

+		'geodir_add_listing_page' =>

+			apply_filters('geodir_set_custom_add_listing_page', false),

+		'geodir_preview_page' =>

+			apply_filters('geodir_set_custom_preview_page', false),

+		'geodir_listing_success_page' =>

+			apply_filters('geodir_set_custom_listing_success_page', false),

+		'geodir_listing_detail_page' =>

+			apply_filters('geodir_set_custom_listing_detail_page', false),

+		'geodir_listing_page' =>

+			apply_filters('geodir_set_custom_listing_page', false),

+		'geodir_search_page' =>

+			apply_filters('geodir_set_custom_search_page', false),

+		'geodir_author_page' =>

+			apply_filters('geodir_set_custom_author_page', false),

+		'geodir_home_map_page' =>

+			apply_filters('geodir_set_custom_home_map_page', false)

+	));

+

+

+	if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

+

+		$template = geodir_locate_template('signup');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+

+		/**

+		 * Filter the signup template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_signup', $template);

+	}

 

-    }

+	if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

+		if (!geodir_is_default_location_set()) {

+			global $information;

+			$information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+

+			$template = geodir_locate_template('information');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+			/**

+			 * Filter the information template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_information', $template);

+		}

+		// check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			global $information;

+			$information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

+			$is_current_user_owner = geodir_listing_belong_to_current_user();

+			if (!$is_current_user_owner) {

+				$template = geodir_locate_template('information');

+

+				if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+				/**

+				 * Filter the information template path.

+				 *

+				 * @since 1.0.0

+				 * @param string $template The template path.

+				 */

+				return $template = apply_filters('geodir_template_information', $template);

+			}

 

-    if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

 

-        $template = geodir_locate_template('search');

+		}

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

-        /**

-         * Filter the search template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_search', $template);

+		//geodir_is_login(true);

+		global $current_user;

+		if (!$current_user->ID) {

+			wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

+			exit;

+		}

 

-    }

+		$template = geodir_locate_template('add-listing');

 

-    if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+		/**

+		 * Filter the add listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_add_listing', $template);

+	}

 

-        $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

-        /**

-         * Filter the author template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_author', $template);

+	if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

+		global $preview;

+		$preview = true;

 

-    }

+		$template = geodir_locate_template('preview');

 

-    if (get_option('geodir_set_as_home') || geodir_is_page('home') || geodir_is_page('location')) {

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the preview template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_preview', $template);

 

-        global $post, $wp_query;

+	}

+

+

+	if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

+

+		$template = geodir_locate_template('success');

 

-        if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

-            || (is_home() && !$wp_query->is_posts_page)

-        ) {

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+		/**

+		 * Filter the success template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_success', $template);

 

-            $template = geodir_locate_template('geodir-home');

+	}

+

+	if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

-            /**

-             * Filter the home page template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_homepage', $template);

+		$template = geodir_locate_template('detail');

 

-        } elseif (geodir_is_page('location')) {

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the detail template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_detail', $template);

 

-            $template = geodir_locate_template('location');

+	}

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

-            /**

-             * Filter the location template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_location', $template);

+	if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

 

-        } else

-            return $template;

+		$template = geodir_locate_template('listing');

 

-    }

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+		/**

+		 * Filter the listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_listing', $template);

 

-    return $template;

+	}

+

+	if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

+

+		$template = geodir_locate_template('search');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+		/**

+		 * Filter the search template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_search', $template);

+

+	}

+

+	if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+

+		$template = geodir_locate_template('author');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+		/**

+		 * Filter the author template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_author', $template);

+

+	}

+

+	if (get_option('geodir_set_as_home') || geodir_is_page('home') || geodir_is_page('location')) {

+

+		global $post, $wp_query;

+

+		if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

+			|| (is_home() && !$wp_query->is_posts_page)

+		) {

+

+			$template = geodir_locate_template('geodir-home');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+			/**

+			 * Filter the home page template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_homepage', $template);

+

+		} elseif (geodir_is_page('location')) {

+

+			$template = geodir_locate_template('location');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+			/**

+			 * Filter the location template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_location', $template);

+

+		} else

+			return $template;

+

+	}

+

+	return $template;

 }

 

 /**

@@ -397,44 +397,44 @@ 
  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

-    global $geodirectory, $post;

-    /**

-     * Called at the start for the geodir_get_template_part() function.

-     *

-     * Used dynamic hook name: geodir_get_template_part_{$slug}

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $slug The template slug.

-     * @param string $name The template name.

-     */

-    do_action("geodir_get_template_part_{$slug}", $slug, $name);

-    $templates = array();

-    $name = (string)$name;

-    if ('' !== $name) {

-        $template_name = "{$slug}-{$name}.php";

-

-    } else {

-        $template_name = "{$slug}.php";

-    }

-

-    if (!locate_template(array("geodirectory/" . $template_name))) :

-        /**

-         * Filter the template part with slug and name.

-         *

-         * @since 1.0.0

-         * @param string $template_name The template name.

-         */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

-        /**

-         * Includes the template part with slug and name.

-         *

-         * @since 1.0.0

-         */

-        include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

-    endif;

+	global $geodirectory, $post;

+	/**

+	 * Called at the start for the geodir_get_template_part() function.

+	 *

+	 * Used dynamic hook name: geodir_get_template_part_{$slug}

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $slug The template slug.

+	 * @param string $name The template name.

+	 */

+	do_action("geodir_get_template_part_{$slug}", $slug, $name);

+	$templates = array();

+	$name = (string)$name;

+	if ('' !== $name) {

+		$template_name = "{$slug}-{$name}.php";

+

+	} else {

+		$template_name = "{$slug}.php";

+	}

+

+	if (!locate_template(array("geodirectory/" . $template_name))) :

+		/**

+		 * Filter the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 * @param string $template_name The template name.

+		 */

+		$template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+		/**

+		 * Includes the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 */

+		include($template);

+	else:

+		locate_template(array("geodirectory/" . $template_name), true, false);

+	endif;

 

 }

 

@@ -450,23 +450,23 @@ 
  */

 function geodir_core_post_view_extra_class($class, $all_postypes = '')

 {

-    global $post;

+	global $post;

 

-    if (!$all_postypes) {

-        $all_postypes = geodir_get_posttypes();

-    }

+	if (!$all_postypes) {

+		$all_postypes = geodir_get_posttypes();

+	}

 

-    $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

-    $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

-    $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

+	$gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

+	$gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

+	$gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

-    if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

-        $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

-    }

+	if ($gdp_post_id && $gdp_post_type) {

+		$append_class = 'gd-post-' . $gdp_post_type;

+		$append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

+		$class = $class != '' ? $class . ' ' . $append_class : $append_class;

+	}

 

-    return $class;

+	return $class;

 }

 

 /**

@@ -480,7 +480,7 @@ 
  * @param bool $favorite Listing Optional. Are favorite listings results? Default: false.

  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

-    if ($favorite) {

+	if ($favorite) {

 		$message = __('No favorite listings found which match your selection.', 'geodirectory');

 	} else {

 		$message = __('No listings found which match your selection.', 'geodirectory');

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+				if($sc_post_type != '' ) {
+									$post_type = $sc_post_type;
+				}
 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

             if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+    	:

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

geodirectory-functions/wp-session/class-recursive-arrayaccess.php

Doc Comments -1 removed lines

@@ -107,7 +107,6 @@
 	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
 	 *
 	 * @param mixed $offset The offset to assign the value to.
-	 * @param mixed $value  The value to set.
 	 *
 	 * @return void
 	 */

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Recursive array class to allow multidimensional array access.
@@ -39,9 +39,9 @@ 
 	 *
 	 * @param array $data
 	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
+	protected function __construct($data = array()) {
+		foreach ($data as $key => $value) {
+			$this[$key] = $value;
 		}
 	}
 
@@ -49,9 +49,9 @@ 
 	 * Allow deep copies of objects
 	 */
 	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
+		foreach ($this->container as $key => $value) {
+			if ($value instanceof self) {
+				$this[$key] = clone $value;
 			}
 		}
 	}
@@ -63,9 +63,9 @@ 
 	 */
 	public function toArray() {
 		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
+		foreach ($data as $key => $value) {
+			if ($value instanceof self) {
+				$data[$key] = $value->toArray();
 			}
 		}
 		return $data;
@@ -84,8 +84,8 @@ 
 	 *
 	 * @return boolean true on success or false on failure.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
+	public function offsetExists($offset) {
+		return isset($this->container[$offset]);
 	}
 
 	/**
@@ -97,8 +97,8 @@ 
 	 *
 	 * @return mixed Can return all value types.
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->container[$offset]) ? $this->container[$offset] : null;
 	}
 
 	/**
@@ -111,14 +111,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
+	public function offsetSet($offset, $data) {
+		if (is_array($data)) {
+			$data = new self($data);
 		}
-		if ( $offset === null ) { // don't forget this!
+		if ($offset === null) { // don't forget this!
 			$this->container[] = $data;
 		} else {
-			$this->container[ $offset ] = $data;
+			$this->container[$offset] = $data;
 		}
 
 		$this->dirty = true;
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->container[$offset]);
 	}
 }

Indentation +11 added lines, -11 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Multidimensional ArrayAccess
- *
- * Allows ArrayAccess-like functionality with multidimensional arrays.  Fully supports
- * both sets and unsets.
- *
- * @package WordPress
- * @subpackage Session
- * @since 3.6.0
- */
+	 * Multidimensional ArrayAccess
+	 *
+	 * Allows ArrayAccess-like functionality with multidimensional arrays.  Fully supports
+	 * both sets and unsets.
+	 *
+	 * @package WordPress
+	 * @subpackage Session
+	 * @since 3.6.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -72,8 +72,8 @@ 
 	}
 
 	/**
-	* ArrayAccess Implementation
-	**/
+	 * ArrayAccess Implementation
+	 **/
 
 	/**
 	 * Whether a offset exists

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

geodirectory-functions/wp-session/class-wp-session.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * Retrieve the current session instance.
 	 *
-	 * @param bool $session_id Session ID from which to populate data.
 	 *
 	 * @return bool|WP_Session
 	 */

Spacing +40 added lines, -40 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * WordPress Session class for managing user session data.
@@ -56,7 +56,7 @@ 
 	 * @return bool|WP_Session
 	 */
 	public static function get_instance() {
-		if ( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self();
 		}
 
@@ -72,17 +72,17 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
 	 */
 	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
+		if (isset($_COOKIE[WP_SESSION_COOKIE])) {
+			$cookie = stripslashes($_COOKIE[WP_SESSION_COOKIE]);
+			$cookie_crumbs = explode('||', $cookie);
 
-			if( $this->is_valid_md5( $cookie_crumbs[0] ) ) {
+			if ($this->is_valid_md5($cookie_crumbs[0])) {
 
 				$this->session_id = $cookie_crumbs[0];
 
 			} else {
 
-				$this->regenerate_id( true );
+				$this->regenerate_id(true);
 
 			}
 
@@ -90,10 +90,10 @@ 
 			$this->exp_variant = $cookie_crumbs[2];
 
 			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
+			if (time() > $this->exp_variant) {
 				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+				delete_option("_wp_session_expires_{$this->session_id}");
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			}
 		} else {
 			$this->session_id = $this->generate_id();
@@ -125,8 +125,8 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
 	 */
 	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+		$this->exp_variant = time() + (int) apply_filters('wp_session_expiration_variant', 24 * 60);
+		$this->expires = time() + (int) apply_filters('wp_session_expiration', 30 * 60);
 	}
 
 	/**
@@ -134,9 +134,9 @@ 
 	 */
 	protected function set_cookie() {
 		try {
-            setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
-        } catch(Exception $e) {
-            error_log( 'Set Cookie Error: ' . $e->getMessage() );
+            setcookie(WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant, $this->expires, COOKIEPATH, COOKIE_DOMAIN);
+        } catch (Exception $e) {
+            error_log('Set Cookie Error: ' . $e->getMessage());
         }
 	}
 
@@ -146,10 +146,10 @@ 
 	 * @return string
 	 */
 	protected function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php');
-		$hasher = new PasswordHash( 8, false );
+		require_once(ABSPATH . 'wp-includes/class-phpass.php');
+		$hasher = new PasswordHash(8, false);
 
-		return md5( $hasher->get_random_bytes( 32 ) );
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -158,8 +158,8 @@ 
 	 * @param string $md5
 	 * @return int
 	 */
-	protected function is_valid_md5( $md5 = '' ){
-		return preg_match( '/^[a-f0-9]{32}$/', $md5 );
+	protected function is_valid_md5($md5 = '') {
+		return preg_match('/^[a-f0-9]{32}$/', $md5);
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 * @return array
 	 */
 	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
+		$this->container = get_option("_wp_session_{$this->session_id}", array());
 
 		return $this->container;
 	}
@@ -182,13 +182,13 @@ 
 		$option_key = "_wp_session_{$this->session_id}";
 
 		// Only write the collection to the DB if it's changed.
-		if ( $this->dirty ) {
-			if ( false === get_option( $option_key ) ) {
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+		if ($this->dirty) {
+			if (false === get_option($option_key)) {
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			} else {
-				delete_option( "_wp_session_{$this->session_id}" );
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+				delete_option("_wp_session_{$this->session_id}");
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
 			}
 		}
 	}
@@ -199,7 +199,7 @@ 
 	 * @return string
 	 */
 	public function json_out() {
-		return json_encode( $this->container );
+		return json_encode($this->container);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
+	public function json_in($data) {
+		$array = json_decode($data);
 
-		if ( is_array( $array ) ) {
+		if (is_array($array)) {
 			$this->container = $array;
 			return true;
 		}
@@ -225,9 +225,9 @@ 
 	 *
 	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
 	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
+	public function regenerate_id($delete_old = false) {
+		if ($delete_old) {
+			delete_option("_wp_session_{$this->session_id}");
 		}
 
 		$this->session_id = $this->generate_id();
@@ -272,7 +272,7 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return current( $this->container );
+		return current($this->container);
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return key( $this->container );
+		return key($this->container);
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 * @return void
 	 */
 	public function next() {
-		next( $this->container );
+		next($this->container);
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	 * @return void
 	 */
 	public function rewind() {
-		reset( $this->container );
+		reset($this->container);
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return $this->offsetExists( $this->key() );
+		return $this->offsetExists($this->key());
 	}
 
 	/*****************************************************************/
@@ -331,6 +331,6 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->container );
+		return count($this->container);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

Indentation +4 added lines, -4 removed lines

@@ -134,10 +134,10 @@
 	 */
 	protected function set_cookie() {
 		try {
-            setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
-        } catch(Exception $e) {
-            error_log( 'Set Cookie Error: ' . $e->getMessage() );
-        }
+			setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
+		} catch(Exception $e) {
+			error_log( 'Set Cookie Error: ' . $e->getMessage() );
+		}
 	}
 
 	/**

geodirectory_hooks_actions.php

Doc Comments +1 added lines, -1 removed lines

@@ -2203,7 +2203,7 @@
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $attachment_id Attachment ID.

- * @return bool|void Returns false on failure.

+ * @return false|null Returns false on failure.

  */

 function geodirectory_before_featured_image_delete($attachment_id)

 {

Braces +92 added lines, -74 removed lines

@@ -86,8 +86,9 @@ 
 add_filter('query_vars', 'geodir_add_location_var');

 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

-if (get_option('permalink_structure') != '')

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+if (get_option('permalink_structure') != '') {
+    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
+}
 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -420,8 +421,9 @@ 
      */

     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

@@ -467,8 +469,9 @@ 
      */

     do_action('geodir_after_share_this_button');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

         /**

          * Filter the geodir_share_this_button() function content.

@@ -523,8 +526,9 @@ 
      */

     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1090,8 +1094,9 @@ 
      */

     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1226,8 +1231,9 @@ 
     do_action('geodir_after_detail_page_more_info');

 

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

@@ -1334,8 +1340,9 @@ 
     $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

     foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

+        if (!is_scalar($value)) {
+                    continue;
+        }
         $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

     }

 

@@ -1389,17 +1396,19 @@ 
     global $geodir_sidebars;

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
     $geodir_old_sidebars = array();

 

     if (is_array($geodir_sidebars)) {

         foreach ($geodir_sidebars as $val) {

             if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

+                if (array_key_exists($val, $sidebars_widgets)) {
+                                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];
+                } else {
+                                    $geodir_old_sidebars[$val] = array();
+                }
             }

         }

     }

@@ -1420,8 +1429,9 @@ 
 {

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
 

     if (is_array($sidebars_widgets)) {

         $geodir_old_sidebars = get_option('geodir_sidebars');

@@ -1571,20 +1581,25 @@ 
         }

     }

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+    if ($tab == 'post_info') {
+            $is_display = (!empty($geodir_post_detail_fields)) ? true : false;
+    }
 

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+    if ($tab == 'post_images') {
+            $is_display = (!empty($post_images)) ? true : false;
+    }
 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+    if ($tab == 'post_video') {
+            $is_display = (!empty($video)) ? true : false;
+    }
 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+    if ($tab == 'special_offers') {
+            $is_display = (!empty($special_offers)) ? true : false;
+    }
 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+    if ($tab == 'reviews') {
+            $is_display = (geodir_is_page('detail')) ? true : false;
+    }
 

     if ($tab == 'related_listing') {

        $message = __('No listings found which match your selection.', 'geodirectory');

@@ -1818,11 +1833,13 @@ 
     $region_slug = $default_location->region_slug;

     $city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) {
+            return $slug_exists = true;
+    }
 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id)))) {
+            return $slug_exists = true;
+    }
 

     return $slug_exists;

 }

@@ -1864,40 +1881,31 @@ 
     if(geodir_is_page('home')){

         $gd_page = 'home';

         $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

-    }

-    elseif(geodir_is_page('detail')){

+    } elseif(geodir_is_page('detail')){

         $gd_page = 'detail';

         $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

-    }

-    elseif(geodir_is_page('pt')){

+    } elseif(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

+    } elseif(geodir_is_page('listing')){

         $gd_page = 'listing';

         $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

-    }

-    elseif(geodir_is_page('location')){

+    } elseif(geodir_is_page('location')){

         $gd_page = 'location';

         $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

-    }

-    elseif(geodir_is_page('search')){

+    } elseif(geodir_is_page('search')){

         $gd_page = 'search';

         $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

-    }

-    elseif(geodir_is_page('add-listing')){

+    } elseif(geodir_is_page('add-listing')){

         $gd_page = 'add-listing';

         $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

-    }

-    elseif(geodir_is_page('author')){

+    } elseif(geodir_is_page('author')){

         $gd_page = 'author';

         $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

-    }

-    elseif(geodir_is_page('login')){

+    } elseif(geodir_is_page('login')){

         $gd_page = 'login';

         $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

-    }

-    elseif(geodir_is_page('listing-success')){

+    } elseif(geodir_is_page('listing-success')){

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1972,11 +1980,13 @@ 
 

     if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+        if (get_option('geodir_listingurl_separator')) {
+                    delete_option('geodir_listingurl_separator');
+        }
 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+        if (get_option('geodir_detailurl_separator')) {
+                    delete_option('geodir_detailurl_separator');
+        }
 

         flush_rewrite_rules(false);

 

@@ -2000,8 +2010,9 @@ 
 {

     foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') {
+                    unset($permalink_arr[$key]);
+        }
 

     }

 

@@ -2133,16 +2144,18 @@ 
 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

+            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') {
+                            $tabs_arr['post_video']['heading_text'] = $field_title;
+            }
         }

 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

+            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') {
+                            $tabs_arr['special_offers']['heading_text'] = $field_title;
+            }
         }

 

     }

@@ -2197,8 +2210,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes) || !is_admin())

-            return false;

+        if (!in_array($post_type, $all_postypes) || !is_admin()) {
+                    return false;
+        }
 

         $uploads = wp_upload_dir();

 

@@ -2272,8 +2286,9 @@ 
                         $file_info = pathinfo($attach->file);

 

                         $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                                    $sub_dir = stripslashes_deep($file_info['dirname']);
+                        }
 

                         $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

                         $uploads_path = $uploads['basedir'];

@@ -2294,8 +2309,9 @@ 
 

                     if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                        if ($attachment_data->ID) {
+                                                    $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
+                        }
 

                     } else {

 

@@ -2542,8 +2558,9 @@ 
                             break;

                         case 'time': {

                             $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                $value = date_i18n(get_option('time_format'), strtotime($post->$type['htmlvar_name']));

+                            if ($post->$type['htmlvar_name'] != '') {
+                                                            $value = date_i18n(get_option('time_format'), strtotime($post->$type['htmlvar_name']));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2578,8 +2595,9 @@ 
                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $post->$type['htmlvar_name']) : $post->$type['htmlvar_name']; // PHP doesn't work well with dd/mm/yyyy format

 

                             $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                $value = date($date_format, strtotime($post_htmlvar_value));

+                            if ($post->$type['htmlvar_name'] != '') {
+                                                            $value = date($date_format, strtotime($post_htmlvar_value));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

Indentation +1482 added lines, -1482 removed lines

@@ -1,12 +1,12 @@ 
 <?php

 /**

- * Hook and filter actions used by the plugin

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global array $geodir_addon_list List of active GeoDirectory extensions.

- * @global string $plugin_file_name Plugin main file name. 'geodirectory/geodirectory.php'.

- */

+	 * Hook and filter actions used by the plugin

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @global string $plugin_file_name Plugin main file name. 'geodirectory/geodirectory.php'.

+	 */

 

 /**

  * Return the GeoDirectory ajax specific url.

@@ -19,7 +19,7 @@ 
  */

 function geodir_get_ajax_url()

 {

-    return admin_url('admin-ajax.php?action=geodir_ajax_action');

+	return admin_url('admin-ajax.php?action=geodir_ajax_action');

 }

 

 /////////////////////

@@ -87,7 +87,7 @@ 
 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

 if (get_option('permalink_structure') != '')

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+	add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -154,14 +154,14 @@ 
 /* POST AND LOOP ACTIONS */

 ////////////////////////

 if (!is_admin()) {

-    add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

-    add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

-    /** Exclude Virtual Pages From Pages List **/

-    add_action('pre_get_posts', 'set_listing_request', 0);

-    add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

-    add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

-    add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

-    add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

+	add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

+	add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

+	/** Exclude Virtual Pages From Pages List **/

+	add_action('pre_get_posts', 'set_listing_request', 0);

+	add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

+	add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

+	add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

+	add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

 }

 

 

@@ -221,12 +221,12 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

-    if ($geodir_theme_location) {

-        update_option('geodir_theme_location_nav', $geodir_theme_location);

-    } else {

-        update_option('geodir_theme_location_nav', '');

-    }

+	$geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+	if ($geodir_theme_location) {

+		update_option('geodir_theme_location_nav', $geodir_theme_location);

+	} else {

+		update_option('geodir_theme_location_nav', '');

+	}

 }

 

 /// add action for theme switch to blank previous theme navigation location setting

@@ -247,32 +247,32 @@ 
  */

 function geodir_add_post_filters()

 {

-    /**

-     * Contains all function for filtering listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-functions/listing_filters.php');

+	/**

+	 * Contains all function for filtering listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-functions/listing_filters.php');

 }

 

 

 if (!function_exists('geodir_init_defaults')) {

-    /**

-     * Calls the function to register the GeoDirectory default CPT and taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_init_defaults()

-    {

-        if (function_exists('geodir_register_defaults')) {

+	/**

+	 * Calls the function to register the GeoDirectory default CPT and taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_init_defaults()

+	{

+		if (function_exists('geodir_register_defaults')) {

 

-            geodir_register_defaults();

+			geodir_register_defaults();

 

-        }

+		}

 

-    }

+	}

 }

 

 

@@ -294,26 +294,26 @@ 
 // CALLED ON 'sidebars_widgets' FILTER

 

 if (!function_exists('geodir_restrict_widget')) {

-    /**

-     * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

-     *

-     * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

-     * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_restrict_widget()

-    {

-        global $is_listing, $is_single_place;

+	/**

+	 * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

+	 *

+	 * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

+	 * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_restrict_widget()

+	{

+		global $is_listing, $is_single_place;

 

-        // set is listing	

-        (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

+		// set is listing	

+		(geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

 

-        // set is single place

-        (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

+		// set is single place

+		(geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

 

 

-    }

+	}

 }

 

 

@@ -334,32 +334,32 @@ 
  */

 function geodir_detail_page_sidebar_content_sorting()

 {

-    $arr_detail_page_sidebar_content =

-        /**

-         * An array of functions to be called to be displayed on the details (post) page sidebar.

-         *

-         * This filter can be used to remove sections of the details page sidebar,

-         * add new sections or rearrange the order of the sections.

-         *

-         * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

-         * @since 1.0.0

-         */

-        apply_filters('geodir_detail_page_sidebar_content',

-            array('geodir_social_sharing_buttons',

-                'geodir_share_this_button',

-                'geodir_detail_page_google_analytics',

-                'geodir_edit_post_link',

-                'geodir_detail_page_review_rating',

-                'geodir_detail_page_more_info'

-            ) // end of array 

-        ); // end of apply filter

-    if (!empty($arr_detail_page_sidebar_content)) {

-        foreach ($arr_detail_page_sidebar_content as $content_function) {

-            if (function_exists($content_function)) {

-                add_action('geodir_detail_page_sidebar', $content_function);

-            }

-        }

-    }

+	$arr_detail_page_sidebar_content =

+		/**

+		 * An array of functions to be called to be displayed on the details (post) page sidebar.

+		 *

+		 * This filter can be used to remove sections of the details page sidebar,

+		 * add new sections or rearrange the order of the sections.

+		 *

+		 * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

+		 * @since 1.0.0

+		 */

+		apply_filters('geodir_detail_page_sidebar_content',

+			array('geodir_social_sharing_buttons',

+				'geodir_share_this_button',

+				'geodir_detail_page_google_analytics',

+				'geodir_edit_post_link',

+				'geodir_detail_page_review_rating',

+				'geodir_detail_page_more_info'

+			) // end of array 

+		); // end of apply filter

+	if (!empty($arr_detail_page_sidebar_content)) {

+		foreach ($arr_detail_page_sidebar_content as $content_function) {

+			if (function_exists($content_function)) {

+				add_action('geodir_detail_page_sidebar', $content_function);

+			}

+		}

+	}

 }

 

 add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);

@@ -374,14 +374,14 @@ 
  */

 function geodir_add_to_favourite_link()

 {

-    global $post, $preview;

-    if (!$preview && geodir_is_page('detail')) {

-        ?>

+	global $post, $preview;

+	if (!$preview && geodir_is_page('detail')) {

+		?>

         <p class="edit_link">

             <?php geodir_favourite_html($post->post_author, $post->ID); ?>

         </p>

     <?php

-    }

+	}

 }

 

 /**

@@ -395,41 +395,41 @@ 
  */

 function geodir_social_sharing_buttons()

 {

-    global $preview;

-    ob_start(); // Start  buffering;

-    /**

-     * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_social_sharing_buttons');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start  buffering;

+	/**

+	 * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_social_sharing_buttons');

+	if (!$preview) {

+		?>

         <div class="likethis">

             <?php geodir_twitter_tweet_button(); ?>

             <?php geodir_fb_like_button(); ?>

             <?php geodir_google_plus_button(); ?>

         </div>

     <?php

-    }// end of if, if its a preview or not

-

-    /**

-     * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_social_sharing_buttons');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

-        /**

-         * Filter the geodir_social_sharing_buttons() function content.

-         *

-         * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

-         */

-        echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

-    }

+	}// end of if, if its a preview or not

+

+	/**

+	 * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_social_sharing_buttons');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+		/**

+		 * Filter the geodir_social_sharing_buttons() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

+		 */

+		echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

+	}

 

 

 }

@@ -445,39 +445,39 @@ 
  */

 function geodir_share_this_button()

 {

-    global $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the share this html in the function geodir_share_this_button()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_share_this_button');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the share this html in the function geodir_share_this_button()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_share_this_button');

+	if (!$preview) {

+		?>

         <div class="share clearfix">

             <?php geodir_share_this_button_code(); ?>

         </div>

     <?php

-    }// end of if, if its a preview or not

-    /**

-     * This is called after the share this html in the function geodir_share_this_button()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_share_this_button');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

-        /**

-         * Filter the geodir_share_this_button() function content.

-         *

-         * @param string $content_html The output html of the geodir_share_this_button() function.

-         * @since 1.0.0

-         */

-        echo $content_html = apply_filters('geodir_share_this_button_html', $content_html);

-    }

+	}// end of if, if its a preview or not

+	/**

+	 * This is called after the share this html in the function geodir_share_this_button()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_share_this_button');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

+		/**

+		 * Filter the geodir_share_this_button() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_share_this_button() function.

+		 * @since 1.0.0

+		 */

+		echo $content_html = apply_filters('geodir_share_this_button_html', $content_html);

+	}

 

 }

 

@@ -493,46 +493,46 @@ 
  */

 function geodir_edit_post_link()

 {

-    global $post, $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_edit_post_link');

-    if (!$preview) {

-        $is_current_user_owner = geodir_listing_belong_to_current_user();

+	global $post, $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_edit_post_link');

+	if (!$preview) {

+		$is_current_user_owner = geodir_listing_belong_to_current_user();

         

-        if ($is_current_user_owner) {

-            $post_id = $post->ID;

+		if ($is_current_user_owner) {

+			$post_id = $post->ID;

             

-            if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                $post_id = (int)$_REQUEST['pid'];

-            }

+			if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+				$post_id = (int)$_REQUEST['pid'];

+			}

 

-            $postlink = get_permalink(geodir_add_listing_page_id());

-            $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

-        }

-    }// end of if, if its a preview or not

-    /**

-     * This is called after the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_edit_post_link');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

-    }

+			$postlink = get_permalink(geodir_add_listing_page_id());

+			$editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

+			echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+		}

+	}// end of if, if its a preview or not

+	/**

+	 * This is called after the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_edit_post_link');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_user_links_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

+	}

 }

 

 /**

@@ -546,41 +546,41 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post;

-    $package_info = array();

-    $package_info = geodir_post_package_info($package_info, $post);

+	global $post;

+	$package_info = array();

+	$package_info = geodir_post_package_info($package_info, $post);

 

-    $id = trim(get_option('geodir_ga_id'));

+	$id = trim(get_option('geodir_ga_id'));

 

-    if (!$id) {

-        return; //if no Google Analytics ID then bail.

-    }

+	if (!$id) {

+		return; //if no Google Analytics ID then bail.

+	}

 

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_google_analytics');

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_google_analytics');

     

-    $refresh_time = get_option('geodir_ga_refresh_time', 5);

-    /**

-     * Filter the time interval to check & refresh new users results.

-     *

-     * @since 1.5.9

-     *

-     * @param int $refresh_time Time interval to check & refresh new users results.

-     */

-    $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

-    $refresh_time = absint($refresh_time * 1000);

+	$refresh_time = get_option('geodir_ga_refresh_time', 5);

+	/**

+	 * Filter the time interval to check & refresh new users results.

+	 *

+	 * @since 1.5.9

+	 *

+	 * @param int $refresh_time Time interval to check & refresh new users results.

+	 */

+	$refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

+	$refresh_time = absint($refresh_time * 1000);

     

-    $hide_refresh = get_option('geodir_ga_auto_refresh');

+	$hide_refresh = get_option('geodir_ga_auto_refresh');

     

-    $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

-        $page_url = urlencode($_SERVER['REQUEST_URI']);

-        ?>

+	$auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

+	if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+		$page_url = urlencode($_SERVER['REQUEST_URI']);

+		?>

         <script type="text/javascript">

             var gd_gaTimeOut;

             var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

@@ -832,15 +832,15 @@ 
                     var labels = results[1].rows.map(function(row) { return +row[0]; });

 

                     <?php

-                    // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

-                    ?>

+					// Here we list the shorthand days of the week so it can be used in translation.

+					__("Mon",'geodirectory');

+					__("Tue",'geodirectory');

+					__("Wed",'geodirectory');

+					__("Thu",'geodirectory');

+					__("Fri",'geodirectory');

+					__("Sat",'geodirectory');

+					__("Sun",'geodirectory');

+					?>

 

                     labels = [

                         "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

@@ -1089,24 +1089,24 @@ 
         </span>

 

     <?php

-    }

-    /**

-     * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_google_analytics');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

-    }

+	}

+	/**

+	 * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_google_analytics');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

+	}

 }

 

 /**

@@ -1120,90 +1120,90 @@ 
  */

 function geodir_detail_page_review_rating()

 {

-    global $post, $preview, $post_images;

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_review_rating');

-

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    if ($post_avgratings != 0 && !$preview) {

-        /**

-         * This is called before the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-

-        $html = '<p style=" float:left;">';

-        $html .= geodir_get_rating_stars($post_avgratings, $post->ID);

-        $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

-        $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

+	global $post, $preview, $post_images;

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_review_rating');

+

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	if ($post_avgratings != 0 && !$preview) {

+		/**

+		 * This is called before the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+

+		$html = '<p style=" float:left;">';

+		$html .= geodir_get_rating_stars($post_avgratings, $post->ID);

+		$html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

+		$post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

 	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

 

-        $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+		$html .= '<span class="item">';

+		$html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

 

-        if ($post_images) {

-            foreach ($post_images as $img) {

-                $post_img = $img->src;

-                break;

-            }

-        }

-

-        if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo hreview-img" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo hreview-img" />';

-        }

-

-        $html .= '</span>';

-

-        echo $html .= '</div>';

-        /**

-         * This is called after the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-    }

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_review_rating');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

-    }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

-        /**

-         * Filter the geodir_detail_page_review_rating() function content.

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

-    }

+		if ($post_images) {

+			foreach ($post_images as $img) {

+				$post_img = $img->src;

+				break;

+			}

+		}

+

+		if (isset($post_img) && $post_img) {

+			$html .= '<br /><img src="' . $post_img . '" class="photo hreview-img" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo hreview-img" />';

+		}

+

+		$html .= '</span>';

+

+		echo $html .= '</div>';

+		/**

+		 * This is called after the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+	}

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_review_rating');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '') {

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+	}

+	if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+		/**

+		 * Filter the geodir_detail_page_review_rating() function content.

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

+	}

 }

 

 /**

@@ -1215,35 +1215,35 @@ 
  */

 function geodir_detail_page_more_info()

 {

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_more_info');

-    if ($geodir_post_detail_fields = geodir_show_listing_info()) {

-        echo $geodir_post_detail_fields;

-    }

-    /**

-     * This is called after the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_more_info');

-

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

-        /**

-         * Filter the output html for function geodir_detail_page_more_info().

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_more_info() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

-    }

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_more_info');

+	if ($geodir_post_detail_fields = geodir_show_listing_info()) {

+		echo $geodir_post_detail_fields;

+	}

+	/**

+	 * This is called after the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_more_info');

+

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+		/**

+		 * Filter the output html for function geodir_detail_page_more_info().

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_more_info() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

+	}

 }

 

 

@@ -1257,15 +1257,15 @@ 
  */

 function geodir_localize_all_js_msg()

 {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-    if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-    }

+	if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+	}

 	

 	/**

 	 * Filter the allowed image type extensions for post images.

@@ -1275,52 +1275,52 @@ 
 	 */

 	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

-    $arr_alert_msg = array(

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_admin_ajax_url' => $ajax_url,

-        'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

-        'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

-        'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

-        'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

-        //start not show alert msg

-        'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

-        'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

-        'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

-        'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

-        'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

-        // end not show alert msg

-        'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

-        //start not show alert msg

-        'rating_error_msg' => __('Error : please retry', 'geodirectory'),

-        'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

-        'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

-        'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

-        'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

-        'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

-        'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

-        'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

-        'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

-        'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

-        'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

-        'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

-        'geodir_default_marker_icon' => get_option('geodir_default_marker_icon'),

-        'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

-        'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

-        'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

-        'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

-        'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

-        'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

-        'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

-        'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

-        /* on/off dragging for phone devices */

-        'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

-        'geodir_is_mobile' => wp_is_mobile() ? true : false,

-        'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

-        'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

-        'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

-        'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

-        'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

-        'geodir_action_remove' => __('Remove', 'geodirectory'),

+	$arr_alert_msg = array(

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_admin_ajax_url' => $ajax_url,

+		'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

+		'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

+		'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

+		'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

+		//start not show alert msg

+		'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

+		'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

+		'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

+		'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

+		'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

+		// end not show alert msg

+		'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

+		//start not show alert msg

+		'rating_error_msg' => __('Error : please retry', 'geodirectory'),

+		'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

+		'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

+		'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

+		'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

+		'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

+		'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

+		'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

+		'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

+		'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

+		'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

+		'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

+		'geodir_default_marker_icon' => get_option('geodir_default_marker_icon'),

+		'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

+		'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

+		'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

+		'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

+		'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

+		'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

+		'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

+		'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

+		/* on/off dragging for phone devices */

+		'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

+		'geodir_is_mobile' => wp_is_mobile() ? true : false,

+		'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

+		'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

+		'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

+		'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

+		'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

+		'geodir_action_remove' => __('Remove', 'geodirectory'),

 		'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

 		'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

@@ -1328,28 +1328,28 @@ 
 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

 		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

-    );

-

-    /**

-     * Filters the translated JS strings from function geodir_localize_all_js_msg().

-     *

-     * With this filter you can add, remove or change translated JS strings.

-     * You should add your own translations to this if you are building an addon rather than adding another script block.

-     *

-     * @since 1.0.0

-     */

-    $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

-

-    foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

-    }

+	);

+

+	/**

+	 * Filters the translated JS strings from function geodir_localize_all_js_msg().

+	 *

+	 * With this filter you can add, remove or change translated JS strings.

+	 * You should add your own translations to this if you are building an addon rather than adding another script block.

+	 *

+	 * @since 1.0.0

+	 */

+	$arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

+

+	foreach ($arr_alert_msg as $key => $value) {

+		if (!is_scalar($value))

+			continue;

+		$arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+	}

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

-    echo '<script>';

-    echo $script;

-    echo '</script>';

+	$script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+	echo '<script>';

+	echo $script;

+	echo '</script>';

 }

 

 add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);

@@ -1365,9 +1365,9 @@ 
  */

 function geodir_admin_bar_site_menu($wp_admin_bar)

 {

-    if (get_option("geodir_installed")) {

-        $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

-    }

+	if (get_option("geodir_installed")) {

+		$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

+	}

 }

 

 add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/

@@ -1393,25 +1393,25 @@ 
  */

 function geodir_store_sidebars()

 {

-    global $geodir_sidebars;

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-    $geodir_old_sidebars = array();

-

-    if (is_array($geodir_sidebars)) {

-        foreach ($geodir_sidebars as $val) {

-            if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

-            }

-        }

-    }

-    update_option('geodir_sidebars', $geodir_old_sidebars);

-    geodir_option_version_backup('geodir_sidebars');

+	global $geodir_sidebars;

+	global $sidebars_widgets;

+

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

+	$geodir_old_sidebars = array();

+

+	if (is_array($geodir_sidebars)) {

+		foreach ($geodir_sidebars as $val) {

+			if (is_array($sidebars_widgets)) {

+				if (array_key_exists($val, $sidebars_widgets))

+					$geodir_old_sidebars[$val] = $sidebars_widgets[$val];

+				else

+					$geodir_old_sidebars[$val] = array();

+			}

+		}

+	}

+	update_option('geodir_sidebars', $geodir_old_sidebars);

+	geodir_option_version_backup('geodir_sidebars');

 

 }

 

@@ -1425,34 +1425,34 @@ 
  */

 function geodir_restore_sidebars()

 {

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-

-    if (is_array($sidebars_widgets)) {

-        $geodir_old_sidebars = get_option('geodir_sidebars');

-        if (is_array($geodir_old_sidebars)) {

-            foreach ($geodir_old_sidebars as $key => $val) {

-                //if(array_key_exists($key, $sidebars_widgets))

-                {

-                    $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

-                }

+	global $sidebars_widgets;

 

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

 

-            }

-        }

+	if (is_array($sidebars_widgets)) {

+		$geodir_old_sidebars = get_option('geodir_sidebars');

+		if (is_array($geodir_old_sidebars)) {

+			foreach ($geodir_old_sidebars as $key => $val) {

+				//if(array_key_exists($key, $sidebars_widgets))

+				{

+					$sidebars_widgets[$key] = $geodir_old_sidebars[$key];

+				}

 

-        // now clear all non geodiretory sidebars 

-        foreach ($sidebars_widgets as $key => $val) {

-            if (!array_key_exists($key, $geodir_old_sidebars)) {

-                $sidebars_widgets[$key] = array();

-            }

-        }

-    }

 

-    update_option('sidebars_widgets', $sidebars_widgets);

-    update_option('geodir_sidebars', '');

+			}

+		}

+

+		// now clear all non geodiretory sidebars 

+		foreach ($sidebars_widgets as $key => $val) {

+			if (!array_key_exists($key, $geodir_old_sidebars)) {

+				$sidebars_widgets[$key] = array();

+			}

+		}

+	}

+

+	update_option('sidebars_widgets', $sidebars_widgets);

+	update_option('geodir_sidebars', '');

 }

 

 add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');

@@ -1465,9 +1465,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

@@ -1495,11 +1495,11 @@ 
  */

 function so_handle_038($url, $original_url, $_context)

 {

-    if (strstr($url, "maps.google.com/maps/api/js") !== false) {

-        $url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

-    }

+	if (strstr($url, "maps.google.com/maps/api/js") !== false) {

+		$url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

+	}

 

-    return $url;

+	return $url;

 }

 

 

@@ -1515,34 +1515,34 @@ 
 function geodir_after_main_form_fields() {

 	global $gd_session;

 	

-    if (get_option('geodir_accept_term_condition')) {

-        global $post;

-        $term_condition = '';

-        if (isset($_REQUEST['backandedit'])) {

-            $post = (object)$gd_session->get('listing');

-            $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

-        }

-

-        ?>

+	if (get_option('geodir_accept_term_condition')) {

+		global $post;

+		$term_condition = '';

+		if (isset($_REQUEST['backandedit'])) {

+			$post = (object)$gd_session->get('listing');

+			$term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

+		}

+

+		?>

         <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix">

             <label>&nbsp;</label>

 

             <div class="geodir_taxonomy_field" style="float:left; width:70%;">

 				<span style="display:block"> 

 				<input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {

-                    echo 'checked="checked"';

-                } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

+					echo 'checked="checked"';

+				} ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

                        style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

-                    _e($required_msg, 'geodirectory');

-                } ?></span>

+					_e($required_msg, 'geodirectory');

+				} ?></span>

         </div>

     <?php

 

-    }

+	}

 }

 

 

@@ -1567,42 +1567,42 @@ 
  */

 function geodir_detail_page_tab_is_display($is_display, $tab)

 {

-    global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

+	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

 

-    if ($tab == 'post_profile') {

-        /** This action is documented in geodirectory_template_actions.php */

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

+	if ($tab == 'post_profile') {

+		/** This action is documented in geodirectory_template_actions.php */

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

-            $is_display = false;

-        }

-    }

+		if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+			$is_display = false;

+		}

+	}

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+	if ($tab == 'post_info')

+		$is_display = (!empty($geodir_post_detail_fields)) ? true : false;

 

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+	if ($tab == 'post_images')

+		$is_display = (!empty($post_images)) ? true : false;

 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+	if ($tab == 'post_video')

+		$is_display = (!empty($video)) ? true : false;

 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+	if ($tab == 'special_offers')

+		$is_display = (!empty($special_offers)) ? true : false;

 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+	if ($tab == 'reviews')

+		$is_display = (geodir_is_page('detail')) ? true : false;

 

-    if ($tab == 'related_listing') {

-       $message = __('No listings found which match your selection.', 'geodirectory');

+	if ($tab == 'related_listing') {

+	   $message = __('No listings found which match your selection.', 'geodirectory');

        

-       /** This action is documented in geodirectory-functions/template_functions.php */

-       $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

+	   /** This action is documented in geodirectory-functions/template_functions.php */

+	   $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

        

-       $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

-    }

+	   $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

+	}

 

-    return $is_display;

+	return $is_display;

 }

 

 

@@ -1618,69 +1618,69 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  */

 function geodir_changes_in_custom_fields_table() {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

 	$listings_page_id = (int)get_option('geodir_listing_page');

 	if ($listings_page_id) {

 		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

-        delete_option('geodir_listing_page');

+		delete_option('geodir_listing_page');

 	}

 

-    if (!get_option('geodir_changes_in_custom_fields_table')) {

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

-                array('1', '1', 'admin')

-            )

-        );

+	if (!get_option('geodir_changes_in_custom_fields_table')) {

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+				array('1', '1', 'admin')

+			)

+		);

 

 

-        /* --- terms meta value set --- */

+		/* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+		update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+		$options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

-        if (!empty($options_data)) {

+		if (!empty($options_data)) {

 

-            foreach ($options_data as $optobj) {

+			foreach ($options_data as $optobj) {

 

-                $option_val = str_replace('tax_meta_', '', $optobj->option_name);

+				$option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+				$taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

-                if (!empty($taxonomies_data)) {

+				if (!empty($taxonomies_data)) {

 

-                    foreach ($taxonomies_data as $taxobj) {

+					foreach ($taxonomies_data as $taxobj) {

 

-                        $taxObject = get_taxonomy($taxobj->taxonomy);

-                        $post_type = $taxObject->object_type[0];

+						$taxObject = get_taxonomy($taxobj->taxonomy);

+						$post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+						$opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+						$duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

 

-                        if ($duplicate_data) {

+						if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+							$wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

-                        } else {

+						} else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+							$wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

-                        }

+						}

 

-                    }

+					}

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

-        update_option('geodir_changes_in_custom_fields_table', '1');

+		update_option('geodir_changes_in_custom_fields_table', '1');

 

-    }

+	}

 

 }

 

@@ -1699,24 +1699,24 @@ 
 function geodir_location_slug_check($slug)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+	$slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

-            $suffix++;

-        } while ($location_slug_check && $suffix < 100);

+		$suffix = 1;

+		do {

+			$alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+			$location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+			$suffix++;

+		} while ($location_slug_check && $suffix < 100);

 

-        $slug = $alt_location_name;

+		$slug = $alt_location_name;

 

-    }

+	}

 

-    return $slug;

+	return $slug;

 

 }

 

@@ -1741,42 +1741,42 @@ 
 function geodir_update_term_slug($term_id, $tt_id, $taxonomy)

 {

 

-    global $wpdb, $plugin_prefix, $table_prefix;

+	global $wpdb, $plugin_prefix, $table_prefix;

 

-    $tern_data = get_term_by('id', $term_id, $taxonomy);

+	$tern_data = get_term_by('id', $term_id, $taxonomy);

 

-    $slug = $tern_data->slug;

+	$slug = $tern_data->slug;

 

-    /**

-     * Filter if a term slug exists.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $bool Default: false.

-     * @param string $slug The term slug.

-     * @param int $term_id The term ID.

-     */

-    $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

+	/**

+	 * Filter if a term slug exists.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $bool Default: false.

+	 * @param string $slug The term slug.

+	 * @param int $term_id The term ID.

+	 */

+	$slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+		$suffix = 1;

+		do {

+			$new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

 

-            /** This action is documented in geodirectory_hooks_actions.php */

-            $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

+			/** This action is documented in geodirectory_hooks_actions.php */

+			$term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

 

-            $suffix++;

-        } while ($term_slug_check && $suffix < 100);

+			$suffix++;

+		} while ($term_slug_check && $suffix < 100);

 

-        $slug = $new_slug;

+		$slug = $new_slug;

 

-        //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

+		//wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+		$wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

-    }

+	}

 	

 	// Update tag in detail table.

 	$taxonomy_obj = get_taxonomy($taxonomy);

@@ -1817,21 +1817,21 @@ 
 function geodir_term_slug_is_exists($slug_exists, $slug, $term_id)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $default_location = geodir_get_default_location();

+	$default_location = geodir_get_default_location();

 

-    $country_slug = $default_location->country_slug;

-    $region_slug = $default_location->region_slug;

-    $city_slug = $default_location->city_slug;

+	$country_slug = $default_location->country_slug;

+	$region_slug = $default_location->region_slug;

+	$city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+	if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

+		return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+	if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+		return $slug_exists = true;

 

-    return $slug_exists;

+	return $slug_exists;

 }

 

 

@@ -1850,75 +1850,75 @@ 
  */

 function geodir_custom_page_title($title = '', $sep = '')

 {

-    global $wp;

-    if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

-        return $title;

-    }

+	global $wp;

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

+		return $title;

+	}

 

-    if ($sep == '') {

-        /**

-         * Filter the page title separator.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param string $sep The separator, default: `|`.

-         */

-        $sep = apply_filters('geodir_page_title_separator', '|');

-    }

+	if ($sep == '') {

+		/**

+		 * Filter the page title separator.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param string $sep The separator, default: `|`.

+		 */

+		$sep = apply_filters('geodir_page_title_separator', '|');

+	}

 

 

-    $gd_page = '';

-    if(geodir_is_page('home')){

-        $gd_page = 'home';

-        $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

-    }

-    elseif(geodir_is_page('detail')){

-        $gd_page = 'detail';

-        $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

-    }

-    elseif(geodir_is_page('pt')){

-        $gd_page = 'pt';

-        $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

-        $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

-    }

-    elseif(geodir_is_page('location')){

-        $gd_page = 'location';

-        $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

-    }

-    elseif(geodir_is_page('search')){

-        $gd_page = 'search';

-        $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

-    }

-    elseif(geodir_is_page('add-listing')){

-        $gd_page = 'add-listing';

-        $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

-        $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

-    }

-    elseif(geodir_is_page('login')){

-        $gd_page = 'login';

-        $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

-    }

-    elseif(geodir_is_page('listing-success')){

-        $gd_page = 'listing-success';

-        $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

-    }

+	$gd_page = '';

+	if(geodir_is_page('home')){

+		$gd_page = 'home';

+		$title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

+	}

+	elseif(geodir_is_page('detail')){

+		$gd_page = 'detail';

+		$title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

+	}

+	elseif(geodir_is_page('pt')){

+		$gd_page = 'pt';

+		$title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

+		$title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

+	}

+	elseif(geodir_is_page('location')){

+		$gd_page = 'location';

+		$title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

+	}

+	elseif(geodir_is_page('search')){

+		$gd_page = 'search';

+		$title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

+	}

+	elseif(geodir_is_page('add-listing')){

+		$gd_page = 'add-listing';

+		$title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

+		$title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

+	}

+	elseif(geodir_is_page('login')){

+		$gd_page = 'login';

+		$title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

+	}

+	elseif(geodir_is_page('listing-success')){

+		$gd_page = 'listing-success';

+		$title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

+	}

 

 

-    /**

-     * Filter page meta title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     * @param string $sep The title separator symbol.

-     */

-    return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

+	/**

+	 * Filter page meta title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 * @param string $sep The title separator symbol.

+	 */

+	return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

 

 }

 

@@ -1934,33 +1934,33 @@ 
 function geodir_set_post_attachment()

 {

 

-    if (!get_option('geodir_set_post_attachments')) {

+	if (!get_option('geodir_set_post_attachments')) {

 

-        require_once(ABSPATH . 'wp-admin/includes/image.php');

-        require_once(ABSPATH . 'wp-admin/includes/file.php');

+		require_once(ABSPATH . 'wp-admin/includes/image.php');

+		require_once(ABSPATH . 'wp-admin/includes/file.php');

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        $args = array(

-            'posts_per_page' => -1,

-            'post_type' => $all_postypes,

-            'post_status' => 'publish');

+		$args = array(

+			'posts_per_page' => -1,

+			'post_type' => $all_postypes,

+			'post_status' => 'publish');

 

-        $posts_array = get_posts($args);

+		$posts_array = get_posts($args);

 

-        if (!empty($posts_array)) {

+		if (!empty($posts_array)) {

 

-            foreach ($posts_array as $post) {

+			foreach ($posts_array as $post) {

 

-                geodir_set_wp_featured_image($post->ID);

+				geodir_set_wp_featured_image($post->ID);

 

-            }

+			}

 

-        }

+		}

 

-        update_option('geodir_set_post_attachments', '1');

+		update_option('geodir_set_post_attachments', '1');

 

-    }

+	}

 

 }

 

@@ -1977,19 +1977,19 @@ 
 function geodir_remove_url_seperator()

 {

 

-    if (!get_option('geodir_remove_url_seperator')) {

+	if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+		if (get_option('geodir_listingurl_separator'))

+			delete_option('geodir_listingurl_separator');

 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+		if (get_option('geodir_detailurl_separator'))

+			delete_option('geodir_detailurl_separator');

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        update_option('geodir_remove_url_seperator', '1');

+		update_option('geodir_remove_url_seperator', '1');

 

-    }

+	}

 

 }

 

@@ -2005,38 +2005,38 @@ 
  */

 function geodir_remove_url_seperator_form_permalink_settings($permalink_arr)

 {

-    foreach ($permalink_arr as $key => $value) {

+	foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+		if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

+			unset($permalink_arr[$key]);

 

-    }

+	}

 

-    return $permalink_arr;

+	return $permalink_arr;

 

 }

 

 if (!is_admin()) {

-    add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

+	add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

 }

 /**

- * Set status from draft to publish.

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wp WordPress object.

- * @param object $post Post object.

- * @return object Modified post object.

- */

+	 * Set status from draft to publish.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wp WordPress object.

+	 * @param object $post Post object.

+	 * @return object Modified post object.

+	 */

 function geodir_set_status_draft_to_publish_for_own_post($post)

 {

-    global $wp;

-    $user_id = get_current_user_id();

+	global $wp;

+	$user_id = get_current_user_id();

 

-    if (!empty($post) && $post[0]->post_author == $user_id) {

-        $post[0]->post_status = 'publish';

-    }

-    return $post;

+	if (!empty($post) && $post[0]->post_author == $user_id) {

+		$post[0]->post_status = 'publish';

+	}

+	return $post;

 }

 

 

@@ -2128,33 +2128,33 @@ 
  */

 function geodir_detail_page_tab_headings_change($tabs_arr)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

 

-        if (array_key_exists('post_video', $tabs_arr)) {

+		if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

+				$tabs_arr['post_video']['heading_text'] = $field_title;

+		}

 

-        if (array_key_exists('special_offers', $tabs_arr)) {

+		if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

+				$tabs_arr['special_offers']['heading_text'] = $field_title;

+		}

 

-    }

+	}

 

-    return $tabs_arr;

+	return $tabs_arr;

 

 }

 

@@ -2167,10 +2167,10 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

-        remove_all_actions('template_redirect');

-        remove_action('init', 'avia_modify_front', 10);

-    }

+	if (geodir_is_page('login')){

+		remove_all_actions('template_redirect');

+		remove_action('init', 'avia_modify_front', 10);

+	}

 }

 

 

@@ -2192,51 +2192,51 @@ 
 function geodirectory_before_featured_image_delete($attachment_id)

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_id = get_post_field('post_parent', $attachment_id);

+	$post_id = get_post_field('post_parent', $attachment_id);

 

-    $attachment_url = wp_get_attachment_url($attachment_id);

+	$attachment_url = wp_get_attachment_url($attachment_id);

 

-    if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

+	if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

 

-        $post_type = get_post_type($post_id);

+		$post_type = get_post_type($post_id);

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes) || !is_admin())

-            return false;

+		if (!in_array($post_type, $all_postypes) || !is_admin())

+			return false;

 

-        $uploads = wp_upload_dir();

+		$uploads = wp_upload_dir();

 

-        $split_img_path = explode($uploads['baseurl'], $attachment_url);

+		$split_img_path = explode($uploads['baseurl'], $attachment_url);

 

-        $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

+		$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

-        $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

-                array($post_id, $split_img_file_path)

-            )

-        );

+		$wpdb->query(

+			$wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+				array($post_id, $split_img_file_path)

+			)

+		);

 

-        $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

-                array($post_id)

-            )

-        );

+		$attachment_data = $wpdb->get_row(

+			$wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+				array($post_id)

+			)

+		);

 

-        if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

-        }

+		if (!empty($attachment_data)) {

+			$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+		}

 

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+		$table_name = $plugin_prefix . $post_type . '_detail';

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

 

-        geodir_set_wp_featured_image($post_id);

+		geodir_set_wp_featured_image($post_id);

 

-    }

+	}

 

 }

 

@@ -2254,79 +2254,79 @@ 
 function geodir_temp_set_post_attachment()

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    foreach ($all_postypes as $posttype) {

+	foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+		$tablename = $plugin_prefix . $posttype . '_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+		$get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

 

-        if (!empty($get_post_data)) {

+		if (!empty($get_post_data)) {

 

-            foreach ($get_post_data as $data) {

+			foreach ($get_post_data as $data) {

 

-                $post_id = $data->post_id;

+				$post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+				$attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

 

-                if (!empty($attachment_data)) {

+				if (!empty($attachment_data)) {

 

-                    foreach ($attachment_data as $attach) {

+					foreach ($attachment_data as $attach) {

 

-                        $file_info = pathinfo($attach->file);

+						$file_info = pathinfo($attach->file);

 

-                        $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+						$sub_dir = '';

+						if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+							$sub_dir = stripslashes_deep($file_info['dirname']);

 

-                        $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-                        $uploads_path = $uploads['basedir'];

+						$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+						$uploads_path = $uploads['basedir'];

 

-                        $file_name = $file_info['basename'];

+						$file_name = $file_info['basename'];

 

-                        $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

+						$img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

 

-                        if (!file_exists($img_arr['path'])) {

+						if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+							$wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+					$attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

 

-                    if (!empty($attachment_data)) {

+					if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+						if ($attachment_data->ID)

+							$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

 

-                    } else {

+					} else {

 

-                        if (has_post_thumbnail($post_id)) {

+						if (has_post_thumbnail($post_id)) {

 

-                            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+							$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-                            wp_delete_attachment($post_thumbnail_id);

+							wp_delete_attachment($post_thumbnail_id);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+					$wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

 

-                    geodir_set_wp_featured_image($post_id);

+					geodir_set_wp_featured_image($post_id);

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -2344,9 +2344,9 @@ 
 function geodir_default_rating_star_icon()

 {

 

-    if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

-    }

+	if (!get_option('geodir_default_rating_star_icon')) {

+		update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+	}

 

 }

 

@@ -2364,23 +2364,23 @@ 
  */

 function geodir_user_post_listing_count()

 {

-    global $wpdb, $plugin_prefix, $current_user;

+	global $wpdb, $plugin_prefix, $current_user;

 

-    $user_id = $current_user->ID;

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$user_id = $current_user->ID;

+	$all_posts = get_option('geodir_listing_link_user_dashboard');

 

-    $user_listing = array();

-    if (is_array($all_posts) && !empty($all_posts)) {

-        foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

+	$user_listing = array();

+	if (is_array($all_posts) && !empty($all_posts)) {

+		foreach ($all_posts as $ptype) {

+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

 

-            if ($total_posts > 0) {

-                $user_listing[$ptype] = $total_posts;

-            }

-        }

-    }

+			if ($total_posts > 0) {

+				$user_listing[$ptype] = $total_posts;

+			}

+		}

+	}

 

-    return $user_listing;

+	return $user_listing;

 }

 

 

@@ -2400,579 +2400,579 @@ 
  */

 function geodir_detail_page_custom_field_tab($tabs_arr)

 {

-    global $post;

-

-    $post_type = geodir_get_current_posttype();

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

-        $package_info = array();

-        $package_info = geodir_post_package_info($package_info, $post);

-        $post_package_id = $package_info->pid;

-        $fields_location = 'detail';

-

-        $custom_fields = geodir_post_custom_fields($post_package_id, 'default', $post_type, $fields_location);

-        if (!empty($custom_fields)) {

-            $parse_custom_fields = array();

-            foreach ($custom_fields as $field) {

-                $field = stripslashes_deep($field); // strip slashes

+	global $post;

+

+	$post_type = geodir_get_current_posttype();

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

+		$package_info = array();

+		$package_info = geodir_post_package_info($package_info, $post);

+		$post_package_id = $package_info->pid;

+		$fields_location = 'detail';

+

+		$custom_fields = geodir_post_custom_fields($post_package_id, 'default', $post_type, $fields_location);

+		if (!empty($custom_fields)) {

+			$parse_custom_fields = array();

+			foreach ($custom_fields as $field) {

+				$field = stripslashes_deep($field); // strip slashes

                 

-                $type = $field;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->$field_name) && isset($_REQUEST[$field_name])) {

-                    $post->$field_name = $_REQUEST[$field_name];

-                }

-

-                if (isset($field['show_as_tab']) && $field['show_as_tab'] == 1 && ((isset($post->$field_name) && $post->$field_name != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    if ($type['type'] == 'datepicker' && ($post->$type['htmlvar_name'] == '' || $post->$type['htmlvar_name'] == '0000-00-00')) {

-                        continue;

-                    }

-

-                    $parse_custom_fields[] = $field;

-                }

-            }

-            $custom_fields = $parse_custom_fields;

-        }

-

-        if (!empty($custom_fields)) {

-            $field_set_start = 0;

-            $fieldset_count = 0;

-            $fieldset = '';

-            $total_fields = count($custom_fields);

-            $count_field = 0;

-            $fieldset_arr = array();

-            $i = 0;

-            $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

-

-            foreach ($custom_fields as $field) {

-                $count_field++;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->$field_name) && isset($_REQUEST[$field_name])) {

-                    $post->$field_name = $_REQUEST[$field_name];

-                }

-

-                if (isset($field['show_as_tab']) && $field['show_as_tab'] == 1 && ((isset($post->$field_name) && $post->$field_name != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

-                    $site_title = trim($field['site_title']);

-                    $type = $field;

-                    $html = '';

-                    $html_var = $field_name;

-                    $field_icon = '';

-                    $variables_array = array();

-

-                    if ($type['type'] == 'datepicker' && ($post->$type['htmlvar_name'] == '' || $post->$type['htmlvar_name'] == '0000-00-00')) {

-                        continue;

-                    }

-

-                    if ($type['type'] != 'fieldset') {

-                        $i++;

-                        $variables_array['post_id'] = $post->ID;

-                        $variables_array['label'] = __($type['site_title'], 'geodirectory');

-                        $variables_array['value'] = '';

-                        $variables_array['value'] = $post->$type['htmlvar_name'];

-                    }

-

-                    if (strpos($type['field_icon'], 'http') !== false) {

-                        $field_icon = ' background: url(' . $type['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

-                    } elseif (strpos($type['field_icon'], 'fa fa-') !== false) {

-                        $field_icon = '<i class="' . $type['field_icon'] . '"></i>';

-                    }

+				$type = $field;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->$field_name) && isset($_REQUEST[$field_name])) {

+					$post->$field_name = $_REQUEST[$field_name];

+				}

+

+				if (isset($field['show_as_tab']) && $field['show_as_tab'] == 1 && ((isset($post->$field_name) && $post->$field_name != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+					if ($type['type'] == 'datepicker' && ($post->$type['htmlvar_name'] == '' || $post->$type['htmlvar_name'] == '0000-00-00')) {

+						continue;

+					}

+

+					$parse_custom_fields[] = $field;

+				}

+			}

+			$custom_fields = $parse_custom_fields;

+		}

 

-                    switch ($type['type']) {

-                        case 'fieldset': {

-                            $i = 0;

-                            $fieldset_count++;

-                            $field_set_start = 1;

-                            $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

-                            $fieldset_arr[$fieldset_count]['label'] = $label;

-                        }

-                            break;

-                        case 'url': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-

-                                if ($type['name'] == 'geodir_facebook') {

-                                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';

-                                } elseif ($type['name'] == 'geodir_twitter') {

-                                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';

-                                } else {

-                                    $field_icon_af = '<i class="fa fa-link"></i>';

-                                }

-

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+		if (!empty($custom_fields)) {

+			$field_set_start = 0;

+			$fieldset_count = 0;

+			$fieldset = '';

+			$total_fields = count($custom_fields);

+			$count_field = 0;

+			$fieldset_arr = array();

+			$i = 0;

+			$geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

+

+			foreach ($custom_fields as $field) {

+				$count_field++;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->$field_name) && isset($_REQUEST[$field_name])) {

+					$post->$field_name = $_REQUEST[$field_name];

+				}

+

+				if (isset($field['show_as_tab']) && $field['show_as_tab'] == 1 && ((isset($post->$field_name) && $post->$field_name != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+					$label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

+					$site_title = trim($field['site_title']);

+					$type = $field;

+					$html = '';

+					$html_var = $field_name;

+					$field_icon = '';

+					$variables_array = array();

+

+					if ($type['type'] == 'datepicker' && ($post->$type['htmlvar_name'] == '' || $post->$type['htmlvar_name'] == '0000-00-00')) {

+						continue;

+					}

+

+					if ($type['type'] != 'fieldset') {

+						$i++;

+						$variables_array['post_id'] = $post->ID;

+						$variables_array['label'] = __($type['site_title'], 'geodirectory');

+						$variables_array['value'] = '';

+						$variables_array['value'] = $post->$type['htmlvar_name'];

+					}

+

+					if (strpos($type['field_icon'], 'http') !== false) {

+						$field_icon = ' background: url(' . $type['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+					} elseif (strpos($type['field_icon'], 'fa fa-') !== false) {

+						$field_icon = '<i class="' . $type['field_icon'] . '"></i>';

+					}

+

+					switch ($type['type']) {

+						case 'fieldset': {

+							$i = 0;

+							$fieldset_count++;

+							$field_set_start = 1;

+							$fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+							$fieldset_arr[$fieldset_count]['label'] = $label;

+						}

+							break;

+						case 'url': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+

+								if ($type['name'] == 'geodir_facebook') {

+									$field_icon_af = '<i class="fa fa-facebook-square"></i>';

+								} elseif ($type['name'] == 'geodir_twitter') {

+									$field_icon_af = '<i class="fa fa-twitter-square"></i>';

+								} else {

+									$field_icon_af = '<i class="fa fa-link"></i>';

+								}

+

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

                             

-                            $a_url = geodir_parse_custom_field_url($post->$type['htmlvar_name']);

-

-                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

-                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            // all search engines that use the nofollow value exclude links that use it from their ranking calculation

-                            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . ' <a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' .

-                                /**

-                                 * Filer the custom field website name.

-                                 *

-                                 * @since 1.0.0

-                                 * @param string $title The field name default: "Website".

-                                 * @param string $website The website address.

-                                 * @param int $post->ID The post ID.

-                                 */

-                                apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';

-                        }

-                            break;

-                        case 'phone': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-phone"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

-                        }

-                            break;

-                        case 'time': {

-                            $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                $value = date_i18n(get_option('time_format'), strtotime($post->$type['htmlvar_name']));

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-clock-o"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . stripslashes($value) . '</div>';

-                        }

-                            break;

-                        case 'datepicker': {

-                            $date_format = geodir_default_date_format();

-                            if ($type['extra_fields'] != '') {

-                                $date_format = unserialize($type['extra_fields']);

-                                $date_format = $date_format['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);

-

-                            $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $post->$type['htmlvar_name']) : $post->$type['htmlvar_name']; // PHP doesn't work well with dd/mm/yyyy format

-

-                            $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                $value = date($date_format, strtotime($post_htmlvar_value));

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-calendar"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . $value . '</div>';

-                        }

-                            break;

-                        case 'text': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

-                        }

-                            break;

-                        case 'radio': {

-

-                            if ($post->$type['htmlvar_name'] != '') {

-                                if ($post->$type['htmlvar_name'] == 'f' || $post->$type['htmlvar_name'] == '0') {

-                                    $html_val = __('No', 'geodirectory');

-                                } else if ($post->$type['htmlvar_name'] == 't' || $post->$type['htmlvar_name'] == '1') {

-                                    $html_val = __('Yes', 'geodirectory');

-                                } else {

-                                    $html_val = __($post->$type['htmlvar_name'], 'geodirectory');

+							$a_url = geodir_parse_custom_field_url($post->$type['htmlvar_name']);

+

+							$website = !empty($a_url['url']) ? $a_url['url'] : '';

+							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							// all search engines that use the nofollow value exclude links that use it from their ranking calculation

+							$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . ' <a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' .

+								/**

+								 * Filer the custom field website name.

+								 *

+								 * @since 1.0.0

+								 * @param string $title The field name default: "Website".

+								 * @param string $website The website address.

+								 * @param int $post->ID The post ID.

+								 */

+								apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';

+						}

+							break;

+						case 'phone': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-phone"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

+						}

+							break;

+						case 'time': {

+							$value = '';

+							if ($post->$type['htmlvar_name'] != '')

+								$value = date_i18n(get_option('time_format'), strtotime($post->$type['htmlvar_name']));

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-clock-o"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . stripslashes($value) . '</div>';

+						}

+							break;

+						case 'datepicker': {

+							$date_format = geodir_default_date_format();

+							if ($type['extra_fields'] != '') {

+								$date_format = unserialize($type['extra_fields']);

+								$date_format = $date_format['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);

+

+							$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $post->$type['htmlvar_name']) : $post->$type['htmlvar_name']; // PHP doesn't work well with dd/mm/yyyy format

+

+							$value = '';

+							if ($post->$type['htmlvar_name'] != '')

+								$value = date($date_format, strtotime($post_htmlvar_value));

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-calendar"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . $value . '</div>';

+						}

+							break;

+						case 'text': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

+						}

+							break;

+						case 'radio': {

+

+							if ($post->$type['htmlvar_name'] != '') {

+								if ($post->$type['htmlvar_name'] == 'f' || $post->$type['htmlvar_name'] == '0') {

+									$html_val = __('No', 'geodirectory');

+								} else if ($post->$type['htmlvar_name'] == 't' || $post->$type['htmlvar_name'] == '1') {

+									$html_val = __('Yes', 'geodirectory');

+								} else {

+									$html_val = __($post->$type['htmlvar_name'], 'geodirectory');

                                     

-                                    if (!empty($type['option_values'])) {

-                                        $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+									if (!empty($type['option_values'])) {

+										$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

                                         

-                                        if (!empty($cf_option_values)) {

-                                            foreach ($cf_option_values as $cf_option_value) {

-                                                if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-                                                    $html_val = $cf_option_value['label'];

-                                                }

-                                            }

-                                        }

-                                    }

-                                }

-

-                                if (strpos($field_icon, 'http') !== false) {

-                                    $field_icon_af = '';

-                                } else if ($field_icon == '') {

-                                    $field_icon_af = '';

-                                } else {

-                                    $field_icon_af = $field_icon;

-                                    $field_icon = '';

-                                }

-

-                                $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;

-

-                                if ($field_set_start == 1 && $site_title != '') {

-                                    $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                                }

-

-                                $html .= ' </span>' . $html_val . '</div>';

-                            }

-                        }

-                            break;

-                        case 'checkbox': {

-                            $html_var = $type['htmlvar_name'];

-                            $html_val = $type['htmlvar_name'];

-

-                            if ((int)$post->$html_var == 1) {

-

-                                if ($post->$type['htmlvar_name'] == '1') {

-                                    $html_val = __('Yes', 'geodirectory');

-                                } else {

-                                    $html_val = __('No', 'geodirectory');

-                                }

-

-                                if (strpos($field_icon, 'http') !== false) {

-                                    $field_icon_af = '';

-                                } else if ($field_icon == '') {

-                                    $field_icon_af = '';

-                                } else {

-                                    $field_icon_af = $field_icon;

-                                    $field_icon = '';

-                                }

-

-                                $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                                $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;

-

-                                if ($field_set_start == 1 && $site_title != '') {

-                                    $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                                }

-

-                                $html .= ' </span>' . $html_val . '</div>';

-                            }

-                        }

-                            break;

-                        case 'select': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

+										if (!empty($cf_option_values)) {

+											foreach ($cf_option_values as $cf_option_value) {

+												if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+													$html_val = $cf_option_value['label'];

+												}

+											}

+										}

+									}

+								}

+

+								if (strpos($field_icon, 'http') !== false) {

+									$field_icon_af = '';

+								} else if ($field_icon == '') {

+									$field_icon_af = '';

+								} else {

+									$field_icon_af = $field_icon;

+									$field_icon = '';

+								}

+

+								$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+								$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;

+

+								if ($field_set_start == 1 && $site_title != '') {

+									$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+								}

+

+								$html .= ' </span>' . $html_val . '</div>';

+							}

+						}

+							break;

+						case 'checkbox': {

+							$html_var = $type['htmlvar_name'];

+							$html_val = $type['htmlvar_name'];

+

+							if ((int)$post->$html_var == 1) {

+

+								if ($post->$type['htmlvar_name'] == '1') {

+									$html_val = __('Yes', 'geodirectory');

+								} else {

+									$html_val = __('No', 'geodirectory');

+								}

+

+								if (strpos($field_icon, 'http') !== false) {

+									$field_icon_af = '';

+								} else if ($field_icon == '') {

+									$field_icon_af = '';

+								} else {

+									$field_icon_af = $field_icon;

+									$field_icon = '';

+								}

+

+								$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+								$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;

+

+								if ($field_set_start == 1 && $site_title != '') {

+									$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+								}

+

+								$html .= ' </span>' . $html_val . '</div>';

+							}

+						}

+							break;

+						case 'select': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

                             

-                            $field_value = __($post->$type['htmlvar_name'], 'geodirectory');

+							$field_value = __($post->$type['htmlvar_name'], 'geodirectory');

                             

-                            if (!empty($type['option_values'])) {

-                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+							if (!empty($type['option_values'])) {

+								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

                                 

-                                if (!empty($cf_option_values)) {

-                                    foreach ($cf_option_values as $cf_option_value) {

-                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-                                            $field_value = $cf_option_value['label'];

-                                        }

-                                    }

-                                }

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . $field_value . '</div>';

-                        }

-                            break;

-                        case 'multiselect': {

-                            if (is_array($post->$type['htmlvar_name'])) {

-                                $post->$type['htmlvar_name'] = implode(', ', $post->$type['htmlvar_name']);

-                            }

-

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

-

-                            $option_values = array();

-                            if (!empty($type['option_values'])) {

-                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+								if (!empty($cf_option_values)) {

+									foreach ($cf_option_values as $cf_option_value) {

+										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+											$field_value = $cf_option_value['label'];

+										}

+									}

+								}

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . $field_value . '</div>';

+						}

+							break;

+						case 'multiselect': {

+							if (is_array($post->$type['htmlvar_name'])) {

+								$post->$type['htmlvar_name'] = implode(', ', $post->$type['htmlvar_name']);

+							}

+

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

+

+							$option_values = array();

+							if (!empty($type['option_values'])) {

+								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

                                 

-                                if (!empty($cf_option_values)) {

-                                    foreach ($cf_option_values as $cf_option_value) {

-                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-                                            $option_values[] = $cf_option_value['label'];

-                                        }

-                                    }

-                                }

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>';

-

-                            if (count($option_values) > 1) {

-                                $html .= '<ul>';

-                                foreach ($option_values as $val) {

-                                    $html .= '<li>' . $val . '</li>';

-                                }

-                                $html .= '</ul>';

-                            } else {

-                                $html .= $post->$type['htmlvar_name'];

-                            }

-                            $html .= '</div>';

-                        }

-                            break;

-                        case 'email': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '<i class="fa fa-envelope"></i>';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

-                        }

-                            break;

-                        case 'textarea': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= '</span>' . wpautop(stripslashes($post->$type['htmlvar_name'])) . '</div>';

-                        }

-                            break;

-                        case 'html': {

-                            if (strpos($field_icon, 'http') !== false) {

-                                $field_icon_af = '';

-                            } elseif ($field_icon == '') {

-                                $field_icon_af = '';

-                            } else {

-                                $field_icon_af = $field_icon;

-                                $field_icon = '';

-                            }

-

-                            $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-                            $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

-                            if ($field_set_start == 1 && $site_title != '') {

-                                $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                            }

-                            $html .= ' </span>' . wpautop(stripslashes($post->$type['htmlvar_name'])) . '</div>';

-                        }

-                        break;

-                        case 'file': {

-                            $html_var = $type['htmlvar_name'];

-

-                            if (!empty($post->$type['htmlvar_name'])) {

-                                $files = explode(",", $post->$type['htmlvar_name']);

-

-                                if (!empty($files)) {

-                                    $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-                                    $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+								if (!empty($cf_option_values)) {

+									foreach ($cf_option_values as $cf_option_value) {

+										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+											$option_values[] = $cf_option_value['label'];

+										}

+									}

+								}

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>';

+

+							if (count($option_values) > 1) {

+								$html .= '<ul>';

+								foreach ($option_values as $val) {

+									$html .= '<li>' . $val . '</li>';

+								}

+								$html .= '</ul>';

+							} else {

+								$html .= $post->$type['htmlvar_name'];

+							}

+							$html .= '</div>';

+						}

+							break;

+						case 'email': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '<i class="fa fa-envelope"></i>';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . stripslashes($post->$type['htmlvar_name']) . '</div>';

+						}

+							break;

+						case 'textarea': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= '</span>' . wpautop(stripslashes($post->$type['htmlvar_name'])) . '</div>';

+						}

+							break;

+						case 'html': {

+							if (strpos($field_icon, 'http') !== false) {

+								$field_icon_af = '';

+							} elseif ($field_icon == '') {

+								$field_icon_af = '';

+							} else {

+								$field_icon_af = $field_icon;

+								$field_icon = '';

+							}

+

+							$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+							$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;

+							if ($field_set_start == 1 && $site_title != '') {

+								$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+							}

+							$html .= ' </span>' . wpautop(stripslashes($post->$type['htmlvar_name'])) . '</div>';

+						}

+						break;

+						case 'file': {

+							$html_var = $type['htmlvar_name'];

+

+							if (!empty($post->$type['htmlvar_name'])) {

+								$files = explode(",", $post->$type['htmlvar_name']);

+

+								if (!empty($files)) {

+									$extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

+									$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

                                

-                                    $file_paths = '';

-                                    foreach ($files as $file) {

-                                        if (!empty($file)) {

-                                            $image_name_arr = explode('/', $file);

-                                            $filename = end($image_name_arr);

-

-                                            $arr_file_type = wp_check_filetype($filename);

-                                            if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-                                                continue;

-                                            }

-                                            $uploaded_file_type = $arr_file_type['type'];

-                                            $uploaded_file_ext = $arr_file_type['ext'];

+									$file_paths = '';

+									foreach ($files as $file) {

+										if (!empty($file)) {

+											$image_name_arr = explode('/', $file);

+											$filename = end($image_name_arr);

+

+											$arr_file_type = wp_check_filetype($filename);

+											if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+												continue;

+											}

+											$uploaded_file_type = $arr_file_type['type'];

+											$uploaded_file_ext = $arr_file_type['ext'];

                                             

-                                            if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-                                                continue; // Invalid file type.

-                                            }

-

-                                            $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

-

-                                            // If the uploaded file is image

-                                            if (in_array($uploaded_file_type, $image_file_types)) {

-                                                $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-                                                $file_paths .= '<a href="'.$file.'">';

-                                                $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-                                                $file_paths .= '</a>';

-                                                $file_paths .= '</div>';

-                                            } else {

-                                                $ext_path = '_' . $html_var . '_';

-                                                $filename = explode($ext_path, $filename);

-                                                $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

-                                            }

-                                        }

-                                    }

-

-                                    if (strpos($field_icon, 'http') !== false) {

-                                        $field_icon_af = '';

-                                    } else if ($field_icon == '') {

-                                        $field_icon_af = '';

-                                    } else {

-                                        $field_icon_af = $field_icon;

-                                        $field_icon = '';

-                                    }

-

-                                    $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

-

-

-                                    $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . ' geodir-custom-file-box" style="clear:both;"><span class="geodir-i-file" style="display:inline-block;vertical-align:top;padding-right:14px;' . $field_icon . '">' . $field_icon_af;

-

-                                    if ($field_set_start == 1 && $site_title != '') {

-                                        $html .= ' ' . __($site_title, 'geodirectory') . ': ';

-                                    }

-

-                                    $html .= ' </span>' . $file_paths . '</div>';

-                                }

-                            }

-                        }

-                            break;

-                    }

-

-

-                    /**

-                     * Filter custom field output in tab.

-                     *

-                     * @since 1.5.6

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

-

-                    $fieldset_html = '';

-                    if ($field_set_start == 1) {

-                        $add_html = false;

-                        if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

-                            if ($fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count - 1]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

-                            }

-                            $fieldset_html = $fieldset;

-                            $fieldset = '';

-                        } else {

-                            $fieldset .= $html;

-                            if ($total_fields == $count_field && $fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

-                                $fieldset_html = $fieldset;

-                            }

-                        }

-

-                        if ($add_html) {

-                            $tabs_arr[$htmlvar_name] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /**

-                                 * Filter if a custom field should be displayed on the details page tab.

-                                 *

-                                 * @since 1.0.0

-                                 * @param string $htmlvar_name The field HTML var name.

-                                 */

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group">' . $fieldset_html . '</html>'

-                            );

-                        }

-                    } else {

-                        if ($html != '') {

-                            $tabs_arr[$field['htmlvar_name']] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /** This action is documented in geodirectory_hooks_actions.php */

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

-                                'tab_content' => $html

-                            );

-                        }

-                    }

-                }

-            }

-        }

-    }

-    return $tabs_arr;

+											if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+												continue; // Invalid file type.

+											}

+

+											$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

+

+											// If the uploaded file is image

+											if (in_array($uploaded_file_type, $image_file_types)) {

+												$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

+												$file_paths .= '<a href="'.$file.'">';

+												$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+												$file_paths .= '</a>';

+												$file_paths .= '</div>';

+											} else {

+												$ext_path = '_' . $html_var . '_';

+												$filename = explode($ext_path, $filename);

+												$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

+											}

+										}

+									}

+

+									if (strpos($field_icon, 'http') !== false) {

+										$field_icon_af = '';

+									} else if ($field_icon == '') {

+										$field_icon_af = '';

+									} else {

+										$field_icon_af = $field_icon;

+										$field_icon = '';

+									}

+

+									$geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

+

+

+									$html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . ' geodir-custom-file-box" style="clear:both;"><span class="geodir-i-file" style="display:inline-block;vertical-align:top;padding-right:14px;' . $field_icon . '">' . $field_icon_af;

+

+									if ($field_set_start == 1 && $site_title != '') {

+										$html .= ' ' . __($site_title, 'geodirectory') . ': ';

+									}

+

+									$html .= ' </span>' . $file_paths . '</div>';

+								}

+							}

+						}

+							break;

+					}

+

+

+					/**

+					 * Filter custom field output in tab.

+					 *

+					 * @since 1.5.6

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					$html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

+

+					$fieldset_html = '';

+					if ($field_set_start == 1) {

+						$add_html = false;

+						if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

+							if ($fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count - 1]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

+							}

+							$fieldset_html = $fieldset;

+							$fieldset = '';

+						} else {

+							$fieldset .= $html;

+							if ($total_fields == $count_field && $fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

+								$fieldset_html = $fieldset;

+							}

+						}

+

+						if ($add_html) {

+							$tabs_arr[$htmlvar_name] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/**

+								 * Filter if a custom field should be displayed on the details page tab.

+								 *

+								 * @since 1.0.0

+								 * @param string $htmlvar_name The field HTML var name.

+								 */

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

+								'tab_content' => '<div class="geodir-company_info field-group">' . $fieldset_html . '</html>'

+							);

+						}

+					} else {

+						if ($html != '') {

+							$tabs_arr[$field['htmlvar_name']] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/** This action is documented in geodirectory_hooks_actions.php */

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

+								'tab_content' => $html

+							);

+						}

+					}

+				}

+			}

+		}

+	}

+	return $tabs_arr;

 }

 

 /* display add listing page for wpml */

@@ -2996,37 +2996,37 @@ 
  */

 function geodir_add_post_status_author_page()

 {

-    global $wpdb, $post;

-

-    $html = '';

-    if (get_current_user_id()) {

-        if (geodir_is_page('author') && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

-

-            // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

-            $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

-            $status = "<strong>(";

-            $status_icon = '<i class="fa fa-play"></i>';

-            if ($real_status == 'publish') {

-                $status .= __('Published', 'geodirectory');

-            } else {

-                $status .= __('Not published', 'geodirectory');

-                $status_icon = '<i class="fa fa-pause"></i>';

-            }

-            $status .= ")</strong>";

+	global $wpdb, $post;

+

+	$html = '';

+	if (get_current_user_id()) {

+		if (geodir_is_page('author') && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

+

+			// we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

+			$real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

+			$status = "<strong>(";

+			$status_icon = '<i class="fa fa-play"></i>';

+			if ($real_status == 'publish') {

+				$status .= __('Published', 'geodirectory');

+			} else {

+				$status .= __('Not published', 'geodirectory');

+				$status_icon = '<i class="fa fa-pause"></i>';

+			}

+			$status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

-        }

-    }

+			$html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+		}

+	}

 

-    if ($html != '') {

-        /**

-         * Filter the post status text on the author page.

-         *

-         * @since 1.0.0

-         * @param string $html The HTML of the status.

-         */

-        echo apply_filters('geodir_filter_status_text_on_author_page', $html);

-    }

+	if ($html != '') {

+		/**

+		 * Filter the post status text on the author page.

+		 *

+		 * @since 1.0.0

+		 * @param string $html The HTML of the status.

+		 */

+		echo apply_filters('geodir_filter_status_text_on_author_page', $html);

+	}

 

 

 }

@@ -3040,21 +3040,21 @@ 
  */

 function geodir_init_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

-        remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

-        remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

-        remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

-

-        add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

-        add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

-        add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

-        add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

-        add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

-    }

+	if (get_option('geodir_disable_rating')) {

+		remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

+		remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

+		remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

+		remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

+

+		add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

+		add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

+		add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

+		add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

+		add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

+	}

 }

 

 /**

@@ -3066,20 +3066,20 @@ 
  */

 function geodir_no_rating_rating_fields()

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

-        if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {

-            echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

-            if (get_option('geodir_reviewrating_enable_images')) {

-                geodir_reviewrating_rating_img_html();

-            }

-        } else {

-            echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

-        }

-    }

+	if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

+		if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {

+			echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

+			if (get_option('geodir_reviewrating_enable_images')) {

+				geodir_reviewrating_rating_img_html();

+			}

+		} else {

+			echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

+		}

+	}

 }

 

 /**

@@ -3093,11 +3093,11 @@ 
  */

 function geodir_no_rating_comment_text($content, $comment = '')

 {

-    if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

-    } else {

-        return $content;

-    }

+	if (!is_admin()) {

+		return '<div class="description">' . $content . '</div>';

+	} else {

+		return $content;

+	}

 }

 

 /**

@@ -3110,7 +3110,7 @@ 
  */

 function geodir_no_rating_review_rating_html($content = '')

 {

-    return NULL;

+	return NULL;

 }

 

 /**

@@ -3124,19 +3124,19 @@ 
  */

 function geodir_no_rating_get_sort_options($options, $post_type = '')

 {

-    $new_options = array();

-    if (!empty($options)) {

-        foreach ($options as $option) {

-            if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

-                continue;

-            }

-            $new_options[] = $option;

-        }

+	$new_options = array();

+	if (!empty($options)) {

+		foreach ($options as $option) {

+			if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

+				continue;

+			}

+			$new_options[] = $option;

+		}

 

-        $options = $new_options;

-    }

+		$options = $new_options;

+	}

 

-    return $options;

+	return $options;

 }

 

 add_filter('geodir_all_js_msg', 'geodir_all_js_msg_no_rating', 100);

@@ -3150,11 +3150,11 @@ 
  */

 function geodir_all_js_msg_no_rating($msg = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $msg['gd_cmt_no_rating'] = true;

-    }

+	if (get_option('geodir_disable_rating')) {

+		$msg['gd_cmt_no_rating'] = true;

+	}

 

-    return $msg;

+	return $msg;

 }

 

 add_filter('body_class', 'geodir_body_class_no_rating', 100);

@@ -3168,11 +3168,11 @@ 
  */

 function geodir_body_class_no_rating($classes = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $classes[] = 'gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$classes[] = 'gd-no-rating';

+	}

 

-    return $classes;

+	return $classes;

 }

 

 add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);

@@ -3186,11 +3186,11 @@ 
  */

 function geodir_admin_body_class_no_rating($class = '')

 {

-    if (get_option('geodir_disable_rating')) {

-        $class .= ' gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$class .= ' gd-no-rating';

+	}

 

-    return $class;

+	return $class;

 }

 

 add_action('wp_head', 'geodir_wp_head_no_rating');

@@ -3203,10 +3203,10 @@ 
  */

 function geodir_wp_head_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

-        echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

-    }

+	if (get_option('geodir_disable_rating')) {

+		echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

+		echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

+	}

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_custom_field_translation');

@@ -3223,36 +3223,36 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

-

-    $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

-

-    /**

-     * Filters the geodirectory option names that requires to add for translation.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

-     *

-     * @param  array $gd_options Array of option names.

-     */

-    $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

-    $gd_options = array_unique($gd_options);

-

-    if (!empty($gd_options)) {

-        foreach ($gd_options as $gd_option) {

-            if ($gd_option != '' && $option_value = get_option($gd_option)) {

-                $option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

+	$translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+

+	$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

+

+	/**

+	 * Filters the geodirectory option names that requires to add for translation.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

+	 *

+	 * @param  array $gd_options Array of option names.

+	 */

+	$gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

+	$gd_options = array_unique($gd_options);

+

+	if (!empty($gd_options)) {

+		foreach ($gd_options as $gd_option) {

+			if ($gd_option != '' && $option_value = get_option($gd_option)) {

+				$option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

                 

-                if ($option_value != '' && !in_array($option_value, $translation_texts)) {

-                    $translation_texts[] = stripslashes_deep($option_value);

-                }

-            }

-        }

-    }

+				if ($option_value != '' && !in_array($option_value, $translation_texts)) {

+					$translation_texts[] = stripslashes_deep($option_value);

+				}

+			}

+		}

+	}

 

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

-    return $translation_texts;

+	return $translation_texts;

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');

Spacing +81 added lines, -81 removed lines

@@ -136,7 +136,7 @@ 
 /* ON TEMPLATE INCLUDE */

 /////////////////////////

 

-add_filter('template_include', 'geodir_template_loader',9);

+add_filter('template_include', 'geodir_template_loader', 9);

 

 /////////////////////////

 /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */

@@ -177,7 +177,7 @@ 
 ////////////////////////

 

 add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);

-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);

+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);

 add_action('created_term', 'geodir_term_review_count_force_update', 100);

 add_action('edited_term', 'geodir_term_review_count_force_update', 100);

 add_action('delete_term', 'geodir_term_review_count_force_update', 100);

@@ -319,8 +319,8 @@ 
 

 /////// GEO DIRECOTORY CUSTOM HOOKS ///

 

-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content 

-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content

+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content 

+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content

 

 // Detail page sidebar content 

 add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);

@@ -422,7 +422,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+    if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

          *

@@ -469,7 +469,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

+    if ((int) get_option('geodir_disable_sharethis_button_section') != 1) {

         /**

          * Filter the geodir_share_this_button() function content.

          *

@@ -508,7 +508,7 @@ 
             $post_id = $post->ID;

             

             if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                $post_id = (int)$_REQUEST['pid'];

+                $post_id = (int) $_REQUEST['pid'];

             }

 

             $postlink = get_permalink(geodir_add_listing_page_id());

@@ -525,7 +525,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

+    if ((int) get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -578,14 +578,14 @@ 
     $hide_refresh = get_option('geodir_ga_auto_refresh');

     

     $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+    if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {

         $page_url = urlencode($_SERVER['REQUEST_URI']);

         ?>

         <script type="text/javascript">

             var gd_gaTimeOut;

-            var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

-            var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>;

-            var gd_gaAutoRefresh = <?php echo $auto_refresh;?>;

+            var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');

+            var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>;

+            var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>;

             ga_data1 = false;

             ga_data2 = false;

             ga_data3 = false;

@@ -617,34 +617,34 @@ 
             });

 

             function gdga_weekVSweek() {

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=thisweek", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=thisweek", success: function(result){

                     ga_data1 = jQuery.parseJSON(result);

                     if(ga_data1.error){jQuery('#ga_stats').html(result);return;}

                     gd_renderWeekOverWeekChart();

                 }});

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=lastweek", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=lastweek", success: function(result){

                     ga_data2 = jQuery.parseJSON(result);

                     gd_renderWeekOverWeekChart();

                 }});

             }

 

             function gdga_yearVSyear() {

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=thisyear", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=thisyear", success: function(result){

                     ga_data3 = jQuery.parseJSON(result);

                     if(ga_data3.error){jQuery('#ga_stats').html(result);return;}

 

                     gd_renderYearOverYearChart()

                 }});

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=lastyear", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=lastyear", success: function(result){

                     ga_data4 = jQuery.parseJSON(result);

                     gd_renderYearOverYearChart()

                 }});

             }

 

             function gdga_country() {

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=country", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=country", success: function(result){

                     ga_data5 = jQuery.parseJSON(result);

                     if(ga_data5.error){jQuery('#ga_stats').html(result);return;}

                     gd_renderTopCountriesChart();

@@ -652,7 +652,7 @@ 
             }

 

             function gdga_realtime(dom_ready) {

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=realtime", success: function(result) {

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=realtime", success: function(result) {

                     ga_data6 = jQuery.parseJSON(result);

                     if (ga_data6.error) {

                         jQuery('#ga_stats').html(result);

@@ -726,7 +726,7 @@ 
             }

 

             function gdga_noResults() {

-                jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');

+                jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');

                 jQuery('#gdga-legend-container').html('');

             }

 

@@ -758,18 +758,18 @@ 
                     var data2 = results[1].rows.map(function(row) { return +row[2]; });

                     //var labelsN = results[0].rows.map(function(row) { return +row[1]; });

 

-                    var labels = ['<?php _e('Jan', 'geodirectory');?>',

-                        '<?php _e('Feb', 'geodirectory');?>',

-                        '<?php _e('Mar', 'geodirectory');?>',

-                        '<?php _e('Apr', 'geodirectory');?>',

-                        '<?php _e('May', 'geodirectory');?>',

-                        '<?php _e('Jun', 'geodirectory');?>',

-                        '<?php _e('Jul', 'geodirectory');?>',

-                        '<?php _e('Aug', 'geodirectory');?>',

-                        '<?php _e('Sep', 'geodirectory');?>',

-                        '<?php _e('Oct', 'geodirectory');?>',

-                        '<?php _e('Nov', 'geodirectory');?>',

-                        '<?php _e('Dec', 'geodirectory');?>'];

+                    var labels = ['<?php _e('Jan', 'geodirectory'); ?>',

+                        '<?php _e('Feb', 'geodirectory'); ?>',

+                        '<?php _e('Mar', 'geodirectory'); ?>',

+                        '<?php _e('Apr', 'geodirectory'); ?>',

+                        '<?php _e('May', 'geodirectory'); ?>',

+                        '<?php _e('Jun', 'geodirectory'); ?>',

+                        '<?php _e('Jul', 'geodirectory'); ?>',

+                        '<?php _e('Aug', 'geodirectory'); ?>',

+                        '<?php _e('Sep', 'geodirectory'); ?>',

+                        '<?php _e('Oct', 'geodirectory'); ?>',

+                        '<?php _e('Nov', 'geodirectory'); ?>',

+                        '<?php _e('Dec', 'geodirectory'); ?>'];

 

                     // Ensure the data arrays are at least as long as the labels array.

                     // Chart.js bar charts don't (yet) accept sparse datasets.

@@ -782,13 +782,13 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Year', 'geodirectory');?>',

+                                label: '<?php _e('Last Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Year', 'geodirectory');?>',

+                                label: '<?php _e('This Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 data : data1

@@ -833,30 +833,30 @@ 
 

                     <?php

                     // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

+                    __("Mon", 'geodirectory');

+                    __("Tue", 'geodirectory');

+                    __("Wed", 'geodirectory');

+                    __("Thu", 'geodirectory');

+                    __("Fri", 'geodirectory');

+                    __("Sat", 'geodirectory');

+                    __("Sun", 'geodirectory');

                     ?>

 

                     labels = [

-                        "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"

+                        "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"

                     ];

 

                     var data = {

                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Week', 'geodirectory');?>',

+                                label: '<?php _e('Last Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 pointColor : "rgba(220,220,220,1)",

@@ -864,7 +864,7 @@ 
                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Week', 'geodirectory');?>',

+                                label: '<?php _e('This Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 pointColor : "rgba(151,187,205,1)",

@@ -1071,18 +1071,18 @@ 
         </style>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>

-        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>

+        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>

         <span id="ga_stats" class="gdga-analytics-box" style="display:none">

-            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>

+            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>

             <div id="gd-active-users-container">

-                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>

+                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>

                     <b class="gd-ActiveUsers-value">0</b>

                 </div>

             </div>

             <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">

-                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>

-                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>

-                <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>

+                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>

+                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>

+                <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>

             </select>

             <div class="Chartjs-figure" id="gdga-chart-container"></div>

             <ol class="Chartjs-legend" id="gdga-legend-container"></ol>

@@ -1099,7 +1099,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+    if ((int) get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -1195,7 +1195,7 @@ 
     if (trim($content_html) != '') {

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

     }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+    if ((int) get_option('geodir_disable_rating_info_section') != 1) {

         /**

          * Filter the geodir_detail_page_review_rating() function content.

          *

@@ -1235,7 +1235,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+    if ((int) get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

          *

@@ -1326,7 +1326,7 @@ 
 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

 		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+		'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

     );

 

@@ -1343,7 +1343,7 @@ 
     foreach ($arr_alert_msg as $key => $value) {

         if (!is_scalar($value))

             continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+        $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');

     }

 

     $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

@@ -1519,7 +1519,7 @@ 
         global $post;

         $term_condition = '';

         if (isset($_REQUEST['backandedit'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

         }

 

@@ -1533,7 +1533,7 @@ 
                     echo 'checked="checked"';

                 } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

-                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

+                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

@@ -1573,7 +1573,7 @@ 
         /** This action is documented in geodirectory_template_actions.php */

         $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+        if (!($desc_limit === '' || (int) $desc_limit > 0)) {

             $is_display = false;

         }

     }

@@ -1621,7 +1621,7 @@ 
     global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

+	$listings_page_id = (int) get_option('geodir_listing_page');

 	if ($listings_page_id) {

 		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

@@ -1868,43 +1868,43 @@ 
 

 

     $gd_page = '';

-    if(geodir_is_page('home')){

+    if (geodir_is_page('home')) {

         $gd_page = 'home';

         $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

     }

-    elseif(geodir_is_page('detail')){

+    elseif (geodir_is_page('detail')) {

         $gd_page = 'detail';

         $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

     }

-    elseif(geodir_is_page('pt')){

+    elseif (geodir_is_page('pt')) {

         $gd_page = 'pt';

         $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

     }

-    elseif(geodir_is_page('location')){

+    elseif (geodir_is_page('location')) {

         $gd_page = 'location';

         $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

     }

-    elseif(geodir_is_page('search')){

+    elseif (geodir_is_page('search')) {

         $gd_page = 'search';

         $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

     }

-    elseif(geodir_is_page('add-listing')){

+    elseif (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

         $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

         $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

     }

-    elseif(geodir_is_page('login')){

+    elseif (geodir_is_page('login')) {

         $gd_page = 'login';

         $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

     }

-    elseif(geodir_is_page('listing-success')){

+    elseif (geodir_is_page('listing-success')) {

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -2167,7 +2167,7 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

+    if (geodir_is_page('login')) {

         remove_all_actions('template_redirect');

         remove_action('init', 'avia_modify_front', 10);

     }

@@ -2577,8 +2577,8 @@ 
                                 $date_format = $date_format['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

+                            $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);

 

@@ -2673,7 +2673,7 @@ 
                             $html_var = $type['htmlvar_name'];

                             $html_val = $type['htmlvar_name'];

 

-                            if ((int)$post->$html_var == 1) {

+                            if ((int) $post->$html_var == 1) {

 

                                 if ($post->$type['htmlvar_name'] == '1') {

                                     $html_val = __('Yes', 'geodirectory');

@@ -2849,7 +2849,7 @@ 
 

                                 if (!empty($files)) {

                                     $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-                                    $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $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']) ? $extra_fields['gd_file_types'] : '';

                                

                                     $file_paths = '';

                                     foreach ($files as $file) {

@@ -2873,7 +2873,7 @@ 
                                             // If the uploaded file is image

                                             if (in_array($uploaded_file_type, $image_file_types)) {

                                                 $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-                                                $file_paths .= '<a href="'.$file.'">';

+                                                $file_paths .= '<a href="' . $file . '">';

                                                 $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

                                                 $file_paths .= '</a>';

                                                 $file_paths .= '</div>';

@@ -3223,7 +3223,7 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+    $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();

 

     $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

 

geodirectory-admin/option-pages/design_settings_array.php

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
     $geodir_active_nav_locations = get_nav_menu_locations();

     if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

         foreach ($geodir_active_nav_locations as $key => $theme_location) {

-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];

+            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) {
+                            $post_type_arr[$key] = $geodir_all_nav_locations[$key];
+            }
         }

     }

 

Spacing +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
     ),

 	array(

 		'name' => __('Enable Font Awesome', 'geodirectory'),

-		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

+		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory'),

 		'id' => 'geodir_reviewrating_enable_font_awesome',

 		'type' => 'checkbox',

 		'std' => '0'

Indentation +903 added lines, -903 removed lines

@@ -17,14 +17,14 @@ 
  */

 function geodir_post_type_setting_fun()

 {

-    $post_type_arr = array();

+	$post_type_arr = array();

 

-    $post_types = geodir_get_posttypes('object');

+	$post_types = geodir_get_posttypes('object');

 

-    foreach ($post_types as $key => $post_types_obj) {

-        $post_type_arr[$key] = $post_types_obj->labels->singular_name;

-    }

-    return $post_type_arr;

+	foreach ($post_types as $key => $post_types_obj) {

+		$post_type_arr[$key] = $post_types_obj->labels->singular_name;

+	}

+	return $post_type_arr;

 }

 

 /**

@@ -35,556 +35,556 @@ 
  */

 function geodir_theme_location_setting_fun()

 {

-    $post_type_arr = array();

-    $geodir_all_nav_locations = get_registered_nav_menus();

-    $geodir_active_nav_locations = get_nav_menu_locations();

-    if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

-        foreach ($geodir_active_nav_locations as $key => $theme_location) {

-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];

-        }

-    }

-

-    return $post_type_arr;

+	$post_type_arr = array();

+	$geodir_all_nav_locations = get_registered_nav_menus();

+	$geodir_active_nav_locations = get_nav_menu_locations();

+	if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

+		foreach ($geodir_active_nav_locations as $key => $theme_location) {

+			if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

+				$post_type_arr[$key] = $geodir_all_nav_locations[$key];

+		}

+	}

+

+	return $post_type_arr;

 }

 /**

- * Filter GD design settings array.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Filter GD design settings array.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array(

 

-    /* Home Layout Settings start */

-    array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

+	/* Home Layout Settings start */

+	array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

 

 

-    array('name' => __('Home Top Section Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_top_section'),

+	array('name' => __('Home Top Section Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_top_section'),

 

-    array(

-        'name' => __('Geodirectory home page', 'geodirectory'),

-        'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

-        'id' => 'geodir_set_as_home',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Geodirectory home page', 'geodirectory'),

+		'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

+		'id' => 'geodir_set_as_home',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home top section', 'geodirectory'),

-        'desc' => __('Show the top section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home top section', 'geodirectory'),

+		'desc' => __('Show the top section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

 

 

-    array('name' => __('Home Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_layout'),

+	array('name' => __('Home Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_layout'),

 

-    array(

-        'name' => __('Home right section', 'geodirectory'),

-        'desc' => __('Show the right section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home right section', 'geodirectory'),

+		'desc' => __('Show the right section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home content section', 'geodirectory'),

-        'desc' => __('Show the content section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_contant_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home content section', 'geodirectory'),

+		'desc' => __('Show the content section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_contant_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home left section', 'geodirectory'),

-        'desc' => __('Show the left section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home left section', 'geodirectory'),

+		'desc' => __('Show the left section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Resize image large size', 'geodirectory'),

-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

-        'id' => 'geodir_use_wp_media_large_size',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Home bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'name' => __('Resize image large size', 'geodirectory'),

+		'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

+		'id' => 'geodir_use_wp_media_large_size',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

 

 

-    /* Home Layout Settings end */

+	/* Home Layout Settings end */

 

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

-    array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

+	array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

 

 

-    array('name' => __('Listing Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_listing_layout'),

+	array('name' => __('Listing Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_listing_layout'),

 

-    array(

-        'name' => __('Listing top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing right section', 'geodirectory'),

-        'desc' => __('Show the right section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing right section', 'geodirectory'),

+		'desc' => __('Show the right section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Listing content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of listing page', 'geodirectory'),

-        'id' => 'geodir_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Listing content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of listing page', 'geodirectory'),

+		'id' => 'geodir_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of listing content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing left section', 'geodirectory'),

-        'desc' => __('Show the left section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing left section', 'geodirectory'),

+		'desc' => __('Show the left section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Upload listing no image', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_listing_no_img',

-        'type' => 'file',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload listing no image', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_listing_no_img',

+		'type' => 'file',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Hover listing map animaton', 'geodirectory'),

-        'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),

-        'id' => 'geodir_listing_hover_bounce_map_pin',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Hover listing map animaton', 'geodirectory'),

+		'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),

+		'id' => 'geodir_listing_hover_bounce_map_pin',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

 

 

-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

 

-    array(

-        'name' => __('New listing default status', 'geodirectory'),

-        'desc' => __('Select new listing default status.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_new_post_default_status',

-        'css' => 'min-width:300px;',

-        'std' => 'publish',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'publish' => __('publish', 'geodirectory'),

-            'draft' => __('draft', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('New listing default status', 'geodirectory'),

+		'desc' => __('Select new listing default status.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_new_post_default_status',

+		'css' => 'min-width:300px;',

+		'std' => 'publish',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'publish' => __('publish', 'geodirectory'),

+			'draft' => __('draft', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('New listings settings', 'geodirectory'),

-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

-        'id' => 'geodir_listing_new_days',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('New listings settings', 'geodirectory'),

+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

+		'id' => 'geodir_listing_new_days',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

 

 

-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

 

-    array(

-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

-        'id' => 'geodir_accept_term_condition',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

+		'id' => 'geodir_accept_term_condition',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Show description field as editor', 'geodirectory'),

-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_tiny_editor_on_add_listing',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show description field as editor', 'geodirectory'),

+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_tiny_editor_on_add_listing',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

-    /* Listing Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

+	/* Listing Layout Settings end */

 

 

-    /* Search Layout Settings end */

+	/* Search Layout Settings end */

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

 

 

-    array('name' => __('Search Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_search_layout'),

+	array('name' => __('Search Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_search_layout'),

 

-    array(

-        'name' => __('Search top section', 'geodirectory'),

-        'desc' => __('Show the top section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search top section', 'geodirectory'),

+		'desc' => __('Show the top section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search right section', 'geodirectory'),

-        'desc' => __('Show the right section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search right section', 'geodirectory'),

+		'desc' => __('Show the right section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Search content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of search page', 'geodirectory'),

-        'id' => 'geodir_search_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Search content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of search page', 'geodirectory'),

+		'id' => 'geodir_search_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of search content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search left section', 'geodirectory'),

-        'desc' => __('Show the left section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search left section', 'geodirectory'),

+		'desc' => __('Show the left section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

-        'id' => 'geodir_width_search_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

+		'id' => 'geodir_width_search_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 	

 	array(

-        'name' => __('Show advanced pagination details', 'geodirectory'),

-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" aftre/before pagination.', 'geodirectory'),

-        'id' => 'geodir_pagination_advance_info',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array(

+		'name' => __('Show advanced pagination details', 'geodirectory'),

+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" aftre/before pagination.', 'geodirectory'),

+		'id' => 'geodir_pagination_advance_info',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array(

 						'' => __('Never Display', 'geodirectory'),

 						'after' => __('After Pagination', 'geodirectory'),

 						'before' => __('Before Pagination', 'geodirectory')

 					)

-    ),

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

 

 

-    array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

+	array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

 

-    array(

-        'name' => __('Search field default value', 'geodirectory'),

-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_search_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search for' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search field default value', 'geodirectory'),

+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_search_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search for' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Near field default value', 'geodirectory'),

-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_near_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Near' // show on the listing page.

-    ),

+	array(

+		'name' => __('Near field default value', 'geodirectory'),

+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_near_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Near' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Search button label', 'geodirectory'),

-        'desc' => __('Show the search button label on search form.', 'geodirectory'),

-        'id' => 'geodir_search_button_label',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search button label', 'geodirectory'),

+		'desc' => __('Show the search button label on search form.', 'geodirectory'),

+		'id' => 'geodir_search_button_label',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search' // show on the listing page.

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

 

-    /* Detail Layout Settings end */

+	/* Detail Layout Settings end */

 

-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

 

-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

 

-    array(

-        'name' => __('Detail top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Detail top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Detail bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_bottom_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Detail sidebar section on left side', 'geodirectory'),

-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

-        'id' => 'geodir_detail_sidebar_left_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable GD modal', 'geodirectory'),

-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

-        'id' => 'geodir_disable_gb_modal',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_tfg_buttons_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable share this button section', 'geodirectory'),

-        'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_sharethis_button_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Google Analytics section', 'geodirectory'),

-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_google_analytics_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable User Links section', 'geodirectory'),

-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_user_links_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Rating Info section', 'geodirectory'),

-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_rating_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Listing Info section', 'geodirectory'),

-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_listing_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Detail bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_bottom_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

+	array(

+		'name' => __('Detail sidebar section on left side', 'geodirectory'),

+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

+		'id' => 'geodir_detail_sidebar_left_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable GD modal', 'geodirectory'),

+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

+		'id' => 'geodir_disable_gb_modal',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_tfg_buttons_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable share this button section', 'geodirectory'),

+		'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_sharethis_button_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Google Analytics section', 'geodirectory'),

+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_google_analytics_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable User Links section', 'geodirectory'),

+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_user_links_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Rating Info section', 'geodirectory'),

+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_rating_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Listing Info section', 'geodirectory'),

+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_listing_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),

+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),

 

 

-    /* ---------- DETAIL PAGE TAB SETTING START*/

+	/* ---------- DETAIL PAGE TAB SETTING START*/

 

-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

 

-    array(

-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_detail_page_tabs_excluded',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select tabs', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())

-    ),

+	array(

+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_detail_page_tabs_excluded',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select tabs', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

-    /* ---------- DETAIL PAGE TAB SETTING END*/

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	/* ---------- DETAIL PAGE TAB SETTING END*/

 

-    /* START DEFAULT STAR IMAGE*/

-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

+	/* START DEFAULT STAR IMAGE*/

+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

 

-    array(

-        'name' => __('Upload default rating star icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_rating_star_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload default rating star icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_rating_star_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

+	),

 	array(

 		'name' => __('Enable Font Awesome', 'geodirectory'),

 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

@@ -600,368 +600,368 @@ 
 		'std' => '#757575'

 	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

 

-    /* END DEFAULT STAR IMAGE*/

+	/* END DEFAULT STAR IMAGE*/

 

-    /* Detail related post settings start */

+	/* Detail related post settings start */

 

-    array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

+	array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

 

-    array(

-        'name' => __('Show related post listing on', 'geodirectory'),

-        'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_add_related_listing_posttypes',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show related post listing on', 'geodirectory'),

+		'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_add_related_listing_posttypes',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Relate to', 'geodirectory'),

-        'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

-        'id' => 'geodir_related_post_relate_to',

-        'css' => 'min-width:300px;',

-        'std' => 'category',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'category' => __('Categories', 'geodirectory'),

-            'tags' => __('Tags', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Relate to', 'geodirectory'),

+		'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

+		'id' => 'geodir_related_post_relate_to',

+		'css' => 'min-width:300px;',

+		'std' => 'category',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'category' => __('Categories', 'geodirectory'),

+			'tags' => __('Tags', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Layout', 'geodirectory'),

-        'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

-        'id' => 'geodir_related_post_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Layout', 'geodirectory'),

+		'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

+		'id' => 'geodir_related_post_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Sort by', 'geodirectory'),

-        'desc' => __('Set the related post listing sort by view', 'geodirectory'),

-        'id' => 'geodir_related_post_sortby',

-        'css' => 'min-width:300px;',

-        'std' => 'latest',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'latest' => __('Latest', 'geodirectory'),

-            'featured' => __('Featured', 'geodirectory'),

-            'high_review' => __('Review', 'geodirectory'),

-            'high_rating' => __('Rating', 'geodirectory'),

-            'random' => __('Random', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Sort by', 'geodirectory'),

+		'desc' => __('Set the related post listing sort by view', 'geodirectory'),

+		'id' => 'geodir_related_post_sortby',

+		'css' => 'min-width:300px;',

+		'std' => 'latest',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'latest' => __('Latest', 'geodirectory'),

+			'featured' => __('Featured', 'geodirectory'),

+			'high_review' => __('Review', 'geodirectory'),

+			'high_rating' => __('Rating', 'geodirectory'),

+			'random' => __('Random', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Number of posts:', 'geodirectory'),

-        'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

-        'id' => 'geodir_related_post_count',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '5' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Number of posts:', 'geodirectory'),

+		'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

+		'id' => 'geodir_related_post_count',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '5' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Post excerpt', 'geodirectory'),

-        'desc' => __('Post content excerpt character count', 'geodirectory'),

-        'id' => 'geodir_related_post_excerpt',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '20' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Post excerpt', 'geodirectory'),

+		'desc' => __('Post content excerpt character count', 'geodirectory'),

+		'id' => 'geodir_related_post_excerpt',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '20' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

-    /* Detail Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

+	/* Detail Layout Settings end */

 

-    /* Author Layout Settings Start */

+	/* Author Layout Settings Start */

 

-    array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

+	array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

 

 

-    array('name' => __('Author Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_author_layout'),

+	array('name' => __('Author Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_author_layout'),

 

-    array(

-        'name' => __('Author top section', 'geodirectory'),

-        'desc' => __('Show the top section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author top section', 'geodirectory'),

+		'desc' => __('Show the top section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author right section', 'geodirectory'),

-        'desc' => __('Show the right section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author right section', 'geodirectory'),

+		'desc' => __('Show the right section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of author page', 'geodirectory'),

-        'id' => 'geodir_author_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Author content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of author page', 'geodirectory'),

+		'id' => 'geodir_author_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of author content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author left section', 'geodirectory'),

-        'desc' => __('Show the left section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author left section', 'geodirectory'),

+		'desc' => __('Show the left section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_author_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_author_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

-    /* Author Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

+	/* Author Layout Settings end */

 

 

-    /* Post Type Navigation Settings Start */

-    array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

+	/* Post Type Navigation Settings Start */

+	array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

 

 

-    /* Post Type Navigation Settings Start */

+	/* Post Type Navigation Settings Start */

 

-    array('name' => __('Navigation Locations', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_locations'),

+	array('name' => __('Navigation Locations', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_locations'),

 

-    array(

-        'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_theme_location_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select menu locations', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_theme_location_setting_fun())

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

-

-

-    array('name' => __('Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_theme_location_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select menu locations', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_theme_location_setting_fun())

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

 

-    array(

-        'name' => __('Show add listing navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_addlisting_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

+	array('name' => __('Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listings navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_listing_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

 

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show add listing navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_addlisting_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

+	array(

+		'name' => __('Show listings navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_listing_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

-    array('name' => __('Post Type Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_post_type_navigation_layout'),

-    array(

-        'name' => __('Show listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listing link in listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Allow post type to add from frontend', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_allow_posttype_frontend',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('Post Type Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show listing link in listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_add_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Allow post type to add from frontend', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_allow_posttype_frontend',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show add listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

+	array(

+		'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_add_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

+	array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

 

 

-    array(

-        'name' => __('Show add listing link in user dashboard', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

 

-    array(

-        'name' => __('Show favorite link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_favorite_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Show listing link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

-    /* Post Type Navigation Settings End */

-

-    /* Script Settings Start */

-    array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

-

-    /*

+	array(

+		'name' => __('Show add listing link in user dashboard', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show favorite link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_favorite_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show listing link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

+	/* Post Type Navigation Settings End */

+

+	/* Script Settings Start */

+	array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

+

+	/*

     array( 	'name' => __( 'Add/Remove Scripts', 'geodirectory' ),

                 'type' => 'sectionstart',

                 'desc' => '',

@@ -987,150 +987,150 @@ 
 

     */

 

-    array('name' => __('SCSS Settings (CSS combine and minify)', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_scss_settings'),

+	array('name' => __('SCSS Settings (CSS combine and minify)', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_scss_settings'),

 

-    array(

-        'name' => __('Disable Core SCSS', 'geodirectory'),

-        'desc' => __('Stops the CSS files being minified and output as one.', 'geodirectory'),

-        'id' => 'geodir_scss_core',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Disable Core SCSS', 'geodirectory'),

+		'desc' => __('Stops the CSS files being minified and output as one.', 'geodirectory'),

+		'id' => 'geodir_scss_core',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_scss_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_scss_settings'),

 

-    array('name' => __('Script Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_script_settings'),

+	array('name' => __('Script Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_script_settings'),

 

-    array(

-        'name' => __('Custom style css code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_coustem_css',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Custom style css code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_coustem_css',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Header script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_header_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Header script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_header_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Footer script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_footer_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Footer script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_footer_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

-    /* Script Settings End */

+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

+	/* Script Settings End */

 

-    /* Map Settings Start */

-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

+	/* Map Settings Start */

+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

 

-    /* Untick the category by default on home map */

-    array(

-        'name' => __('Home Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_map_section'

-    ),

-    array(

-        'name' => __('Select category to untick by default on map', 'geodirectory'),

-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_home_map_untick',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select category', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => geodir_home_map_cats_key_value_array()

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_home_map_section'

-    ),

+	/* Untick the category by default on home map */

+	array(

+		'name' => __('Home Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_map_section'

+	),

+	array(

+		'name' => __('Select category to untick by default on map', 'geodirectory'),

+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_home_map_untick',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select category', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => geodir_home_map_cats_key_value_array()

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_home_map_section'

+	),

 

-    array(

-        'name' => __('Add Listing Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_add_listing_map_section'

-    ),

-    array(

-        'name' => __('Disable mouse scroll', 'geodirectory'),

-        'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

-        'id' => 'geodir_add_listing_mouse_scroll',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_add_listing_map_section'

-    ),

+	array(

+		'name' => __('Add Listing Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_add_listing_map_section'

+	),

+	array(

+		'name' => __('Disable mouse scroll', 'geodirectory'),

+		'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

+		'id' => 'geodir_add_listing_mouse_scroll',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_add_listing_map_section'

+	),

 

 

-    array('name' => __('Default map settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_default_settings'),

+	array('name' => __('Default map settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_default_settings'),

 

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'map_default_settings',

-        'type' => 'map_default_settings',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'map_default_settings',

+		'type' => 'map_default_settings',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Upload map default marker icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_marker_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

-    ),

-    // add option that allows enable/disable map dragging to phone devices

-    array(

-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

-        'id' => 'geodir_map_onoff_dragging',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload map default marker icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_marker_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

+	),

+	// add option that allows enable/disable map dragging to phone devices

+	array(

+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

+		'id' => 'geodir_map_onoff_dragging',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

 

-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_settings'),

+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_settings'),

 

-    array(

-        'name' => __('Select Map Category', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_map_settings',

-        'type' => 'map',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

-    /* Map Settings End */

+	array(

+		'name' => __('Select Map Category', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_map_settings',

+		'type' => 'map',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

+	/* Map Settings End */

 

 )); // End Design settings

geodirectory-admin/option-pages/general_settings_array.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 

     array('type' => 'sectionend', 'id' => 'general_options'),

 

-));/* General Options End*/

+)); /* General Options End*/

 

 /**

  * Filter GD Google Analytic Settings array.

Indentation +259 added lines, -259 removed lines

@@ -16,87 +16,87 @@ 
  */

 $general_options = apply_filters('geodir_general_options', array(

 

-    array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

-

-    array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

-

-    array(

-        'name' => __('Sender name', 'geodirectory'),

-        'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

-        'id' => 'site_email_name',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('name') // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Email address', 'geodirectory'),

-        'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

-        'id' => 'site_email',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_allow_cpass',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Disable rating on comments', 'geodirectory'),

-        'desc' => __('Disable rating without disabling comments on listings', 'geodirectory'),

-        'id' => 'geodir_disable_rating',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('User deleted posts go to trash', 'geodirectory'),

-        'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

-        'id' => 'geodir_disable_perm_delete',

-        'type' => 'checkbox',

-        'std' => '1'

-    ),

-    array(

-        'name' => __('Max upload file size(in mb)', 'geodirectory'),

-        'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

-        'id' => 'geodir_upload_max_filesize',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '2'

-    ),

-    array('type' => 'sectionend', 'id' => 'general_options'),

+	array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

+

+	array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

+

+	array(

+		'name' => __('Sender name', 'geodirectory'),

+		'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

+		'id' => 'site_email_name',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('name') // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Email address', 'geodirectory'),

+		'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

+		'id' => 'site_email',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_allow_cpass',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Disable rating on comments', 'geodirectory'),

+		'desc' => __('Disable rating without disabling comments on listings', 'geodirectory'),

+		'id' => 'geodir_disable_rating',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('User deleted posts go to trash', 'geodirectory'),

+		'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

+		'id' => 'geodir_disable_perm_delete',

+		'type' => 'checkbox',

+		'std' => '1'

+	),

+	array(

+		'name' => __('Max upload file size(in mb)', 'geodirectory'),

+		'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

+		'id' => 'geodir_upload_max_filesize',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '2'

+	),

+	array('type' => 'sectionend', 'id' => 'general_options'),

 

 ));/* General Options End*/

 

@@ -108,95 +108,95 @@ 
  */

 $google_analytic_settings = apply_filters('geodir_google_analytic_settings', array(

 

-    array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

-

-    array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

-

-

-

-    array(

-        'name' => __('Show business owner google analytics stats?', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_ga_stats',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Google analytics "Profile ID(ie: ga:12345678)?', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_id',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Client ID', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_client_id',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Client secret', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

-        'desc' => '',

-        'id' => 'geodir_ga_client_secret',

-        'type' => 'password',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Google analytics access', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_token',

-        'type' => 'google_analytics',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-

-    array(

-        'name' => __('Google analytics tracking code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_tracking_code',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => __('Auto refresh active users?', 'geodirectory'),

-        'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

-        'id' => 'geodir_ga_auto_refresh',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Time interval for auto refresh active users', 'geodirectory'),

-        'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

-        'id' => 'geodir_ga_refresh_time',

-        'type' => 'text',

-        'std' => '5'

-    ),

-

-    array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

+	array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

+

+	array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

+

+

+

+	array(

+		'name' => __('Show business owner google analytics stats?', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_ga_stats',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Google analytics "Profile ID(ie: ga:12345678)?', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_id',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Client ID', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_client_id',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Client secret', 'geodirectory') . ' ' .

+			'<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+		'desc' => '',

+		'id' => 'geodir_ga_client_secret',

+		'type' => 'password',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Google analytics access', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_token',

+		'type' => 'google_analytics',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+

+	array(

+		'name' => __('Google analytics tracking code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_tracking_code',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => __('Auto refresh active users?', 'geodirectory'),

+		'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

+		'id' => 'geodir_ga_auto_refresh',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Time interval for auto refresh active users', 'geodirectory'),

+		'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

+		'id' => 'geodir_ga_refresh_time',

+		'type' => 'text',

+		'std' => '5'

+	),

+

+	array('type' => 'sectionend', 'id' => 'google_analytic_settings'),

 

 )); // google_analytic_settings End

 

@@ -208,84 +208,84 @@ 
  */

 $search_settings = apply_filters('geodir_search_settings', array(

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

-

-    array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

-

-    array(

-        'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

-        'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

-        'id' => 'geodir_search_dist',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Miles', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'miles',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

-        'desc' => __('Kilometers', 'geodirectory'),

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'km',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Meters', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'meters',

-        'radiogroup' => 'start'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

-        'desc' => __('Feet', 'geodirectory'),

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'feet',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

-        'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

-        'id' => 'geodir_search_near_addition',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => ''

-    ),

-    array(

-        'name' => __('Individual word search limit', 'geodirectory'),

-        'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

-        'id' => 'geodir_search_word_limit',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            '0' => __('Disabled', 'geodirectory'),

-            '1' => __('1 Character words excluded', 'geodirectory'),

-            '2' => __('2 Character words and less excluded', 'geodirectory'),

-            '3' => __('3 Character words and less excluded', 'geodirectory'),

-        ))

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'search_settings'),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

+

+	array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

+

+	array(

+		'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

+		'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

+		'id' => 'geodir_search_dist',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Miles', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'miles',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

+		'desc' => __('Kilometers', 'geodirectory'),

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'km',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Meters', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'meters',

+		'radiogroup' => 'start'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

+		'desc' => __('Feet', 'geodirectory'),

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'feet',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

+		'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

+		'id' => 'geodir_search_near_addition',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => ''

+	),

+	array(

+		'name' => __('Individual word search limit', 'geodirectory'),

+		'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

+		'id' => 'geodir_search_word_limit',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'0' => __('Disabled', 'geodirectory'),

+			'1' => __('1 Character words excluded', 'geodirectory'),

+			'2' => __('2 Character words and less excluded', 'geodirectory'),

+			'3' => __('3 Character words and less excluded', 'geodirectory'),

+		))

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'search_settings'),

 

 )); //search_settings End

 

@@ -297,17 +297,17 @@ 
  */

 $dummy_data_settings = apply_filters('geodir_dummy_data_settings', array(

 

-    array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

-

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_dummy_data_installer',

-        'type' => 'dummy_installer',

-        'css' => 'min-width:300px;',

-        'std' => '40' // Default value for the page title - changed in settings

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

+	array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

+

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_dummy_data_installer',

+		'type' => 'dummy_installer',

+		'css' => 'min-width:300px;',

+		'std' => '40' // Default value for the page title - changed in settings

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_dummy_data_settings'),

 

 )); //dummy_data_settings End

 

geodirectory-admin/option-pages/notifications_settings_array.php

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject_admin',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -137,7 +137,7 @@ 
         'id' => 'geodir_post_submited_success_email_content_admin',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -154,7 +154,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -162,7 +162,7 @@ 
         'id' => 'geodir_post_submited_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -180,7 +180,7 @@ 
         'id' => 'geodir_forgot_password_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array(

@@ -197,7 +197,7 @@ 
         'id' => 'geodir_registration_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

     array(

         'name' => __('Listing published email', 'geodirectory'),

@@ -236,7 +236,7 @@ 
         'id' => 'geodir_email_friend_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')

     ),

 

     array(

@@ -253,7 +253,7 @@ 
         'id' => 'geodir_email_enquiry_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array('type' => 'sectionend', 'id' => 'other_emails'),

@@ -269,7 +269,7 @@ 
         'id' => 'geodir_post_added_success_msg_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')

     ),

 

 

Indentation +291 added lines, -291 removed lines

@@ -17,296 +17,296 @@
 $geodir_settings['notifications_settings'] = apply_filters('geodir_notifications_settings', array(

 

 

-    array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

-

-

-    array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

-

-    array(

-        'name' => __('List of usable shortcodes', 'geodirectory'),

-        'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

-        'id' => 'geodir_list_of_usable_shordcodes',

-        'type' => 'html_content',

-        'css' => 'min-width:300px;',

-        'std' => 'All Places' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'notification_options'),

-

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

-

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'site_bcc_options'),

-

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

-

-    array(

-        'name' => __('Post submit success to admin email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-     array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => 'no',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Listing edited by Author', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'admin_emails'),

-

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

-

-    array(

-        'name' => __('Post submit success to client email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

-    ),

-

-

-    array(

-        'name' => __('User forgot password email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_forgot_password_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_forgot_password_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Registration success email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-    array(

-        'name' => __('Listing published email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_published_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_published_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'client_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_friend_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_friend_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Email enquiry', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Website Enquiry', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'other_emails'),

-

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

-

-    array(

-        'name' => __('Post submitted success', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_added_success_msg_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'messages'),

+	array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

+

+

+	array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

+

+	array(

+		'name' => __('List of usable shortcodes', 'geodirectory'),

+		'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

+		'id' => 'geodir_list_of_usable_shordcodes',

+		'type' => 'html_content',

+		'css' => 'min-width:300px;',

+		'std' => 'All Places' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'notification_options'),

+

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

+

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'site_bcc_options'),

+

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

+

+	array(

+		'name' => __('Post submit success to admin email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	 array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => 'no',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Listing edited by Author', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'admin_emails'),

+

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

+

+	array(

+		'name' => __('Post submit success to client email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+	),

+

+

+	array(

+		'name' => __('User forgot password email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_forgot_password_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_forgot_password_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Registration success email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+	array(

+		'name' => __('Listing published email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_published_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_published_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'client_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_friend_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_friend_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Email enquiry', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Website Enquiry', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'other_emails'),

+

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

+

+	array(

+		'name' => __('Post submitted success', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_added_success_msg_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'messages'),

 

 )); // End Manage NOtifications settings