GeoDirectory / geodirectory

tests/test-Import_Export.php

Indentation +11 added lines, -11 removed lines

@@ -1,19 +1,19 @@
 <?php
 class ImportExport extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testImportExport()
-    {
+	public function testImportExport()
+	{
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

geodirectory-functions/user_functions.php

Braces +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 
                 if($output_type=='select'){
                     $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
+                } elseif($output_type=='link'){
                     $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
                 }
 
@@ -102,7 +102,7 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
+            } elseif($output_type=='link'){
                 if(!empty($favourite_links)){
                     echo implode(" | ",$favourite_links);
                 }
@@ -148,7 +148,7 @@ 
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
                 if($output_type=='select') {
                     $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
+                } elseif($output_type=='link'){
                     $listing_links [] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
                 }
             }
@@ -168,7 +168,7 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
+            } elseif($output_type=='link'){
                 if(!empty($listing_links )){
                     echo implode(" | ",$listing_links );
                 }

Indentation +119 added lines, -119 removed lines

@@ -13,28 +13,28 @@ 
  */
 function geodir_user_favourite_listing_count($user_id=false)
 {
-    global $wpdb, $plugin_prefix, $current_user;
+	global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+	if(!$user_id){$user_id = $current_user->ID;}
+	if(!$user_id){return array();}
 
-    $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
-    $all_posts = get_option('geodir_favorite_link_user_dashboard');
+	$user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
+	$all_posts = get_option('geodir_favorite_link_user_dashboard');
 
-    $user_listing = array();
-    if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+	$user_listing = array();
+	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
+		$user_favorites = "'" . implode("','", $user_favorites) . "'";
 
-        foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+		foreach ($all_posts as $ptype) {
+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
 
-            if ($total_posts > 0) {
-                $user_listing[$ptype] = $total_posts;
-            }
-        }
-    }
+			if ($total_posts > 0) {
+				$user_listing[$ptype] = $total_posts;
+			}
+		}
+	}
 
-    return $user_listing;
+	return $user_listing;
 }
 
 
@@ -47,51 +47,51 @@ 
  */
 
 function geodir_user_show_favourites($user_id='',$output_type='select'){
-    // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
-    $user_favourite = geodir_user_favourite_listing_count($user_id);
-
-    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
-        $favourite_links = '';
-        $post_types = geodir_get_posttypes('object');
-
-        $author_link = get_author_posts_url($user_id);
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
-
-        foreach ($post_types as $key => $postobj) {
-            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
-                $name = $postobj->labels->name;
-                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
-
-                $selected = '';
-
-                if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
-                    $selected = 'selected="selected"';
-                }
-                /**
-                 * Filter favorite listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $post_type_link Favorite listing link.
-                 * @param string $key Favorite listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
-
-                if($output_type=='select'){
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
-                }
-
-
-            }
-        }
-
-        if ($favourite_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
-                ?>
+	// My Favourites in Dashboard
+	$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
+	$user_favourite = geodir_user_favourite_listing_count($user_id);
+
+	if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
+		$favourite_links = '';
+		$post_types = geodir_get_posttypes('object');
+
+		$author_link = get_author_posts_url($user_id);
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
+
+		foreach ($post_types as $key => $postobj) {
+			if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
+				$name = $postobj->labels->name;
+				$post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
+
+				$selected = '';
+
+				if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
+					$selected = 'selected="selected"';
+				}
+				/**
+				 * Filter favorite listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $post_type_link Favorite listing link.
+				 * @param string $key Favorite listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
+
+				if($output_type=='select'){
+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
+				}elseif($output_type=='link'){
+					$favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
+				}
+
+
+			}
+		}
+
+		if ($favourite_links != '') {
+			$user = get_user_by( 'ID', $user_id );
+			if($output_type=='select') {
+				?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
                             option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"
@@ -102,62 +102,62 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($favourite_links)){
-                    echo implode(" | ",$favourite_links);
-                }
-
-            }
-        }
-    }
+			}elseif($output_type=='link'){
+				if(!empty($favourite_links)){
+					echo implode(" | ",$favourite_links);
+				}
+
+			}
+		}
+	}
 }
 
 
 
 function geodir_user_show_listings($user_id='',$output_type='select'){
 
-    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
-    $user_listing = geodir_user_post_listing_count($user_id);
-
-    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
-        $listing_links = '';
-
-        $post_types = geodir_get_posttypes('object');
-
-        $author_link = get_author_posts_url($user_id);
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
-
-        foreach ($post_types as $key => $postobj) {
-            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
-                $name = $postobj->labels->name;
-                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
-
-                $selected = '';
-                if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
-                    $selected = 'selected="selected"';
-                }
-
-                /**
-                 * Filter my listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $listing_link My listing link.
-                 * @param string $key My listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
-                if($output_type=='select') {
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $listing_links [] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
-                }
-            }
-        }
-
-        if ($listing_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
-                ?>
+	$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
+	$user_listing = geodir_user_post_listing_count($user_id);
+
+	if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
+		$listing_links = '';
+
+		$post_types = geodir_get_posttypes('object');
+
+		$author_link = get_author_posts_url($user_id);
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
+
+		foreach ($post_types as $key => $postobj) {
+			if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
+				$name = $postobj->labels->name;
+				$listing_link = geodir_getlink($author_link, array('stype' => $key), false);
+
+				$selected = '';
+				if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
+					$selected = 'selected="selected"';
+				}
+
+				/**
+				 * Filter my listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $listing_link My listing link.
+				 * @param string $key My listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
+				if($output_type=='select') {
+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
+				}elseif($output_type=='link'){
+					$listing_links [] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
+				}
+			}
+		}
+
+		if ($listing_links != '') {
+			$user = get_user_by( 'ID', $user_id );
+			if($output_type=='select') {
+				?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
                             option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"
@@ -168,13 +168,13 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($listing_links )){
-                    echo implode(" | ",$listing_links );
-                }
-
-            }
-        }
-    }
+			}elseif($output_type=='link'){
+				if(!empty($listing_links )){
+					echo implode(" | ",$listing_links );
+				}
+
+			}
+		}
+	}
 
 }

Spacing +25 added lines, -25 removed lines

@@ -11,22 +11,22 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  * @return array User listing count for each post type.
  */
-function geodir_user_favourite_listing_count($user_id=false)
+function geodir_user_favourite_listing_count($user_id = false)
 {
     global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+    if (!$user_id) {$user_id = $current_user->ID; }
+    if (!$user_id) {return array(); }
 
     $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
     $all_posts = get_option('geodir_favorite_link_user_dashboard');
 
     $user_listing = array();
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+        $user_favorites = "'".implode("','", $user_favorites)."'";
 
         foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
 
             if ($total_posts > 0) {
                 $user_listing[$ptype] = $total_posts;
@@ -46,7 +46,7 @@ 
  * @package GeoDirectory
  */
 
-function geodir_user_show_favourites($user_id='',$output_type='select'){
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
     // My Favourites in Dashboard
     $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
     $user_favourite = geodir_user_favourite_listing_count($user_id);
@@ -78,10 +78,10 @@ 
                  */
                 $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
 
-                if($output_type=='select'){
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
+                if ($output_type == 'select') {
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>';
+                }elseif ($output_type == 'link') {
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</a>';
                 }
 
 
@@ -89,8 +89,8 @@ 
         }
 
         if ($favourite_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
+            $user = get_user_by('ID', $user_id);
+            if ($output_type == 'select') {
                 ?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
@@ -102,9 +102,9 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($favourite_links)){
-                    echo implode(" | ",$favourite_links);
+            }elseif ($output_type == 'link') {
+                if (!empty($favourite_links)) {
+                    echo implode(" | ", $favourite_links);
                 }
 
             }
@@ -114,7 +114,7 @@ 
 
 
 
-function geodir_user_show_listings($user_id='',$output_type='select'){
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
 
     $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
     $user_listing = geodir_user_post_listing_count($user_id);
@@ -146,17 +146,17 @@ 
                  * @param int $current_user->ID Current user ID.
                  */
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
-                if($output_type=='select') {
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $listing_links [] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>';
+                if ($output_type == 'select') {
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>';
+                }elseif ($output_type == 'link') {
+                    $listing_links [] = '<a href="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</a>';
                 }
             }
         }
 
         if ($listing_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
+            $user = get_user_by('ID', $user_id);
+            if ($output_type == 'select') {
                 ?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
@@ -168,9 +168,9 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($listing_links )){
-                    echo implode(" | ",$listing_links );
+            }elseif ($output_type == 'link') {
+                if (!empty($listing_links)) {
+                    echo implode(" | ", $listing_links);
                 }
 
             }

geodirectory-admin/option-pages/general_settings_array.php

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

 

Spacing +7 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
     ),

     array('type' => 'sectionend', 'id' => 'general_options'),

 

-));/* General Options End*/

+)); /* General Options End*/

 

 /**

  * Filter GD Google Analytic Settings array.

@@ -134,8 +134,8 @@ 
     ),

 

     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>',

+        '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',

@@ -144,8 +144,8 @@ 
     ),

 

     array(

-        'name' => __('Client ID', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+        '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',

@@ -154,8 +154,8 @@ 
     ),

 

     array(

-        'name' => __('Client secret', 'geodirectory') . ' ' .

-            '<a target="_blank" href="https://docs.wpgeodirectory.com/gd-core-plugin-google-analytics/">' . __('help', 'geodirectory') . '</a>',

+        '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',

tests/selenium/base.php

Doc Comments +22 added lines

@@ -10,6 +10,9 @@ 
         $this->setBrowserUrl(self::GDTEST_BASE_URL);
     }
 
+    /**
+     * @param string $search
+     */
     function isTextPresent($search)
     {
         $source = $this->source();
@@ -62,6 +65,9 @@ 
         }
     }
 
