GeoDirectory / geodirectory

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

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