GeoDirectory / geodirectory

tests/test-Search_With_Keyword.php

Indentation +26 added lines, -26 removed lines

@@ -1,38 +1,38 @@
 <?php
 class SearchWithKeyword extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testSearchWithKeyword()
-    {
-        $_REQUEST['geodir_search'] = 1;
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-            's' => 'Longwood Gardens'
-        );
+	public function testSearchWithKeyword()
+	{
+		$_REQUEST['geodir_search'] = 1;
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+			's' => 'Longwood Gardens'
+		);
 
-        $all_posts = new WP_Query( $query_args );
+		$all_posts = new WP_Query( $query_args );
 
-        $total_posts = $all_posts->found_posts;
+		$total_posts = $all_posts->found_posts;
 
-        $this->assertTrue(is_int((int) $total_posts));
+		$this->assertTrue(is_int((int) $total_posts));
 
-        $title = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $title = get_the_title();
-        endwhile;
+		$title = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$title = get_the_title();
+		endwhile;
 
-        $this->assertEquals($title, 'Longwood Gardens');
-    }
+		$this->assertEquals($title, 'Longwood Gardens');
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 

tests/test-Add_Listing.php

Indentation +31 added lines, -31 removed lines

@@ -1,39 +1,39 @@
 <?php
 class AddListing extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAddListing()
-    {
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
+	public function testAddListing()
+	{
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
 
-        $this->assertTrue(is_int($post_id));
-    }
+		$this->assertTrue(is_int($post_id));
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

tests/test-Check_Login_Box.php

Indentation +48 added lines, -48 removed lines

@@ -1,57 +1,57 @@
 <?php
 class CheckLoginBox extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testLoginBoxEmptyPassword()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_POST['log'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
-    }
+	public function testLoginBoxEmptyPassword()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_POST['log'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_password', $errors["errors"] );
+		$this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+	}
 
-    public function testLoginBoxIncorrectPassword()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'testuser';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
-    }
+	public function testLoginBoxIncorrectPassword()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'testuser';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
+		$this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+	}
 
-    public function testLoginBoxInvalidUsername()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'adm##@in';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
-    }
+	public function testLoginBoxInvalidUsername()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'adm##@in';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
+		$this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+        $this->assertArrayHasKey('empty_password', $errors["errors"]);
+        $this->assertContains('The password field is empty', $errors["errors"]["empty_password"][0]);
     }
 
     public function testLoginBoxIncorrectPassword()
@@ -30,8 +30,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+        $this->assertArrayHasKey('incorrect_password', $errors["errors"]);
+        $this->assertContains('The password you entered for the username', $errors["errors"]["incorrect_password"][0]);
     }
 
     public function testLoginBoxInvalidUsername()
@@ -45,8 +45,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+        $this->assertArrayHasKey('invalid_username', $errors["errors"]);
+        $this->assertContains('Invalid username', $errors["errors"]["invalid_username"][0]);
     }
 
     public function tearDown()

tests/test-Login.php

Spacing +12 added lines, -12 removed lines

@@ -16,8 +16,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+        $this->assertArrayHasKey('empty_password', $errors["errors"]);
+        $this->assertContains('The password field is empty', $errors["errors"]["empty_password"][0]);
     }
 
     public function testLoginIncorrectPassword()
@@ -30,8 +30,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+        $this->assertArrayHasKey('incorrect_password', $errors["errors"]);
+        $this->assertContains('The password you entered for the username', $errors["errors"]["incorrect_password"][0]);
     }
 
     public function testLoginInvalidUsername()
@@ -44,8 +44,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+        $this->assertArrayHasKey('invalid_username', $errors["errors"]);
+        $this->assertContains('Invalid username', $errors["errors"]["invalid_username"][0]);
     }
 
 //    public function testLoginValid()
@@ -70,8 +70,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
+        $this->assertArrayHasKey('empty_username', $errors["errors"]);
+        $this->assertContains('Enter a username or e-mail address', $errors["errors"]["empty_username"][0]);
     }
 
     public function testForgotPassInvalidEmail()
@@ -85,8 +85,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
+        $this->assertArrayHasKey('invalid_email', $errors["errors"]);
+        $this->assertContains('There is no user registered with that email address', $errors["errors"]["invalid_email"][0]);
     }
 
     public function testForgotPassInvalidUsername()