+    /**
+     * @param string $redirect
+     */
     function maybeUserLogin($redirect, $force=false) {
         if ($force) {
             $this->url(self::GDTEST_BASE_URL.'wp-admin/');
@@ -87,6 +93,9 @@ 
         }
     }
 
+    /**
+     * @param string $redirect
+     */
     function maybeAdminLogin($redirect) {
         $this->url($redirect);
         $this->waitForPageLoadAndCheckForErrors();
@@ -121,6 +130,9 @@ 
         return $exists;
     }
 
+    /**
+     * @param string $script
+     */
     function ExecuteScript($script, $args=array()) {
         $this->execute( array(
             'script' => $script ,
@@ -133,10 +145,16 @@ 
         $this->ExecuteScript('jQuery("#wpadminbar").hide();');
     }
 
+    /**
+     * @param string $string
+     */
     function logInfo($string) {
         fwrite(STDOUT, "Info: ".$string . PHP_EOL);
     }
 
+    /**
+     * @param string $string
+     */
     function logError($string) {
         fwrite(STDOUT, "Error: ".$string . PHP_EOL);
     }
@@ -157,6 +175,10 @@ 
         return (int) $content;
     }
 
+    /**
+     * @param integer $current
+     * @param integer $completed
+     */
     function skipTest($current, $completed) {
         if ($completed == 0 || $completed == 42 || $current == $completed) {
             return false;

Indentation +191 added lines, -191 removed lines

@@ -1,199 +1,199 @@
 <?php
 class GD_Test extends PHPUnit_Extensions_Selenium2TestCase {
 
-    const GDTEST_BASE_URL = 'http://www.test.ci/selpress/';
-
-    public function setUp()
-    {
-        $this->setSeleniumServerRequestsTimeout(300);
-        $this->setBrowser('firefox');
-        $this->setBrowserUrl(self::GDTEST_BASE_URL);
-    }
-
-    function isTextPresent($search)
-    {
-        $source = $this->source();
-        if ( strpos((string)$source,$search) !== FALSE) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function randomEmailID()
-    {
-        return md5(uniqid(rand(), true)).'@gmail.com';
-    }
-
-    function waitForPageLoadAndCheckForErrors($timeout=10000)
-    {
-        // Wait 10 seconds
-        $this->timeouts()->implicitWait($timeout);
-        $this->checkForErrors();
-        $this->checkForJsErrors();
-    }
-
-    function checkForErrors()
-    {
-        $elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
-        if ($elements) {
-            $total = count($elements);
-            fwrite(STDOUT, $total.' errors found'. PHP_EOL);
-            $count = 0;
-            foreach ($elements as $i => $element) {
-                $count++;
-                if ($errors = $element->attribute('innerHTML')) {
-                    fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    fwrite(STDOUT, strip_tags($errors). PHP_EOL);
-                    if ($count == $total) {
-                        fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    }
-                }
-            }
-        }
-    }
-
-    function checkForJsErrors() {
-        if ($this->isElementExists('sel_js_error')) {
-            fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
-            echo $this->byId('sel_js_error')->attribute('innerHTML');
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
-        }
-    }
-
-    function maybeUserLogin($redirect, $force=false) {
-        if ($force) {
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/');
-            if ($this->isTextPresent("forgetmenot")) {
-                $this->byId('user_login')->value('testuser@test.com');
-                $this->byId('user_pass')->value('1');
+	const GDTEST_BASE_URL = 'http://www.test.ci/selpress/';
+
+	public function setUp()
+	{
+		$this->setSeleniumServerRequestsTimeout(300);
+		$this->setBrowser('firefox');
+		$this->setBrowserUrl(self::GDTEST_BASE_URL);
+	}
+
+	function isTextPresent($search)
+	{
+		$source = $this->source();
+		if ( strpos((string)$source,$search) !== FALSE) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function randomEmailID()
+	{
+		return md5(uniqid(rand(), true)).'@gmail.com';
+	}
+
+	function waitForPageLoadAndCheckForErrors($timeout=10000)
+	{
+		// Wait 10 seconds
+		$this->timeouts()->implicitWait($timeout);
+		$this->checkForErrors();
+		$this->checkForJsErrors();
+	}
+
+	function checkForErrors()
+	{
+		$elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
+		if ($elements) {
+			$total = count($elements);
+			fwrite(STDOUT, $total.' errors found'. PHP_EOL);
+			$count = 0;
+			foreach ($elements as $i => $element) {
+				$count++;
+				if ($errors = $element->attribute('innerHTML')) {
+					fwrite(STDOUT, "========================================================================". PHP_EOL);
+					fwrite(STDOUT, strip_tags($errors). PHP_EOL);
+					if ($count == $total) {
+						fwrite(STDOUT, "========================================================================". PHP_EOL);
+					}
+				}
+			}
+		}
+	}
+
+	function checkForJsErrors() {
+		if ($this->isElementExists('sel_js_error')) {
+			fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
+			fwrite(STDOUT, "========================================================================". PHP_EOL);
+			echo $this->byId('sel_js_error')->attribute('innerHTML');
+			fwrite(STDOUT, "========================================================================". PHP_EOL);
+		}
+	}
+
+	function maybeUserLogin($redirect, $force=false) {
+		if ($force) {
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/');
+			if ($this->isTextPresent("forgetmenot")) {
+				$this->byId('user_login')->value('testuser@test.com');
+				$this->byId('user_pass')->value('1');
 //                $this->byId('rememberme')->click();
-                // Submit the form
-                $this->byId('wp-submit')->submit();
-                $this->waitForPageLoadAndCheckForErrors();
-            }
-        }
-        $this->url($redirect);
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("Sign In")) {
-            $this->byId('user_login')->value('testuser@test.com');
-            $this->byId('user_pass')->value('1');
+				// Submit the form
+				$this->byId('wp-submit')->submit();
+				$this->waitForPageLoadAndCheckForErrors();
+			}
+		}
+		$this->url($redirect);
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("Sign In")) {
+			$this->byId('user_login')->value('testuser@test.com');
+			$this->byId('user_pass')->value('1');
 //            $this->byId('rememberme')->click();
-            // Submit the form
-            $this->byId('cus_loginform')->submit();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->url($redirect);
-        }
-    }
-
-    function maybeAdminLogin($redirect) {
-        $this->url($redirect);
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("forgetmenot")) {
-            $this->byId('user_login')->value('admin');
-            $this->byId('user_pass')->value('admin');
+			// Submit the form
+			$this->byId('cus_loginform')->submit();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->url($redirect);
+		}
+	}
+
+	function maybeAdminLogin($redirect) {
+		$this->url($redirect);
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("forgetmenot")) {
+			$this->byId('user_login')->value('admin');
+			$this->byId('user_pass')->value('admin');
 //            $this->byId('rememberme')->click();
-            // Submit the form
-            $this->byId('wp-submit')->submit();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->url($redirect);
-        }
-    }
-
-    function isElementExists($id = false, $by = 'id') {
-        if (!$id) {
-            return false;
-        }
-        $exists = true;
-        try {
-            if ($by == 'id') {
-                $this->byId($id);
-            } elseif ($by == 'xpath') {
-                $this->byXPath($id);
-            }
-
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoSuchElement == $e->getCode()) {
-                $exists = false;
-            }
-        }
-        return $exists;
-    }
-
-    function ExecuteScript($script, $args=array()) {
-        $this->execute( array(
-            'script' => $script ,
-            'args'=>$args
-        ) );
-    }
-
-    function hideAdminBar() {
-        //admin bar causes problem with scroll. So hide admin bar while testing.
-        $this->ExecuteScript('jQuery("#wpadminbar").hide();');
-    }
-
-    function logInfo($string) {
-        fwrite(STDOUT, "Info: ".$string . PHP_EOL);
-    }
-
-    function logError($string) {
-        fwrite(STDOUT, "Error: ".$string . PHP_EOL);
-    }
-
-    function logWarning($string) {
-        fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
-    }
-
-    function getCurrentFileNumber($file) {
-        preg_match('/test-([0-9]+)_/', $file, $match);
-        return (int) $match[1];
-    }
-
-    function getCompletedFileNumber() {
-        $completed = fopen("tests/selenium/completed.txt", "r") or die("Unable to open file!");
-        $content = fgets($completed);
-        fclose($completed);
-        return (int) $content;
-    }
-
-    function skipTest($current, $completed) {
-        if ($completed == 0 || $completed == 42 || $current == $completed) {
-            return false;
-        } elseif ($current < $completed) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function maybeLogout() {
-        $this->url(self::GDTEST_BASE_URL);
-        $this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
-
-    function maybeAdminLogout() {
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->ExecuteScript('jQuery("#wp-admin-bar-my-account").addClass("hover");');
-        $this->byXPath("//*[@id='wp-admin-bar-logout']//a")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
-
-    function maybeActivatePlugin($id=false, $timeout=10000) {
-        if (!$id) {
-            return;
-        }
-        $plugin_name = ucwords(str_replace('-', ' ', $id));
-        $this->logInfo('Activating '.$plugin_name.' plugin......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->hideAdminBar();
-        if (is_int(strpos($this->byId($id)->attribute('class'), 'inactive'))) {
-            $this->byXPath("//tr[@id='".$id."']//span[@class='activate']/a")->click();
-        }
-        $this->waitForPageLoadAndCheckForErrors($timeout);
-        $this->logInfo($plugin_name.' activated......');
-    }
+			// Submit the form
+			$this->byId('wp-submit')->submit();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->url($redirect);
+		}
+	}
+
+	function isElementExists($id = false, $by = 'id') {
+		if (!$id) {
+			return false;
+		}
+		$exists = true;
+		try {
+			if ($by == 'id') {
+				$this->byId($id);
+			} elseif ($by == 'xpath') {
+				$this->byXPath($id);
+			}
+
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::NoSuchElement == $e->getCode()) {
+				$exists = false;
+			}
+		}
+		return $exists;
+	}
+
+	function ExecuteScript($script, $args=array()) {
+		$this->execute( array(
+			'script' => $script ,
+			'args'=>$args
+		) );
+	}
+
+	function hideAdminBar() {
+		//admin bar causes problem with scroll. So hide admin bar while testing.
+		$this->ExecuteScript('jQuery("#wpadminbar").hide();');
+	}
+
+	function logInfo($string) {
+		fwrite(STDOUT, "Info: ".$string . PHP_EOL);
+	}
+
+	function logError($string) {
+		fwrite(STDOUT, "Error: ".$string . PHP_EOL);
+	}
+
+	function logWarning($string) {
+		fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
+	}
+
+	function getCurrentFileNumber($file) {
+		preg_match('/test-([0-9]+)_/', $file, $match);
+		return (int) $match[1];
+	}
+
+	function getCompletedFileNumber() {
+		$completed = fopen("tests/selenium/completed.txt", "r") or die("Unable to open file!");
+		$content = fgets($completed);
+		fclose($completed);
+		return (int) $content;
+	}
+
+	function skipTest($current, $completed) {
+		if ($completed == 0 || $completed == 42 || $current == $completed) {
+			return false;
+		} elseif ($current < $completed) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function maybeLogout() {
+		$this->url(self::GDTEST_BASE_URL);
+		$this->byXPath("//*[@id='gd-sidebar-wrapper']//ul[@class='geodir-loginbox-list']//a[@class='signin']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
+
+	function maybeAdminLogout() {
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->ExecuteScript('jQuery("#wp-admin-bar-my-account").addClass("hover");');
+		$this->byXPath("//*[@id='wp-admin-bar-logout']//a")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
+
+	function maybeActivatePlugin($id=false, $timeout=10000) {
+		if (!$id) {
+			return;
+		}
+		$plugin_name = ucwords(str_replace('-', ' ', $id));
+		$this->logInfo('Activating '.$plugin_name.' plugin......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->hideAdminBar();
+		if (is_int(strpos($this->byId($id)->attribute('class'), 'inactive'))) {
+			$this->byXPath("//tr[@id='".$id."']//span[@class='activate']/a")->click();
+		}
+		$this->waitForPageLoadAndCheckForErrors($timeout);
+		$this->logInfo($plugin_name.' activated......');
+	}
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
     function isTextPresent($search)
     {
         $source = $this->source();
-        if ( strpos((string)$source,$search) !== FALSE) {
+        if (strpos((string) $source, $search) !== FALSE) {
             return true;
         } else {
             return false;
@@ -25,7 +25,7 @@ 
         return md5(uniqid(rand(), true)).'@gmail.com';
     }
 
-    function waitForPageLoadAndCheckForErrors($timeout=10000)
+    function waitForPageLoadAndCheckForErrors($timeout = 10000)
     {
         // Wait 10 seconds
         $this->timeouts()->implicitWait($timeout);
@@ -38,15 +38,15 @@ 
         $elements = $this->elements($this->using('css selector')->value('.xdebug-error'));
         if ($elements) {
             $total = count($elements);
-            fwrite(STDOUT, $total.' errors found'. PHP_EOL);
+            fwrite(STDOUT, $total.' errors found'.PHP_EOL);
             $count = 0;
             foreach ($elements as $i => $element) {
                 $count++;
                 if ($errors = $element->attribute('innerHTML')) {
-                    fwrite(STDOUT, "========================================================================". PHP_EOL);
-                    fwrite(STDOUT, strip_tags($errors). PHP_EOL);
+                    fwrite(STDOUT, "========================================================================".PHP_EOL);
+                    fwrite(STDOUT, strip_tags($errors).PHP_EOL);
                     if ($count == $total) {
-                        fwrite(STDOUT, "========================================================================". PHP_EOL);
+                        fwrite(STDOUT, "========================================================================".PHP_EOL);
                     }
                 }
             }
@@ -55,14 +55,14 @@ 
 
     function checkForJsErrors() {
         if ($this->isElementExists('sel_js_error')) {
-            fwrite(STDOUT, 'Javascript errors found'. PHP_EOL);
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
+            fwrite(STDOUT, 'Javascript errors found'.PHP_EOL);
+            fwrite(STDOUT, "========================================================================".PHP_EOL);
             echo $this->byId('sel_js_error')->attribute('innerHTML');
-            fwrite(STDOUT, "========================================================================". PHP_EOL);
+            fwrite(STDOUT, "========================================================================".PHP_EOL);
         }
     }
 
-    function maybeUserLogin($redirect, $force=false) {
+    function maybeUserLogin($redirect, $force = false) {
         if ($force) {
             $this->url(self::GDTEST_BASE_URL.'wp-admin/');
             if ($this->isTextPresent("forgetmenot")) {
@@ -121,11 +121,11 @@ 
         return $exists;
     }
 
-    function ExecuteScript($script, $args=array()) {
-        $this->execute( array(
-            'script' => $script ,
+    function ExecuteScript($script, $args = array()) {
+        $this->execute(array(
+            'script' => $script,
             'args'=>$args
-        ) );
+        ));
     }
 
     function hideAdminBar() {
@@ -134,15 +134,15 @@ 
     }
 
     function logInfo($string) {
-        fwrite(STDOUT, "Info: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Info: ".$string.PHP_EOL);
     }
 
     function logError($string) {
-        fwrite(STDOUT, "Error: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Error: ".$string.PHP_EOL);
     }
 
     function logWarning($string) {
-        fwrite(STDOUT, "Warning: ".$string . PHP_EOL);
+        fwrite(STDOUT, "Warning: ".$string.PHP_EOL);
     }
 
     function getCurrentFileNumber($file) {
@@ -180,7 +180,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
     }
 
-    function maybeActivatePlugin($id=false, $timeout=10000) {
+    function maybeActivatePlugin($id = false, $timeout = 10000) {
         if (!$id) {
             return;
         }

geodirectory_hooks_actions.php

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.

@@ -1097,8 +1101,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.

@@ -1233,8 +1238,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().

@@ -1341,8 +1347,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');

     }

 

@@ -1396,17 +1403,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();
+                }
             }

         }

     }

@@ -1427,8 +1436,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');

@@ -1578,20 +1588,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');

@@ -1825,11 +1840,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;

 }

@@ -1871,40 +1888,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;

     }

@@ -1979,11 +1987,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);

 

@@ -2007,8 +2017,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]);
+        }
 

     }

 

@@ -2140,16 +2151,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;
+            }
         }

 

     }

@@ -2204,8 +2217,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();

 

@@ -2279,8 +2293,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'];

@@ -2301,8 +2316,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 {

 

@@ -2553,8 +2569,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 = '';

@@ -2589,8 +2606,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 = '';

Doc Comments +3 added lines, -2 removed lines

@@ -2195,7 +2195,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)

 {

@@ -2368,6 +2368,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global object $current_user Current user object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

+ * @param string $user_id
  * @return array User listing count for each post type.

  */

 function geodir_user_post_listing_count($user_id=null)

@@ -3176,7 +3177,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  * @param array $classes The class array of the HTML element.

- * @return array Modified class array.

+ * @return string[] Modified class array.

  */

 function geodir_body_class_no_rating($classes = array())

 {

Indentation +1480 added lines, -1480 removed lines

@@ -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,59 +1275,59 @@ 
 	 */

 	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

-    $default_marker_icon = get_option('geodir_default_marker_icon');

-    $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

-    $default_marker_width = $default_marker_size['w'];

-    $default_marker_height = $default_marker_size['h'];

+	$default_marker_icon = get_option('geodir_default_marker_icon');

+	$default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

+	$default_marker_width = $default_marker_size['w'];

+	$default_marker_height = $default_marker_size['h'];

     

-    $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' => $default_marker_icon,

-        'geodir_default_marker_w' => $default_marker_width,

-        'geodir_default_marker_h' => $default_marker_height,

-        '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' => $default_marker_icon,

+		'geodir_default_marker_w' => $default_marker_width,

+		'geodir_default_marker_h' => $default_marker_height,

+		'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) : '',

@@ -1335,29 +1335,29 @@ 
 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

 		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

-        'geodir_map_name' => geodir_map_name(),

-    );

-

-    /**

-     * 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');

-    }

+		'geodir_map_name' => geodir_map_name(),

+	);

+

+	/**

+	 * 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);

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

-    echo '<script>';

-    echo $script;

-    echo '</script>';

+	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>';

 }

 

 add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);

@@ -1373,9 +1373,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*/

@@ -1401,25 +1401,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');

 

 }

 

@@ -1433,34 +1433,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');

@@ -1473,9 +1473,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

@@ -1503,11 +1503,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;

 }

 

 

@@ -1523,34 +1523,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

 

-    }

+	}

 }

 

 

