GeoDirectory / geodirectory

tests/test-Check_Login_Box.php

Indentation +48 added lines, -48 removed lines

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

Spacing +6 added lines, -6 removed lines

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

tests/test-Login.php

Spacing +12 added lines, -12 removed lines

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

Indentation +88 added lines, -88 removed lines

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

tests/test-Edit_Listing.php

Indentation +58 added lines, -58 removed lines

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

Spacing +2 added lines, -2 removed lines

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

tests/test-Check_Notifications.php

Indentation +80 added lines, -80 removed lines

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

Spacing +30 added lines, -30 removed lines

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

tests/test-Test_Dummy_Data.php

Spacing +1 added lines, -1 removed lines

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

Indentation +33 added lines, -33 removed lines

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

tests/test-Import_Export.php

Indentation +11 added lines, -11 removed lines

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

tests/selenium/base.php

Doc Comments +22 added lines

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

Indentation +191 added lines, -191 removed lines

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

Spacing +18 added lines, -18 removed lines

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

geodirectory-admin/option-pages/notifications_settings_array.php

Indentation +291 added lines, -291 removed lines

@@ -17,296 +17,296 @@
 $geodir_settings['notifications_settings'] = apply_filters('geodir_notifications_settings', array(

 

 

-    array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

-

-

-    array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

-

-    array(

-        'name' => __('List of usable shortcodes', 'geodirectory'),

-        'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

-        'id' => 'geodir_list_of_usable_shordcodes',

-        'type' => 'html_content',

-        'css' => 'min-width:300px;',

-        'std' => 'All Places' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'notification_options'),

-

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

-

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'site_bcc_options'),

-

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

-

-    array(

-        'name' => __('Post submit success to admin email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-     array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Listing edited by Author', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'admin_emails'),

-

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

-

-    array(

-        'name' => __('Post submit success to client email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

-    ),

-

-

-    array(

-        'name' => __('User forgot password email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_forgot_password_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_forgot_password_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Registration success email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-    array(

-        'name' => __('Listing published email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_published_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_published_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'client_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_friend_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_friend_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Email enquiry', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Website Enquiry', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'other_emails'),

-

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

-

-    array(

-        'name' => __('Post submitted success', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_added_success_msg_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'messages'),

+	array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

+

+

+	array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

+

+	array(

+		'name' => __('List of usable shortcodes', 'geodirectory'),

+		'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

+		'id' => 'geodir_list_of_usable_shordcodes',

+		'type' => 'html_content',

+		'css' => 'min-width:300px;',

+		'std' => 'All Places' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'notification_options'),

+

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

+

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'site_bcc_options'),

+

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

+

+	array(

+		'name' => __('Post submit success to admin email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	 array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Listing edited by Author', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'admin_emails'),

+

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

+

+	array(

+		'name' => __('Post submit success to client email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+	),

+

+

+	array(

+		'name' => __('User forgot password email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_forgot_password_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_forgot_password_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Registration success email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+	array(

+		'name' => __('Listing published email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_published_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_published_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'client_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_friend_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_friend_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Email enquiry', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Website Enquiry', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'other_emails'),

+

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

+

+	array(

+		'name' => __('Post submitted success', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_added_success_msg_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'messages'),

 

 )); // End Manage NOtifications settings

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject_admin',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

      array(

         'name' => '',

@@ -137,7 +137,7 @@ 
         'id' => 'geodir_post_submited_success_email_content_admin',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')

     ),

     array(

         'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

@@ -188,7 +188,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -196,7 +196,7 @@ 
         'id' => 'geodir_post_submited_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -214,7 +214,7 @@ 
         'id' => 'geodir_forgot_password_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array(

@@ -231,7 +231,7 @@ 
         'id' => 'geodir_registration_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

     array(

         'name' => __('Listing published email', 'geodirectory'),

@@ -270,7 +270,7 @@ 
         'id' => 'geodir_email_friend_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')

     ),

 

     array(

@@ -287,7 +287,7 @@ 
         'id' => 'geodir_email_enquiry_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

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

@@ -303,7 +303,7 @@ 
         'id' => 'geodir_post_added_success_msg_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')

     ),

 

 

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