@@ -100,8 +100,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
-        $this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
+        $this->assertArrayHasKey('invalidcombo', $errors["errors"]);
+        $this->assertContains('Invalid username or e-mail', $errors["errors"]["invalidcombo"][0]);
     }
 
     public function tearDown()

Indentation +88 added lines, -88 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 class LoginUser extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testLoginEmptyPassword()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
-    }
+	public function testLoginEmptyPassword()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_password', $errors["errors"] );
+		$this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+	}
 
-    public function testLoginIncorrectPassword()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'testuser';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
-    }
+	public function testLoginIncorrectPassword()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'testuser';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
+		$this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+	}
 
-    public function testLoginInvalidUsername()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'adm##@in';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
-    }
+	public function testLoginInvalidUsername()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'adm##@in';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
+		$this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+	}
 
 //    public function testLoginValid()
 //    {
@@ -58,55 +58,55 @@ 
 //        remove_filter('wp_redirect', '__return_false');
 //    }
 
-    public function testForgotPassEmptyData()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = '';
-        $_POST['user_email'] = '';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
-    }
+	public function testForgotPassEmptyData()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = '';
+		$_POST['user_email'] = '';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_username', $errors["errors"] );
+		$this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
+	}
 
-    public function testForgotPassInvalidEmail()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = 'holla@hello.com';
-        $_POST['user_email'] = '';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
-    }
+	public function testForgotPassInvalidEmail()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = 'holla@hello.com';
+		$_POST['user_email'] = '';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
+		$this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
+	}
 
-    public function testForgotPassInvalidUsername()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = 'holla';
-        $_POST['user_email'] = 'holla@hello.com';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
-        $this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
-    }
+	public function testForgotPassInvalidUsername()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = 'holla';
+		$_POST['user_email'] = 'holla@hello.com';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
+		$this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 
 }
 ?>
\ No newline at end of file

tests/test-Edit_Listing.php

Indentation +58 added lines, -58 removed lines

@@ -1,63 +1,63 @@
 <?php
 class EditListing extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
-
-    public function testEditListing()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $args = array(
-            'pid' => $post_id,
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title Modified',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $saved_post_id = geodir_save_listing($args, true);
-
-        $this->assertTrue(is_int($saved_post_id));
-
-        $title = get_the_title($post_id);
-
-        $this->assertEquals('Test Listing Title Modified', $title);
-
-
-    }
-
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
+
+	public function testEditListing()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$args = array(
+			'pid' => $post_id,
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title Modified',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$saved_post_id = geodir_save_listing($args, true);
+
+		$this->assertTrue(is_int($saved_post_id));
+
+		$title = get_the_title($post_id);
+
+		$this->assertEquals('Test Listing Title Modified', $title);
+
+
+	}
+
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 

tests/test-Check_Notifications.php

Indentation +80 added lines, -80 removed lines

@@ -1,92 +1,92 @@
 <?php
 class CheckNotifications extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testSendFriendEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'thought you might be interested in', $output );