@@ -1575,42 +1575,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;

 }

 

 

@@ -1626,69 +1626,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');

 

-    }

+	}

 

 }

 

@@ -1707,24 +1707,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;

 

 }

 

@@ -1749,42 +1749,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);

@@ -1825,21 +1825,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;

 }

 

 

@@ -1858,75 +1858,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);

 

 }

 

@@ -1942,33 +1942,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');

 

-    }

+	}

 

 }

 

@@ -1985,19 +1985,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');

 

-    }

+	}

 

 }

 

@@ -2013,19 +2013,19 @@ 
  */

 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.

@@ -2038,13 +2038,13 @@ 
  */

 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;

 }

 

 

@@ -2136,33 +2136,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;

 

 }

 

@@ -2175,10 +2175,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);

+	}

 }

 

 

@@ -2200,51 +2200,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);

 

-    }

+	}

 

 }

 

@@ -2262,79 +2262,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);

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -2352,9 +2352,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');

+	}

 

 }

 

@@ -2372,27 +2372,27 @@ 
  */

 function geodir_user_post_listing_count($user_id=null)

 {

-    global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

-        $user_id = $current_user->ID;

-    }

+	global $wpdb, $plugin_prefix, $current_user;

+	if(!$user_id){

+		$user_id = $current_user->ID;

+	}

 

-    $user_id = $current_user->ID;

-    $all_postypes = geodir_get_posttypes();

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$user_id = $current_user->ID;

+	$all_postypes = geodir_get_posttypes();

+	$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;

 }

 

 

@@ -2412,579 +2412,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 */

@@ -3008,37 +3008,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);

+	}

 

 

 }

@@ -3052,21 +3052,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);

+	}

 }

 

 /**

@@ -3078,20 +3078,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" />';

+		}

+	}

 }

 

 /**

@@ -3105,11 +3105,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;

+	}

 }

 

 /**

@@ -3122,7 +3122,7 @@ 
  */

 function geodir_no_rating_review_rating_html($content = '')

 {

-    return NULL;

+	return NULL;

 }

 

 /**

@@ -3136,19 +3136,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);

@@ -3162,11 +3162,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);

@@ -3180,13 +3180,13 @@ 
  */

 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';

+	}

     

-    $classes[] = 'gd-map-' . geodir_map_name();

+	$classes[] = 'gd-map-' . geodir_map_name();

 

-    return $classes;

+	return $classes;

 }

 

 add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);

@@ -3200,13 +3200,13 @@ 
  */

 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';

+	}

     

-    $class .= ' gd-map-' . geodir_map_name();

+	$class .= ' gd-map-' . geodir_map_name();

 