-        $this->assertContains( 'Your friend has sent you a message from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testSendFriendEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'thought you might be interested in', $output );
+		$this->assertContains( 'Your friend has sent you a message from', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testSendEnquiryEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Website Enquiry', $output );
-        $this->assertContains( 'An enquiry has been sent from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testSendEnquiryEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Website Enquiry', $output );
+		$this->assertContains( 'An enquiry has been sent from', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testForgotPassEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your new password', $output );
-        $this->assertContains( 'You requested a new password for', $output );
-        $this->assertContains( 'test@test.com', $output );
-    }
+	public function testForgotPassEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Your new password', $output );
+		$this->assertContains( 'You requested a new password for', $output );
+		$this->assertContains( 'test@test.com', $output );
+	}
 
-    public function testRegistrationEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your Log In Details', $output );
-        $this->assertContains( 'You can log in  with the following information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testRegistrationEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Your Log In Details', $output );
+		$this->assertContains( 'You can log in  with the following information', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testPostSubmitEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Post Submitted Successfully', $output );
-        $this->assertContains( 'You submitted the below listing information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-        $this->assertContains( 'A new  listing has been published', $output );
-    }
+	public function testPostSubmitEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Post Submitted Successfully', $output );
+		$this->assertContains( 'You submitted the below listing information', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+		$this->assertContains( 'A new  listing has been published', $output );
+	}
 
-    public function testListingPublishedEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Listing Published Successfully', $output );
-        $this->assertContains( 'Your listing  has been published', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testListingPublishedEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Listing Published Successfully', $output );
+		$this->assertContains( 'Your listing  has been published', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -10,78 +10,78 @@
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'thought you might be interested in', $output );
-        $this->assertContains( 'Your friend has sent you a message from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('thought you might be interested in', $output);
+        $this->assertContains('Your friend has sent you a message from', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testSendEnquiryEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Website Enquiry', $output );
-        $this->assertContains( 'An enquiry has been sent from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Website Enquiry', $output);
+        $this->assertContains('An enquiry has been sent from', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testForgotPassEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your new password', $output );
-        $this->assertContains( 'You requested a new password for', $output );
-        $this->assertContains( 'test@test.com', $output );
+        $this->assertContains('Your new password', $output);
+        $this->assertContains('You requested a new password for', $output);
+        $this->assertContains('test@test.com', $output);
     }
 
     public function testRegistrationEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your Log In Details', $output );
-        $this->assertContains( 'You can log in  with the following information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Your Log In Details', $output);
+        $this->assertContains('You can log in  with the following information', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testPostSubmitEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Post Submitted Successfully', $output );
-        $this->assertContains( 'You submitted the below listing information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-        $this->assertContains( 'A new  listing has been published', $output );
+        $this->assertContains('Post Submitted Successfully', $output);
+        $this->assertContains('You submitted the below listing information', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
+        $this->assertContains('A new  listing has been published', $output);
     }
 
     public function testListingPublishedEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Listing Published Successfully', $output );
-        $this->assertContains( 'Your listing  has been published', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Listing Published Successfully', $output);
+        $this->assertContains('Your listing  has been published', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function tearDown()

tests/test-Test_Dummy_Data.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             'post_type' => 'gd_place'
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
 
         $total_posts = $all_posts->found_posts;
 

Indentation +33 added lines, -33 removed lines

@@ -1,50 +1,50 @@
 <?php
 class TestDummyData extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-        geodir_delete_dummy_posts();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+		geodir_delete_dummy_posts();
+	}
 
-    public function testCreatePlaces()
-    {
-        global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
+	public function testCreatePlaces()
+	{
+		global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
 
-        global $geodir_post_custom_fields_cache;
-        $geodir_post_custom_fields_cache = array();
+		global $geodir_post_custom_fields_cache;
+		$geodir_post_custom_fields_cache = array();
 
-        $city_bound_lat1 = 40.4960439;
-        $city_bound_lng1 = -74.2557349;
-        $city_bound_lat2 = 40.91525559999999;
-        $city_bound_lng2 = -73.7002721;
+		$city_bound_lat1 = 40.4960439;
+		$city_bound_lng1 = -74.2557349;
+		$city_bound_lat2 = 40.91525559999999;
+		$city_bound_lng2 = -73.7002721;
 
 
-        $dummy_post_index = 30;
-        test_create_dummy_posts(30);
+		$dummy_post_index = 30;
+		test_create_dummy_posts(30);
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place'
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place'
+		);
 
-        $all_posts = new WP_Query( $query_args );
+		$all_posts = new WP_Query( $query_args );
 
-        $total_posts = $all_posts->found_posts;
+		$total_posts = $all_posts->found_posts;
 
-        $this->assertTrue((int) $total_posts > 0);
+		$this->assertTrue((int) $total_posts > 0);
 
-    }
+	}
 
-    public function testDeletePlaces()
-    {
-        geodir_delete_dummy_posts();
-    }
+	public function testDeletePlaces()
+	{
+		geodir_delete_dummy_posts();
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

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/location_functions.php

Braces +31 added lines, -22 removed lines

@@ -61,11 +61,12 @@ 
 function geodir_is_default_location_set()

 {

     $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

-}

+    if (!empty($default_location)) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns location slug using location string.

@@ -258,8 +259,9 @@ 
 

         }

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+        if ($geodir_location->is_default) {
+                    update_option('geodir_default_location', $geodir_location);
+        }
 

         return $geodir_location->location_id;

 

@@ -307,9 +309,10 @@ 
     $status = $data->status;

     if ($status == "OK") {

         return $data->results[0]->address_components;

-    } else

-        return false;

-}

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

 

 /**

  * Returns current location terms.

@@ -333,16 +336,19 @@ 
         }

 

         $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '' && $country) {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

         $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

         $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '' && $city) {
+                    $location_array['gd_city'] = urldecode($city);
+        }
     } else {

         if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

             return $location_array;

@@ -354,14 +360,17 @@ 
 

         $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '') {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '') {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '') {
+                    $location_array['gd_city'] = urldecode($city);
+        }
 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

Spacing +17 added lines, -17 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -295,7 +295,7 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -388,7 +388,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -434,7 +434,7 @@ 
  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

     $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -448,9 +448,9 @@ 
     

     if (!empty($data) && !empty($data->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+        $formatted_address = (array) $data->address;

         

-        foreach ( $data->address as $key => $value ) {

+        foreach ($data->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

@@ -478,7 +478,7 @@ 
     }

     

     if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -488,7 +488,7 @@ 
             }

         }

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -526,10 +526,10 @@ 
 function geodir_get_country_iso2($country) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

         return $result;

     }

     

@@ -548,10 +548,10 @@ 
 function geodir_get_country_by_name($country, $iso2 = false) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {

         return $result;

     }

     

Indentation +266 added lines, -266 removed lines

@@ -9,10 +9,10 @@ 
  */

 function geodir_get_current_city_lat()

 {

-    $location = geodir_get_default_location();

-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

+	$location = geodir_get_default_location();

+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

 

-    return $lat;

+	return $lat;

 }

 

 /**

@@ -25,9 +25,9 @@ 
  */

 function geodir_get_current_city_lng()

 {

-    $location = geodir_get_default_location();

-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

-    return $lng;

+	$location = geodir_get_default_location();

+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

+	return $lng;

 }

 

 

@@ -40,15 +40,15 @@ 
  */

 function geodir_get_default_location()

 {

-    /**

-     * Filter the default location.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_result The default location object.

-     */

-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

+	/**

+	 * Filter the default location.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_result The default location object.

+	 */

+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

 }

 

 /**

@@ -60,11 +60,11 @@ 
  */

 function geodir_is_default_location_set()

 {

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location))

+		return true;

+	else

+		return false;

 }

 

 /**

@@ -78,15 +78,15 @@ 
 function create_location_slug($location_string)

 {

 

-    /**

-     * Filter the location slug.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_string Sanitized location string.

-     */

-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

+	/**

+	 * Filter the location slug.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_string Sanitized location string.

+	 */

+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

 

 }

 

@@ -100,15 +100,15 @@ 
  */

 function geodir_get_location($id = '')

 {

-    /**

-     * Filter the location information.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $id The location ID.

-     */

-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

+	/**

+	 * Filter the location information.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $id The location ID.

+	 */

+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

 }

 

 /**

@@ -122,28 +122,28 @@ 
  */

 function geodir_get_country_dl($post_country = '', $prefix = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+	$rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

     

-    $ISO2 = array();

-    $countries = array();

+	$ISO2 = array();

+	$countries = array();

     

-    foreach ($rows as $row) {

-        $ISO2[$row->Country] = $row->ISO2;

-        $countries[$row->Country] = __($row->Country, 'geodirectory');

-    }

+	foreach ($rows as $row) {

+		$ISO2[$row->Country] = $row->ISO2;

+		$countries[$row->Country] = __($row->Country, 'geodirectory');

+	}

     

-    asort($countries);

+	asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

-    foreach ($countries as $country => $name) {

-        $ccode = $ISO2[$country];

+	$out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+	foreach ($countries as $country => $name) {

+		$ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

-    }

+		$out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+	}

 

-    echo $out_put;

+	echo $out_put;

 }

 

 

@@ -158,40 +158,40 @@ 
 function geodir_location_form_submit()

 {

 

-    global $wpdb, $plugin_prefix;

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

+	global $wpdb, $plugin_prefix;

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

 

-        $location_info = array(

-            'city' => $_REQUEST['city'],

-            'region' => $_REQUEST['region'],

-            'country' => $_REQUEST['country'],

-            'geo_lat' => $_REQUEST['latitude'],

-            'geo_lng' => $_REQUEST['longitude'],

-            'is_default' => $_REQUEST['is_default'],

-            'update_city' => $_REQUEST['update_city']

-        );

+		$location_info = array(

+			'city' => $_REQUEST['city'],

+			'region' => $_REQUEST['region'],

+			'country' => $_REQUEST['country'],

+			'geo_lat' => $_REQUEST['latitude'],

+			'geo_lng' => $_REQUEST['longitude'],

+			'is_default' => $_REQUEST['is_default'],

+			'update_city' => $_REQUEST['update_city']

+		);

 

-        $old_location = geodir_get_default_location();

+		$old_location = geodir_get_default_location();

 

-        $locationid = geodir_add_new_location($location_info);

+		$locationid = geodir_add_new_location($location_info);

 

-        $default_location = geodir_get_location($locationid);

+		$default_location = geodir_get_location($locationid);

 

-        //UPDATE AND DELETE LISTING

-        $posttype = geodir_get_posttypes();

-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

+		//UPDATE AND DELETE LISTING

+		$posttype = geodir_get_posttypes();

+		if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

-            foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+			foreach ($posttype as $posttypeobj) {

+				$post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

 

-                $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

-                );

-                $wpdb->query($sql);

-            }

-        }

-    }

+				$sql = $wpdb->prepare(

+					"UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

+				);

+				$wpdb->query($sql);

+			}