-    return $class;

+	return $class;

 }

 

 add_action('wp_head', 'geodir_wp_head_no_rating');

@@ -3219,10 +3219,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');

@@ -3239,36 +3239,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 +176 added lines, -176 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 */

@@ -176,9 +176,9 @@ 
 /* WP REVIEW COUNT ACTIONS */

 ////////////////////////

 

-add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);

+add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);

 //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);

@@ -222,7 +222,7 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $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 {

@@ -320,8 +320,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,8 +422,8 @@ 
     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) {

+        $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.

          *

@@ -469,8 +469,8 @@ 
     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) {

+        $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.

          *

@@ -509,12 +509,12 @@ 
             $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());

             $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>';

+            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

     /**

@@ -525,8 +525,8 @@ 
     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) {

+        $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.

          *

@@ -579,14 +579,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;

@@ -727,7 +727,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('');

             }

 

@@ -759,18 +759,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.

@@ -783,13 +783,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

@@ -834,30 +834,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)",

@@ -865,7 +865,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)",

@@ -1072,18 +1072,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,8 +1099,8 @@ 
     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) {

+        $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.

          *

@@ -1154,10 +1154,10 @@ 
        

 	   $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 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="fn" itemprop="itemreviewed">'.$post->post_title.'</span>';

 

         if ($post_images) {

             foreach ($post_images as $img) {

@@ -1167,7 +1167,7 @@ 
         }

 

         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 .= '<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>';

@@ -1194,9 +1194,9 @@ 
     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>';

+        $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,8 +1235,8 @@ 
 

     $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) {

+        $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,7 +1334,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 : '',

         'geodir_map_name' => geodir_map_name(),

     );

@@ -1352,10 +1352,10 @@ 
     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) . ';';

+    $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';';

     echo '<script>';

     echo $script;

     echo '</script>';

@@ -1528,7 +1528,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 : '';

         }

 

@@ -1542,7 +1542,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)) {

@@ -1582,7 +1582,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;

         }

     }

@@ -1630,16 +1630,16 @@ 
     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')));

+		$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');

 	}

 

     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",

+                "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s",

                 array('1', '1', 'admin')

             )

         );

@@ -1647,9 +1647,9 @@ 
 

         /* --- 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)) {

 

@@ -1657,7 +1657,7 @@ 
 

                 $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)) {

 

@@ -1666,17 +1666,17 @@ 
                         $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) {

 

-                            $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 {

 

-                            $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)));

 

                         }

 

@@ -1710,14 +1710,14 @@ 
 

     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) {

 

         $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)));

+            $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);

 

@@ -1771,7 +1771,7 @@ 
 

         $suffix = 1;

         do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+            $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);

@@ -1783,7 +1783,7 @@ 
 

         //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)));

 

     }

 	

@@ -1792,18 +1792,18 @@ 
 	$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

 	

 	$post_types = geodir_get_posttypes();

-	if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

-		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

+	if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {		

+		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));

 		

 		if (!empty($posts_obj)) {

 			foreach ($posts_obj as $post_obj) {

 				$post_id = $post_obj->object_id;

 				

-				$raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

+				$raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));

 				$post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';

 				

-				$listing_table = $plugin_prefix . $post_type . '_detail';

-				$wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

+				$listing_table = $plugin_prefix.$post_type.'_detail';

+				$wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

 			}

 		}

 	}

@@ -1837,7 +1837,7 @@ 
     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))))

+    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;

@@ -1877,43 +1877,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;

     }

@@ -1945,8 +1945,8 @@ 
 

     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();

 

@@ -2147,7 +2147,7 @@ 
 

         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;

@@ -2155,7 +2155,7 @@ 
 

         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;

@@ -2176,7 +2176,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);

     }

@@ -2223,25 +2223,25 @@ 
         $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 ",

+            $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",

+            $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);

+            $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);

 

@@ -2269,9 +2269,9 @@ 
 

     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)) {

 

@@ -2279,7 +2279,7 @@ 
 

                 $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)) {

 

@@ -2296,22 +2296,22 @@ 
 

                         $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'])) {

 

-                            $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 ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

 

                     } else {

 

@@ -2325,7 +2325,7 @@ 
 

                     }

 

-                    $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);

 

@@ -2354,7 +2354,7 @@ 
 {

 

     if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+        update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');

     }

 

 }

@@ -2371,10 +2371,10 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @return array User listing count for each post type.

  */

-function geodir_user_post_listing_count($user_id=null)

+function geodir_user_post_listing_count($user_id = null)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

@@ -2385,7 +2385,7 @@ 
     $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' )");

+            $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;

@@ -2486,9 +2486,9 @@ 
                     }

 

                     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;';

+                        $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>';

+                        $field_icon = '<i class="'.$type['field_icon'].'"></i>';

                     }

 

                     switch ($type['type']) {

@@ -2496,7 +2496,7 @@ 
                             $i = 0;

                             $fieldset_count++;

                             $field_set_start = 1;

-                            $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+                            $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count;

                             $fieldset_arr[$fieldset_count]['label'] = $label;

                         }

                             break;

@@ -2529,7 +2529,7 @@ 
                             // 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>' .

+                            $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.

                                  *

@@ -2538,7 +2538,7 @@ 
                                  * @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>';

+                                apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';

                         }

                             break;

                         case 'phone': {

@@ -2553,11 +2553,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . stripslashes($post->{$type['htmlvar_name']}) . '</div>';

+                            $html .= ' </span>'.stripslashes($post->{$type['htmlvar_name']}).'</div>';

                         }

                             break;

                         case 'time': {

@@ -2576,11 +2576,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . stripslashes($value) . '</div>';

+                            $html .= ' </span>'.stripslashes($value).'</div>';

                         }

                             break;

                         case 'datepicker': {

@@ -2590,8 +2590,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);

 