+		}

+	}

 }

 

 /**

@@ -215,37 +215,37 @@ 
  */

 function geodir_add_new_location($location_info = array())

 {

-    global $wpdb;

-

-    if (!empty($location_info)) {

-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

-        $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));

-        $region_slug = create_location_slug($location_region);

-        $city_slug = create_location_slug($location_city);

+	global $wpdb;

+

+	if (!empty($location_info)) {

+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

+		$location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';

+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));

+		$region_slug = create_location_slug($location_region);

+		$city_slug = create_location_slug($location_city);

         

-        /**

-         * Filter add new location data.

-         *

-         * @since 1.0.0

-         */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

-            'country' => $location_country,

-            'region' => $location_region,

-            'city' => $location_city,

-            'country_slug' => $country_slug,

-            'region_slug' => $region_slug,

-            'city_slug' => $city_slug,

-            'city_latitude' => $location_lat,

-            'city_longitude' => $location_lng,

-            'is_default' => $is_default

-        ));

-

-        /* // Not allowed to create country in DB : 2016-12-09

+		/**

+		 * Filter add new location data.

+		 *

+		 * @since 1.0.0

+		 */

+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+			'country' => $location_country,

+			'region' => $location_region,

+			'city' => $location_city,

+			'country_slug' => $country_slug,