@@ -2612,11 +2612,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . $value . '</div>';

+                            $html .= ' </span>'.$value.'</div>';

                         }

                             break;

                         case 'text': {

@@ -2631,11 +2631,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . stripslashes($post->{$type['htmlvar_name']}) . '</div>';

+                            $html .= ' </span>'.stripslashes($post->{$type['htmlvar_name']}).'</div>';

                         }

                             break;

                         case 'radio': {

@@ -2672,13 +2672,13 @@ 
 

                                 $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;

+                                $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 .= ' '.__($site_title, 'geodirectory').': ';

                                 }

 

-                                $html .= ' </span>' . $html_val . '</div>';

+                                $html .= ' </span>'.$html_val.'</div>';

                             }

                         }

                             break;

@@ -2686,7 +2686,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');

@@ -2705,13 +2705,13 @@ 
 

                                 $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;

+                                $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 .= ' '.__($site_title, 'geodirectory').': ';

                                 }

 

-                                $html .= ' </span>' . $html_val . '</div>';

+                                $html .= ' </span>'.$html_val.'</div>';

                             }

                         }

                             break;

@@ -2741,11 +2741,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . $field_value . '</div>';

+                            $html .= ' </span>'.$field_value.'</div>';

                         }

                             break;

                         case 'multiselect': {

@@ -2779,16 +2779,16 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

                             $html .= ' </span>';

 

                             if (count($option_values) > 1) {

                                 $html .= '<ul>';

                                 foreach ($option_values as $val) {

-                                    $html .= '<li>' . $val . '</li>';

+                                    $html .= '<li>'.$val.'</li>';

                                 }

                                 $html .= '</ul>';

                             } else {

@@ -2809,11 +2809,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . stripslashes($post->{$type['htmlvar_name']}) . '</div>';

+                            $html .= ' </span>'.stripslashes($post->{$type['htmlvar_name']}).'</div>';

                         }

                             break;

                         case 'textarea': {

@@ -2828,11 +2828,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= '</span>' . wpautop(stripslashes($post->{$type['htmlvar_name']})) . '</div>';

+                            $html .= '</span>'.wpautop(stripslashes($post->{$type['htmlvar_name']})).'</div>';

                         }

                             break;

                         case 'html': {

@@ -2847,11 +2847,11 @@ 
 

                             $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;

+                            $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 .= ' '.__($site_title, 'geodirectory').': ';

                             }

-                            $html .= ' </span>' . wpautop(stripslashes($post->{$type['htmlvar_name']})) . '</div>';

+                            $html .= ' </span>'.wpautop(stripslashes($post->{$type['htmlvar_name']})).'</div>';

                         }

                         break;

                         case 'file': {

@@ -2862,7 +2862,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) {

@@ -2891,9 +2891,9 @@ 
                                                 $file_paths .= '</a>';

                                                 $file_paths .= '</div>';

                                             } else {

-                                                $ext_path = '_' . $html_var . '_';

+                                                $ext_path = '_'.$html_var.'_';

                                                 $filename = explode($ext_path, $filename);

-                                                $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

+                                                $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';

                                             }

                                         }

                                     }

@@ -2910,13 +2910,13 @@ 
                                     $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;

+                                    $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 .= ' '.__($site_title, 'geodirectory').': ';

                                     }

 

-                                    $html .= ' </span>' . $file_paths . '</div>';

+                                    $html .= ' </span>'.$file_paths.'</div>';

                                 }

                             }

                         }

@@ -2967,7 +2967,7 @@ 
                                  * @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>'

+                                'tab_content' => '<div class="geodir-company_info field-group">'.$fieldset_html.'</html>'

                             );

                         }

                     } else {

@@ -3027,7 +3027,7 @@ 
             }

             $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>';

         }

     }

 

@@ -3107,7 +3107,7 @@ 
 function geodir_no_rating_comment_text($content, $comment = '')

 {

     if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

+        return '<div class="description">'.$content.'</div>';

     } else {

         return $content;

     }

@@ -3185,7 +3185,7 @@ 
         $classes[] = 'gd-no-rating';

     }

     

-    $classes[] = 'gd-map-' . geodir_map_name();

+    $classes[] = 'gd-map-'.geodir_map_name();

 

     return $classes;

 }

@@ -3205,7 +3205,7 @@ 
         $class .= ' gd-no-rating';

     }

     

-    $class .= ' gd-map-' . geodir_map_name();

+    $class .= ' gd-map-'.geodir_map_name();

 

     return $class;

 }

@@ -3240,7 +3240,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');

 

tests/selenium/stest-13_Send_Enquiry.php

Indentation +34 added lines, -34 removed lines

@@ -1,42 +1,42 @@
 <?php
 class SendEnquiry extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testSendEnquiry()
-    {
-        $this->logInfo('Send Enquiry......');
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_send_inquiry')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byName('inq_name')->value('Test User');
-        $this->byName('inq_email')->value('test@test.com');
-        $this->byId('agt_mail_phone')->value('44444444444');
-        $this->byName('Send')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
-    }
+	public function testSendEnquiry()
+	{
+		$this->logInfo('Send Enquiry......');
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/test-listing/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_send_inquiry')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byName('inq_name')->value('Test User');
+		$this->byName('inq_email')->value('test@test.com');
+		$this->byId('agt_mail_phone')->value('44444444444');
+		$this->byName('Send')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $this->byId('agt_mail_phone')->value('44444444444');
         $this->byName('Send')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Enquiry sent successfully"), "Success text not found");
+        $this->assertTrue($this->isTextPresent("Enquiry sent successfully"), "Success text not found");
     }
 
     public function tearDown()

tests/selenium/stest-17_Add_Custom_Fields.php

Indentation +65 added lines, -65 removed lines

@@ -1,74 +1,74 @@
 <?php
 class AddCustomFields extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testAddCustomFields()
-    {
-        $this->logInfo('Add custom fields......');
-        $this->prepareSession()->currentWindow()->maximize();
-        //Field 1
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gt-text')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $link = $this->byXPath("//li[@id='licontainer_new10']/div[contains(@class,'titlenew10')]");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='admin_title']")->value('Text Field 1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='site_title']")->value('Text Field 1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='htmlvar_name']")->value('text_field_1');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='clabels']")->value('Text Field 1');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='is_active']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_sort']")->click();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_filter']")->click();
-        $this->byXPath("//div[@id='field_frmnew10']//input[@id='save']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testAddCustomFields()
+	{
+		$this->logInfo('Add custom fields......');
+		$this->prepareSession()->currentWindow()->maximize();
+		//Field 1
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gt-text')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$link = $this->byXPath("//li[@id='licontainer_new10']/div[contains(@class,'titlenew10')]");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='admin_title']")->value('Text Field 1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='site_title']")->value('Text Field 1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='htmlvar_name']")->value('text_field_1');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='clabels']")->value('Text Field 1');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='is_active']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew10']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_sort']")->click();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='cat_filter']")->click();
+		$this->byXPath("//div[@id='field_frmnew10']//input[@id='save']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 
-        //Field 2
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gt-text')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $link = $this->byXPath("//li[@id='licontainer_new11']/div[contains(@class,'titlenew11')]");
-        $this->moveto($link);
-        $this->doubleclick();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='admin_title']")->value('Text Field 2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='site_title']")->value('Text Field 2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='htmlvar_name']")->value('text_field_2');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='clabels']")->value('Text Field 2');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='is_active']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
-        $this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_sort']")->click();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_filter']")->click();
-        $this->byXPath("//div[@id='field_frmnew11']//input[@id='save']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		//Field 2
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=gd_place_fields_settings&subtab=custom_fields&listing_type=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gt-text')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$link = $this->byXPath("//li[@id='licontainer_new11']/div[contains(@class,'titlenew11')]");
+		$this->moveto($link);
+		$this->doubleclick();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='admin_title']")->value('Text Field 2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='site_title']")->value('Text Field 2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='htmlvar_name']")->value('text_field_2');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='clabels']")->value('Text Field 2');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='is_active']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_listing']"))->selectOptionByLabel('Yes');
+		$this->select($this->byXPath("//div[@id='field_frmnew11']//select[@id='show_on_detail']"))->selectOptionByLabel('Yes');
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_sort']")->click();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='cat_filter']")->click();
+		$this->byXPath("//div[@id='field_frmnew11']//input[@id='save']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-10_Add_A_Review.php

Indentation +40 added lines, -40 removed lines

@@ -1,48 +1,48 @@
 <?php
 class AddReview extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
 
-    public function testAddReview()
-    {
-        $this->logInfo('Adding a review......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/', true);
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-        $this->ExecuteScript('jQuery(".geodir-tab-head").css("overflow", "hidden");');
-        try {
-            $this->byXPath("//a[text()='Reviews']")->click();
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::ElementNotVisible == $e->getCode()) {
-                $this->ExecuteScript('jQuery("#geodir-tab-mobile-menu").click();');
-                $this->byXPath("//a[text()='Reviews']")->click();
-            }
-        }
-        $this->ExecuteScript('jQuery("#geodir_overallrating").val("4");');
-        $this->byId('comment')->value('Cool xyz');
-        $this->byId('submit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+	public function testAddReview()
+	{
+		$this->logInfo('Adding a review......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/', true);
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+		$this->ExecuteScript('jQuery(".geodir-tab-head").css("overflow", "hidden");');
+		try {
+			$this->byXPath("//a[text()='Reviews']")->click();
+		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+			if (PHPUnit_Extensions_Selenium2TestCase_WebDriverException::ElementNotVisible == $e->getCode()) {
+				$this->ExecuteScript('jQuery("#geodir-tab-mobile-menu").click();');
+				$this->byXPath("//a[text()='Reviews']")->click();
+			}
+		}
+		$this->ExecuteScript('jQuery("#geodir_overallrating").val("4");');
+		$this->byId('comment')->value('Cool xyz');
+		$this->byId('submit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-28_GD_Booster.php

Indentation +45 added lines, -45 removed lines

@@ -1,50 +1,50 @@
 <?php
 class GDBooster extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
-
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
-
-    public function testGDBooster()
-    {
-        $this->logInfo('Testing GD booster......');
-
-        //make sure GD Booster plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("gd-booster")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Booster
-            $this->maybeActivatePlugin("gd-booster", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("gd-booster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
-
-
-
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testGDBooster()
+	{
+		$this->logInfo('Testing GD booster......');
+
+		//make sure GD Booster plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("gd-booster")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Booster
+			$this->maybeActivatePlugin("gd-booster", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("gd-booster")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
+
+
+
+	}
+
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         }
 
         $is_active1 = $this->byId("gd-booster")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "GD Booster plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "GD Booster plugin not active");