+			'region_slug' => $region_slug,

+			'city_slug' => $city_slug,

+			'city_latitude' => $location_lat,

+			'city_longitude' => $location_lng,

+			'is_default' => $is_default

+		));

+

+		/* // Not allowed to create country in DB : 2016-12-09

         if ($geodir_location->country) {

 

             $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

@@ -259,14 +259,14 @@ 
         }

         */

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+		if ($geodir_location->is_default)

+			update_option('geodir_default_location', $geodir_location);

 

-        return $geodir_location->location_id;

+		return $geodir_location->location_id;

 

-    } else {

-        return false;

-    }

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -280,7 +280,7 @@ 
  */

 function geodir_random_float($min = 0, $max = 1)

 {

-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);

+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);

 }

 

 /**

@@ -294,22 +294,22 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

-    $status = $data->status;

-    if ($status == "OK") {

-        return $data->results[0]->address_components;

-    } else

-        return false;

+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

+	$status = $data->status;

+	if ($status == "OK") {

+		return $data->results[0]->address_components;

+	} else

+		return false;

 }

 

 /**

@@ -326,70 +326,70 @@ 
  */

 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')

 {

-    global $wp, $gd_session;

-    $location_array = array();

-    if ($location_array_from == 'session') {

-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

-            return $location_array;

-        }

+	global $wp, $gd_session;

+	$location_array = array();

+	if ($location_array_from == 'session') {

+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

+			return $location_array;

+		}

 

-        $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+		$country = $gd_session->get('gd_country');

+		if ($country != '' && $country)

+			$location_array['gd_country'] = urldecode($country);

 

-        $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+		$region = $gd_session->get('gd_region');

+		if ($region != '' && $region)

+			$location_array['gd_region'] = urldecode($region);

 

-        $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

-    } else {

-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

-            return $location_array;

-        }

+		$city = $gd_session->get('gd_city');

+		if ($city != '' && $city)

+			$location_array['gd_city'] = urldecode($city);

+	} else {

+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

+			return $location_array;

+		}

 

-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

 

-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

 

-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+		if ($country != '')

+			$location_array['gd_country'] = urldecode($country);

 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+		if ($region != '')

+			$location_array['gd_region'] = urldecode($region);

 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+		if ($city != '')

+			$location_array['gd_city'] = urldecode($city);

 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

 			$location_array = geodir_get_current_location_terms('session');

 		}

-    }

+	}

 

 	/**

 	 * Filter the location terms.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_array {

+	 *    Attributes of the location_array.

+	 *

+	 *    @type string $gd_country The country slug.

+	 *    @type string $gd_region The region slug.

+	 *    @type string $gd_city The city slug.

 	 *

-     * @param array $location_array {

-     *    Attributes of the location_array.

-     *

-     *    @type string $gd_country The country slug.

-     *    @type string $gd_region The region slug.

-     *    @type string $gd_city The city slug.

-     *

-     * }

+	 * }

 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

 	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

 

-    return $location_array;

+	return $location_array;

 

 }

 

@@ -402,24 +402,24 @@ 
  * @return bool|string

  */

 function geodir_get_location_link($which_location = 'current') {

-    $location_link = get_permalink(geodir_location_page_id());

-

-    if ($which_location == 'base') {

-        return $location_link;

-    } else {

-        $location_terms = geodir_get_current_location_terms();

-

-        if (!empty($location_terms)) {

-            if (get_option('permalink_structure') != '') {

-                $location_terms = implode("/", $location_terms);

-                $location_terms = rtrim($location_terms, '/');

-                $location_link .= $location_terms;

-            } else {

-                $location_link = geodir_getlink($location_link, $location_terms);

-            }

-        }

-    }

-    return $location_link;

+	$location_link = get_permalink(geodir_location_page_id());

+

+	if ($which_location == 'base') {

+		return $location_link;

+	} else {

+		$location_terms = geodir_get_current_location_terms();

+

+		if (!empty($location_terms)) {

+			if (get_option('permalink_structure') != '') {

+				$location_terms = implode("/", $location_terms);

+				$location_terms = rtrim($location_terms, '/');

+				$location_link .= $location_terms;

+			} else {

+				$location_link = geodir_getlink($location_link, $location_terms);

+			}

+		}

+	}

+	return $location_link;

 }

 

 /**

@@ -432,34 +432,34 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

+	$url = is_ssl() ? 'https:' : 'http:';

+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

     

-    if (!empty($data) && !empty($data->address)) {

-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+	if (!empty($data) && !empty($data->address)) {

+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

+		$formatted_address = (array)$data->address;

         

-        foreach ( $data->address as $key => $value ) {

-            if (!in_array($key, $address_fields)) {

-                unset($formatted_address[$key]);

-            }

-        }

-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

+		foreach ( $data->address as $key => $value ) {

+			if (!in_array($key, $address_fields)) {

+				unset($formatted_address[$key]);

+			}

+		}

+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

         

-        return $data;

-    } else {

-        return false;

-    }

+		return $data;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -471,47 +471,47 @@ 
  * @return string Returns the country.

  */

 function geodir_get_normal_country($country) {

-    global $wpdb;

-    if ($result = geodir_get_country_by_name($country)) {

-        return $result;

-    }

+	global $wpdb;

+	if ($result = geodir_get_country_by_name($country)) {

+		return $result;

+	}

     

-    if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

+	if (defined('POST_LOCATION_TABLE')) {

+		$rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

-        if (!empty($rows)) {

-            foreach ($rows as $row) {

-                $translated = __($row->country, 'geodirectory');

-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

-                    return $result;

-                }

-            }

-        }

-    }

+		$rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				$translated = __($row->country, 'geodirectory');

+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {

+					return $result;

+				}

+			}

+		}

+	}

     

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

-        return $result;

-    }

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

-        return $result;

-    }

+	if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {

+		return $result;

+	}

     

-    if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

-        return $result;

-    }

+	if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -523,16 +523,16 @@ 
  * @return string Country ISO2 code.

  */

 function geodir_get_country_iso2($country) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+		return $result;

+	}

     

-    return $country;

+	return $country;

 }

 

 /**

@@ -545,14 +545,14 @@ 
  * @return string|null Country ISO2 code.

  */

 function geodir_get_country_by_name($country, $iso2 = false) {

-    global $wpdb;

+	global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

-        return $result;

-    }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

-        return $result;

-    }

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+		return $result;

+	}

+	if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+		return $result;

+	}

     

-    return NULL;

+	return NULL;

 }
\ No newline at end of file