GeoDirectory / geodirectory

tests/selenium/stest-29_New_Location.php

Indentation +47 added lines, -47 removed lines

@@ -1,59 +1,59 @@
 <?php
 class NewLocation 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 testNewLocation()
-    {
-        $this->logInfo('Testing new location......');
-        //make sure multi locations plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testNewLocation()
+	{
+		$this->logInfo('Testing new location......');
+		//make sure multi locations plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("geodirectory-location-manager")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory Location Manager
-            $this->maybeActivatePlugin("geodirectory-location-manager", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("geodirectory-location-manager")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory Location Manager
+			$this->maybeActivatePlugin("geodirectory-location-manager", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+		$is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-        $this->byId('gd_city')->value('Bengaluru');
-        $this->byId('gd_region')->value('Karnataka');
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+		$this->byId('gd_city')->value('Bengaluru');
+		$this->byId('gd_region')->value('Karnataka');
+		$this->waitForPageLoadAndCheckForErrors();
 //        $this->byId('gd_city')->value('texas');
-        $this->byId('gd_set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('geodir_location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
-    }
+		$this->byId('gd_set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('geodir_location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' 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 +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-location-manager")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "Location Manager plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "Location Manager plugin not active");
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=managelocation_fields&subtab=geodir_location_addedit');
         $this->waitForPageLoadAndCheckForErrors();
@@ -43,7 +43,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('geodir_location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
+        $this->assertTrue($this->isTextPresent("Location saved successfully."), "'Location saved successfully' text not found");
     }
 
     public function tearDown()

tests/selenium/stest-14_Delete_Listing.php

Indentation +29 added lines, -29 removed lines

@@ -1,37 +1,37 @@
 <?php
 class DeleteListing 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 testDeleteListing()
-    {
-        $this->logInfo('Delete Listing......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('geodir-delete')->click();
-        $this->acceptAlert();
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+	public function testDeleteListing()
+	{
+		$this->logInfo('Delete Listing......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('geodir-delete')->click();
+		$this->acceptAlert();
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

tests/selenium/stest-00_Initilaize.php

Indentation +236 added lines, -236 removed lines

@@ -1,67 +1,67 @@ 
 <?php
 class Initialize extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
-
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-
-    }
-
-    public function testInitialize()
-    {
-        // Check plugins available
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+	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......');
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+
+	}
+
+	public function testInitialize()
+	{
+		// Check plugins available
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
 //        echo $this->source();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $stop_script = false;
-
-        $plugins = array(
-            'geodirectory',
-            'geodirectory-advance-search-filters',
-            'geodirectory-affiliatewp-integration',
-            'geodirectory-ajax-duplicate-alert',
-            'geodirectory-buddypress-integration',
-            'geodirectory-claim-manager',
-            'geodirectory-custom-post-types',
-            'geodirectory-events',
-            'gd-booster',
-            'geodirectory-location-manager',
-            'geodirectory-marker-cluster',
-            'geodirectory-payment-manager',
-            'geodirectory-re-captcha',
-            'geodirectory-review-rating-manager',
-            'geodirectory-social-importer',
-            'stripe-payment-geodirectory-add-on',
-            'buddypress',
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$stop_script = false;
+
+		$plugins = array(
+			'geodirectory',
+			'geodirectory-advance-search-filters',
+			'geodirectory-affiliatewp-integration',
+			'geodirectory-ajax-duplicate-alert',
+			'geodirectory-buddypress-integration',
+			'geodirectory-claim-manager',
+			'geodirectory-custom-post-types',
+			'geodirectory-events',
+			'gd-booster',
+			'geodirectory-location-manager',
+			'geodirectory-marker-cluster',
+			'geodirectory-payment-manager',
+			'geodirectory-re-captcha',
+			'geodirectory-review-rating-manager',
+			'geodirectory-social-importer',
+			'stripe-payment-geodirectory-add-on',
+			'buddypress',
 //            'wordpress-database-reset'
-        );
+		);
 
-        foreach ($plugins as $plugin) {
-            if (!$this->isElementExists($plugin)) {
-                $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name.' not installed');
-                $stop_script = true;
-            }
-        }
+		foreach ($plugins as $plugin) {
+			if (!$this->isElementExists($plugin)) {
+				$plugin_name = ucwords(str_replace('-', ' ', $plugin));
+				$this->logError($plugin_name.' not installed');
+				$stop_script = true;
+			}
+		}
 
-        if($stop_script) {
-            $this->logError("Stopping the script. Please fix the errors to continue");
-            return;
-        }
+		if($stop_script) {
+			$this->logError("Stopping the script. Please fix the errors to continue");
+			return;
+		}
 
 
-        //Activate WordPress database reset
-        //$this->maybeActivatePlugin("wordpress-database-reset");
+		//Activate WordPress database reset
+		//$this->maybeActivatePlugin("wordpress-database-reset");
 
-        //reset the db
+		//reset the db
 //        $this->logInfo('Resetting WordPress database......');
 //        $this->url(self::GDTEST_BASE_URL.'wp-admin/tools.php?page=database-reset');
 //        $this->waitForPageLoadAndCheckForErrors();
@@ -75,194 +75,194 @@ 
 //        $this->acceptAlert();
 //        $this->waitForPageLoadAndCheckForErrors();
 
-        // make sure all plugins not active. We will activate it programatically.
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->hideAdminBar();
+		// make sure all plugins not active. We will activate it programatically.
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->hideAdminBar();
 
 //        if(($key = array_search('wordpress-database-reset', $plugins)) !== false) {
 //            unset($plugins[$key]);
 //        }
 
-        foreach ($plugins as $plugin) {
-            if (!is_int(strpos($this->byId($plugin)->attribute('class'), 'inactive'))) {
-                $plugin_name = ucwords(str_replace('-', ' ', $plugin));
-                $this->logError($plugin_name." is active. Please deactivate it. It will be activated programatically.");
-                $stop_script = true;
-            }
-        }
-
-
-        if($stop_script) {
-            $this->logInfo("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        //make sure GDF theme installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/themes.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        if (!$this->isElementExists("GeoDirectory_framework-name")) {
-            $this->logError("GeoDirectory Framework theme not installed");
-            $stop_script = true;
-        }
-
-        if (!$this->isElementExists("gdf_test_child-name")) {
-            $this->logError("GDF child theme not installed");
-            $stop_script = true;
-        }
-
-        if($stop_script) {
-            $this->logError("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        //Activate GDF theme if not active
-        $this->logInfo('Checking GDF theme......');
-        $is_active = $this->byXPath("//div[contains(@class, 'theme') and contains(@class, 'active')]")->attribute('aria-describedby');
-        if (strpos($is_active, 'gdf_test_child-name')) {
-            //GDF already active
-        } else {
-            //Activate GDF
-            $this->logInfo('Activating GDF theme......');
-            $this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
-            $this->waitForPageLoadAndCheckForErrors();
-            $this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
-        }
-
-        //Activate Geodirectory core
-        $this->maybeActivatePlugin("geodirectory", 20000);
-
-        //set default location
-        $this->logInfo('Setting default location......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('city')->value('New York');
-        $this->byId('set_address_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('location_save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //install place dummy data
-        $this->logInfo('Installing place dummy data......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        //$this->byLinkText('Dummy Data')->click();
-        $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        if (strpos($html, 'Yes Delete Please!')) {
-            //delete old place data
-            $this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
-            $this->acceptAlert();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-        $this->select($this->byXPath("//div[@id='sub_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
-        $this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
-        $this->waitForPageLoadAndCheckForErrors(60000);
-
-        //make sure dummy data installed
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
-
-
-        //Activate Geodirectory Events
-        $this->maybeActivatePlugin("geodirectory-events", 20000);
-
-        //install Events dummy data
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        if (strpos($html, 'Yes Delete Please!')) {
-            //delete old data
-            $this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
-            $this->acceptAlert();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-        $this->select($this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
-        $this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
-        $this->waitForPageLoadAndCheckForErrors(60000);
-
-        //make sure Events dummy data installed
-        $this->logInfo('Checking events dummy data installed properly or not......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
-        $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
-
-        //set home page
-        $this->logInfo('Setting home page......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-reading.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//input[@value='page']")->click();
-        $this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
-
-        //Enable registration
-        $this->logInfo('Enabling registration......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-general.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId("users_can_register")->click();
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
-
-        //Permalinks
-        $this->logInfo('Setting permalinks......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/options-permalink.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("(//input[@name='selection'])[5]")->click();
-        $this->byId("submit")->click();
-        $this->waitForPageLoadAndCheckForErrors();
+		foreach ($plugins as $plugin) {
+			if (!is_int(strpos($this->byId($plugin)->attribute('class'), 'inactive'))) {
+				$plugin_name = ucwords(str_replace('-', ' ', $plugin));
+				$this->logError($plugin_name." is active. Please deactivate it. It will be activated programatically.");
+				$stop_script = true;
+			}
+		}
+
+
+		if($stop_script) {
+			$this->logInfo("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		//make sure GDF theme installed
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/themes.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		if (!$this->isElementExists("GeoDirectory_framework-name")) {
+			$this->logError("GeoDirectory Framework theme not installed");
+			$stop_script = true;
+		}
+
+		if (!$this->isElementExists("gdf_test_child-name")) {
+			$this->logError("GDF child theme not installed");
+			$stop_script = true;
+		}
+
+		if($stop_script) {
+			$this->logError("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		//Activate GDF theme if not active
+		$this->logInfo('Checking GDF theme......');
+		$is_active = $this->byXPath("//div[contains(@class, 'theme') and contains(@class, 'active')]")->attribute('aria-describedby');
+		if (strpos($is_active, 'gdf_test_child-name')) {
+			//GDF already active
+		} else {
+			//Activate GDF
+			$this->logInfo('Activating GDF theme......');
+			$this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
+			$this->waitForPageLoadAndCheckForErrors();
+			$this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
+		}
+
+		//Activate Geodirectory core
+		$this->maybeActivatePlugin("geodirectory", 20000);
+
+		//set default location
+		$this->logInfo('Setting default location......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=default_location_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('city')->value('New York');
+		$this->byId('set_address_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('location_save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//install place dummy data
+		$this->logInfo('Installing place dummy data......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		//$this->byLinkText('Dummy Data')->click();
+		$this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
+		if (strpos($html, 'Yes Delete Please!')) {
+			//delete old place data
+			$this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
+			$this->acceptAlert();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+		$this->select($this->byXPath("//div[@id='sub_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
+		$this->byXPath("//div[@id='sub_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
+		$this->waitForPageLoadAndCheckForErrors(60000);
+
+		//make sure dummy data installed
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
+		$this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
+
+
+		//Activate Geodirectory Events
+		$this->maybeActivatePlugin("geodirectory-events", 20000);
+
+		//install Events dummy data
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
+		if (strpos($html, 'Yes Delete Please!')) {
+			//delete old data
+			$this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_delete']")->click();
+			$this->acceptAlert();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+		$this->select($this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//select[@class='selected_sample_data']"))->selectOptionByLabel('10');
+		$this->byXPath("//div[@id='sub_gdevent_dummy_data_settings']//a[@id='geodir_dummy_insert']")->click();
+		$this->waitForPageLoadAndCheckForErrors(60000);
+
+		//make sure Events dummy data installed
+		$this->logInfo('Checking events dummy data installed properly or not......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=general_settings&active_tab=gdevent_dummy_data_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
+		$html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
+		$this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
+
+		//set home page
+		$this->logInfo('Setting home page......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-reading.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//input[@value='page']")->click();
+		$this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+
+		//Enable registration
+		$this->logInfo('Enabling registration......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-general.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId("users_can_register")->click();
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+
+		//Permalinks
+		$this->logInfo('Setting permalinks......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/options-permalink.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("(//input[@name='selection'])[5]")->click();
+		$this->byId("submit")->click();
+		$this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
-
-        //create and assign menu
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
-        $this->logInfo('Creating new menu......');
-        $this->byId('menu-name')->value('Primary');
-        $this->byId('save_menu_header')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
-        $this->logInfo('Setting menu location......');
-        $this->byId('locations-main-nav')->click();
-        $this->byId('save_menu_header')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
-
-        // Assign menu
-        $this->logInfo('Assigning menu......');
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
-        $this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
-        $this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
-        $this->byName('save')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-
-        //Logout
-        $this->maybeAdminLogout();
-    }
-
-    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);
-        }
-    }
+		$this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
+
+		//create and assign menu
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
+		$this->logInfo('Creating new menu......');
+		$this->byId('menu-name')->value('Primary');
+		$this->byId('save_menu_header')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
+		$this->logInfo('Setting menu location......');
+		$this->byId('locations-main-nav')->click();
+		$this->byId('save_menu_header')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
+
+		// Assign menu
+		$this->logInfo('Assigning menu......');
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_navigation_settings');
+		$this->ExecuteScript('jQuery("#geodir_theme_location_nav").show();');
+		$this->select($this->byId('geodir_theme_location_nav'))->selectOptionByLabel('The Main Menu');
+		$this->byName('save')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+
+		//Logout
+		$this->maybeAdminLogout();
+	}
+
+	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 +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
             }
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logError("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -93,7 +93,7 @@ 
         }
 
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -111,7 +111,7 @@ 
             $stop_script = true;
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logError("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -126,7 +126,7 @@ 
             $this->logInfo('Activating GDF theme......');
             $this->byXPath("//div[contains(@aria-describedby, 'gdf_test_child-action') and contains(@aria-describedby, 'gdf_test_child-name')]//div[@class='theme-actions']//a[contains(@class, 'activate')]")->click();
             $this->waitForPageLoadAndCheckForErrors();
-            $this->assertTrue( $this->isTextPresent("New theme activated"), "'New theme activated' text not found");
+            $this->assertTrue($this->isTextPresent("New theme activated"), "'New theme activated' text not found");
         }
 
         //Activate Geodirectory core
@@ -141,7 +141,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byId('location_save')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
+        $this->assertTrue($this->isTextPresent("Your settings have been saved"), "'Your settings have been saved' text not found");
         $this->waitForPageLoadAndCheckForErrors();
 
         //install place dummy data
@@ -166,7 +166,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//dd[@id='dummy_data_settings']/a")->click();
         $html = $this->byId('sub_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
+        $this->assertTrue(is_int(strpos($html, 'Yes Delete Please!')), "Places Demo data not installed correctly");
 
 
         //Activate Geodirectory Events
@@ -193,7 +193,7 @@ 
         $this->waitForPageLoadAndCheckForErrors();
         $this->byXPath("//dd[@id='gdevent_dummy_data_settings']/a")->click();
         $html = $this->byId('sub_gdevent_dummy_data_settings')->attribute('innerHTML');
-        $this->assertTrue( is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
+        $this->assertTrue(is_int(strpos($html, 'Yes Delete Please!')), "Events Demo data not installed correctly");
 
         //set home page
         $this->logInfo('Setting home page......');
@@ -203,7 +203,7 @@ 
         $this->select($this->byId("page_on_front"))->selectOptionByLabel('GD Home page');
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+        $this->assertTrue($this->isTextPresent("Settings saved"), "'Settings saved' text not found");
 
         //Enable registration
         $this->logInfo('Enabling registration......');
@@ -212,7 +212,7 @@ 
         $this->byId("users_can_register")->click();
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Settings saved"), "'Settings saved' text not found");
+        $this->assertTrue($this->isTextPresent("Settings saved"), "'Settings saved' text not found");
 
         //Permalinks
         $this->logInfo('Setting permalinks......');
@@ -222,12 +222,12 @@ 
         $this->byId("submit")->click();
         $this->waitForPageLoadAndCheckForErrors();
 //        echo $this->source();
-        $this->assertTrue( $this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
+        $this->assertTrue($this->isTextPresent("Permalink structure updated"), "'Permalink structure updated' text not found");
 
         //create and assign menu
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
+        $this->assertTrue($this->isTextPresent("Give your menu a name above, then click Create Menu."), "'Create Menu' text not found");
         $this->logInfo('Creating new menu......');
         $this->byId('menu-name')->value('Primary');
         $this->byId('save_menu_header')->click();
@@ -235,12 +235,12 @@ 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/nav-menus.php');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
+        $this->assertTrue($this->isTextPresent("Add menu items from the column on the left"), "'Add menu items from the column on the left' text not found");
         $this->logInfo('Setting menu location......');
         $this->byId('locations-main-nav')->click();
         $this->byId('save_menu_header')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
+        $this->assertTrue($this->isTextPresent("<strong>Primary</strong> has been updated"), "'Primary has been updated' text not found");
 
         // Assign menu
         $this->logInfo('Assigning menu......');

tests/selenium/stest-33_Stripe.php

Indentation +57 added lines, -57 removed lines

@@ -1,79 +1,79 @@
 <?php
 class Stripe 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 testStripe()
-    {
-        $this->logInfo('Testing stripe......');
-        //make sure Stripe payment plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
+	public function testStripe()
+	{
+		$this->logInfo('Testing stripe......');
+		//make sure Stripe payment plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $is_active = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory stripe payment geodirectory add on
-            $this->maybeActivatePlugin("stripe-payment-geodirectory-add-on", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
+		$is_active = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory stripe payment geodirectory add on
+			$this->maybeActivatePlugin("stripe-payment-geodirectory-add-on", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
 
-        $is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
+		$is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
 
 
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
-        $this->waitForPageLoadAndCheckForErrors();
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');
+		$this->waitForPageLoadAndCheckForErrors();
 
-        $this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('geodir-upgrade')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("(//div[@class='geodir_package']/input[@type='radio'])[2]")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        if ($this->isTextPresent("Business Owner/Associate")) {
+		$this->url(self::GDTEST_BASE_URL.'author/admin/?geodir_dashbord=true&stype=gd_place');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('geodir-upgrade')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("(//div[@class='geodir_package']/input[@type='radio'])[2]")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		if ($this->isTextPresent("Business Owner/Associate")) {
 //            $elements = $this->elements($this->using('name')->value('claimed'));
 //            $elements[0]->click();
 //            $this->byXPath("//input[contains(@name,'claimed') and contains(@value,'0')]")->click();
-            $this->ExecuteScript('jQuery("#geodir_claimed_row input:radio:first").prop("checked", true).trigger("click");');
-        }
-        $this->byId('geodir_accept_term_condition')->click();
-        $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byXPath("//input[@name='Submit and Pay']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->ExecuteScript('jQuery("#gd_pmethod_stripe").prop("checked", true).trigger("click");');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd_checkout_paynow')->click();
+			$this->ExecuteScript('jQuery("#geodir_claimed_row input:radio:first").prop("checked", true).trigger("click");');
+		}
+		$this->byId('geodir_accept_term_condition')->click();
+		$this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byXPath("//input[@name='Submit and Pay']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->ExecuteScript('jQuery("#gd_pmethod_stripe").prop("checked", true).trigger("click");');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd_checkout_paynow')->click();
 //        $this->waitForPageLoadAndCheckForErrors();
 //        $this->byId('email')->value('test@test.com');
 //        $this->byId('card_number')->value('4242424242424242');
 //        $this->byId('cc-exp')->value('12 / 20');
 //        $this->byId('cc-csc')->value('333');
 //        $this->byId('submitButton')->click();
-        $this->logInfo('Skipping stripe payment since cross-site scripting not possible......');
-        $this->waitForPageLoadAndCheckForErrors();
-    }
+		$this->logInfo('Skipping stripe payment since cross-site scripting not possible......');
+		$this->waitForPageLoadAndCheckForErrors();
+	}
 
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function tearDown()
+	{
+		if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			//write current file number to completed.txt
+			$CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
+			$completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
+			fwrite($completed, $CurrentFileNumber);
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         }
 
         $is_active1 = $this->byId("stripe-payment-geodirectory-add-on")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "stripe payment geodirectory add on plugin not active");
 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=paymentmanager_fields&subtab=geodir_payment_options');

tests/selenium/stest-02_Login.php

Indentation +34 added lines, -34 removed lines

@@ -1,45 +1,45 @@
 <?php
 class LoginUser 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 testLogin()
-    {
-        $this->logInfo('Logging in new user......');
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
-        $this->byId('user_login')->value('testuser@test.com');
-        $this->byId('user_pass')->value('1');
+	public function testLogin()
+	{
+		$this->logInfo('Logging in new user......');
+		$this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
+		$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->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+		// Submit the form
+		$this->byId('cus_loginform')->submit();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+		$this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing 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 +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
         $this->logInfo('Logging in new user......');
         $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign In"), "No text found");
+        $this->assertTrue($this->isTextPresent("Sign In"), "No text found");
         $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->assertFalse( $this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
-        $this->assertTrue( $this->isTextPresent("Add Listing"), "Add Listing text not found");
+        $this->assertFalse($this->isTextPresent("Invalid Username/Password."), "Invalid Username/Password.");
+        $this->assertTrue($this->isTextPresent("Add Listing"), "Add Listing text not found");
 
     }
 

tests/selenium/stest-31_ReCaptcha.php

Indentation +189 added lines, -189 removed lines

@@ -1,194 +1,194 @@
 <?php
 class ReCaptcha extends GD_Test
 {
-    public function setUp()
-    {
-        parent::setUp();
-
-        //skip test if already completed.
-        if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            $this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
-            return;
-        } else {
-            $this->prepareSession()->currentWindow()->maximize();
-        }
-    }
-
-    public function testReCaptcha()
-    {
-        $this->logInfo('Testing recaptcha......');
-        //make sure ReCaptcha plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("geodirectory-re-captcha")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory ReCaptcha
-            $this->maybeActivatePlugin("geodirectory-re-captcha", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
-
-        //make sure BuddyPress core plugin active
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        $this->waitForPageLoadAndCheckForErrors();
-
-        $is_active = $this->byId("buddypress")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory buddypress
-            $this->maybeActivatePlugin("buddypress", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("buddypress")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
-
-        //make sure BuddyPress Integration plugin active
-        $is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        if (is_int(strpos($is_active, 'inactive'))) {
-            //Activate Geodirectory buddypress integration
-            $this->maybeActivatePlugin("geodirectory-buddypress-integration", 20000);
-            //go back to plugin page
-            $this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
-        }
-
-        $is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
-
-
-        $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->prepareSession()->currentWindow()->maximize();
-
-        $stop_script = false;
-
-        $public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
-        $private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
-
-        if (!$public_key) {
-            $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
-            $stop_script = true;
-        }
-
-        if (!$private_key) {
-            $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
-            $stop_script = true;
-        }
-
-        if($stop_script) {
-            $this->logInfo("Stopping the script. Please fix the errors to continue");
-            return;
-        }
-
-        $value = $this->byId('geodir_recaptcha_site_key')->value();
-        if (empty($value)) {
-            $this->byId('geodir_recaptcha_site_key')->value($public_key);
-        }
-
-        $value = $this->byId('geodir_recaptcha_secret_key')->value();
-        if (empty($value)) {
-            $this->byId('geodir_recaptcha_secret_key')->value($private_key);
-        }
-
-
-        $to_save = false;
-
-        $options = array(
-            'geodir_recaptcha_registration',
-            'geodir_recaptcha_add_listing',
-            'geodir_recaptcha_claim_listing',
-            'geodir_recaptcha_comments',
-            'geodir_recaptcha_send_to_friend',
-            'geodir_recaptcha_send_enquery',
-            'geodir_recaptcha_buddypress'
-        );
-
-        foreach ($options as $option) {
-            $is_checked = $this->byId($option)->attribute('checked');
-            if (!$is_checked) {
-                $this->byId($option)->click();
-                $to_save = true;
-            }
-        }
-
-        if ($to_save) {
-            $this->byName('save')->click();
-            $this->waitForPageLoadAndCheckForErrors();
-        }
-
-        $this->maybeLogout();
-        //Signup
-        $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
-
-        //Add Listing
-        $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        $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(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
-        }
-        $this->assertTrue( $this->isTextPresent("Add Place"), "Not in Add Listing page");
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
-
-        //claim
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byId('gd-claim-button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
-
-        //reviews
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byLinkText('Reviews')->click();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
-
-        //send enquiry
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_send_inquiry')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
-
-        //send to friend
-        $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->byClassName('b_sendtofriend')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
-
-        //buddypress
-        //Todo: assert buddypress page
-
-    }
-
-    public function tearDown()
-    {
-        if (!$this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
-            //write current file number to completed.txt
-            $CurrentFileNumber = $this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME));
-            $completed = fopen("tests/selenium/completed.txt", "w") or die("Unable to open file!");
-            fwrite($completed, $CurrentFileNumber);
-        }
-    }
+	public function setUp()
+	{
+		parent::setUp();
+
+		//skip test if already completed.
+		if ($this->skipTest($this->getCurrentFileNumber(pathinfo(__FILE__, PATHINFO_FILENAME)), $this->getCompletedFileNumber())) {
+			$this->markTestSkipped('Skipping '.pathinfo(__FILE__, PATHINFO_FILENAME).' since its already completed......');
+			return;
+		} else {
+			$this->prepareSession()->currentWindow()->maximize();
+		}
+	}
+
+	public function testReCaptcha()
+	{
+		$this->logInfo('Testing recaptcha......');
+		//make sure ReCaptcha plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("geodirectory-re-captcha")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory ReCaptcha
+			$this->maybeActivatePlugin("geodirectory-re-captcha", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
+
+		//make sure BuddyPress core plugin active
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		$this->waitForPageLoadAndCheckForErrors();
+
+		$is_active = $this->byId("buddypress")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory buddypress
+			$this->maybeActivatePlugin("buddypress", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("buddypress")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
+
+		//make sure BuddyPress Integration plugin active
+		$is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
+		if (is_int(strpos($is_active, 'inactive'))) {
+			//Activate Geodirectory buddypress integration
+			$this->maybeActivatePlugin("geodirectory-buddypress-integration", 20000);
+			//go back to plugin page
+			$this->url(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
+		}
+
+		$is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
+		$this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
+
+
+		$this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->prepareSession()->currentWindow()->maximize();
+
+		$stop_script = false;
+
+		$public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
+		$private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
+
+		if (!$public_key) {
+			$this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
+			$stop_script = true;
+		}
+
+		if (!$private_key) {
+			$this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
+			$stop_script = true;
+		}
+
+		if($stop_script) {
+			$this->logInfo("Stopping the script. Please fix the errors to continue");
+			return;
+		}
+
+		$value = $this->byId('geodir_recaptcha_site_key')->value();
+		if (empty($value)) {
+			$this->byId('geodir_recaptcha_site_key')->value($public_key);
+		}
+
+		$value = $this->byId('geodir_recaptcha_secret_key')->value();
+		if (empty($value)) {
+			$this->byId('geodir_recaptcha_secret_key')->value($private_key);
+		}
+
+
+		$to_save = false;
+
+		$options = array(
+			'geodir_recaptcha_registration',
+			'geodir_recaptcha_add_listing',
+			'geodir_recaptcha_claim_listing',
+			'geodir_recaptcha_comments',
+			'geodir_recaptcha_send_to_friend',
+			'geodir_recaptcha_send_enquery',
+			'geodir_recaptcha_buddypress'
+		);
+
+		foreach ($options as $option) {
+			$is_checked = $this->byId($option)->attribute('checked');
+			if (!$is_checked) {
+				$this->byId($option)->click();
+				$to_save = true;
+			}
+		}
+
+		if ($to_save) {
+			$this->byName('save')->click();
+			$this->waitForPageLoadAndCheckForErrors();
+		}
+
+		$this->maybeLogout();
+		//Signup
+		$this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
+
+		//Add Listing
+		$this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		$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(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
+		}
+		$this->assertTrue( $this->isTextPresent("Add Place"), "Not in Add Listing page");
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
+
+		//claim
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byId('gd-claim-button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
+
+		//reviews
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byLinkText('Reviews')->click();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
+
+		//send enquiry
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_send_inquiry')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
+
+		//send to friend
+		$this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->byClassName('b_sendtofriend')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
+		$this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
+
+		//buddypress
+		//Todo: assert buddypress page
+
+	}
+
+	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 +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-re-captcha")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "ReCaptcha plugin not active");
 
         //make sure BuddyPress core plugin active
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/plugins.php');
@@ -45,7 +45,7 @@ 
         }
 
         $is_active1 = $this->byId("buddypress")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "buddypress plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "buddypress plugin not active");
 
         //make sure BuddyPress Integration plugin active
         $is_active = $this->byId("geodirectory-buddypress-integration")->attribute('class');
@@ -57,7 +57,7 @@ 
         }
 
         $is_active1 = $this->byId("geodirectory-buddypress-integration")->attribute('class');
-        $this->assertFalse( strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
+        $this->assertFalse(strpos($is_active1, 'inactive'), "geodirectory buddypress integration plugin not active");
 
 
         $this->url(self::GDTEST_BASE_URL.'wp-admin/admin.php?page=geodirectory&tab=geodir_recaptcha&subtab=gdcaptcha_settings');
@@ -66,8 +66,8 @@ 
 
         $stop_script = false;
 
-        $public_key  = getenv( 'GOOGLE_RECAPTCHA_KEY' );
-        $private_key  = getenv( 'GOOGLE_RECAPTCHA_SECRET' );
+        $public_key  = getenv('GOOGLE_RECAPTCHA_KEY');
+        $private_key = getenv('GOOGLE_RECAPTCHA_SECRET');
 
         if (!$public_key) {
             $this->logError("ENV variable GOOGLE_RECAPTCHA_KEY not available");
@@ -79,7 +79,7 @@ 
             $stop_script = true;
         }
 
-        if($stop_script) {
+        if ($stop_script) {
             $this->logInfo("Stopping the script. Please fix the errors to continue");
             return;
         }
@@ -124,10 +124,10 @@ 
         //Signup
         $this->url(self::GDTEST_BASE_URL.'gd-login/?signup=1');
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Sign Up Now"), "Not in signup page");
+        $this->assertTrue($this->isTextPresent("Sign Up Now"), "Not in signup page");
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in signup page");
 
         //Add Listing
         $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
@@ -141,9 +141,9 @@ 
             $this->waitForPageLoadAndCheckForErrors();
             $this->url(self::GDTEST_BASE_URL.'add-listing/?listing_type=gd_place');
         }
-        $this->assertTrue( $this->isTextPresent("Add Place"), "Not in Add Listing page");
+        $this->assertTrue($this->isTextPresent("Add Place"), "Not in Add Listing page");
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Add Listing page");
 
         //claim
         $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
@@ -151,14 +151,14 @@ 
         $this->byId('gd-claim-button')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in claim form");
 
         //reviews
         $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
         $this->waitForPageLoadAndCheckForErrors();
         $this->byLinkText('Reviews')->click();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in reviews form");
 
         //send enquiry
         $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
@@ -166,7 +166,7 @@ 
         $this->byClassName('b_send_inquiry')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send Enquiry form");
 
         //send to friend
         $this->url(self::GDTEST_BASE_URL.'places/united-states/new-york/new-york/attractions/franklin-square/');
@@ -174,7 +174,7 @@ 
         $this->byClassName('b_sendtofriend')->click();
         $this->waitForPageLoadAndCheckForErrors();
         $this->frame($this->byXPath("//div[@class='gd-captcha-render']//iframe"));
-        $this->assertTrue( $this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
+        $this->assertTrue($this->isTextPresent("I'm not a robot"), "Recaptcha field not found in Send To Friend form");
 
         //buddypress
         //Todo: assert buddypress page

tests/selenium/stest-04_Edit_Listing.php

Indentation +54 added lines, -54 removed lines

@@ -1,63 +1,63 @@
 <?php
 class EditListing 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 testEditListing()
-    {
-        $this->logInfo('Editing GD Place listing as user......');
-        $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
-        $this->byClassName('geodir-edit')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
-        $this->byId('post_desc')->value('Test Desc modified');
-        $this->byId('geodir_accept_term_condition')->click();
-        // Submit the form
-        $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
-        // Submit the form
-        $this->byClassName('geodir_publish_button')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
-        $this->maybeLogout();
-    }
+	public function testEditListing()
+	{
+		$this->logInfo('Editing GD Place listing as user......');
+		$this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
+		$this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
+		$this->byClassName('geodir-edit')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+		$this->byId('post_desc')->value('Test Desc modified');
+		$this->byId('geodir_accept_term_condition')->click();
+		// Submit the form
+		$this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+		// Submit the form
+		$this->byClassName('geodir_publish_button')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+		$this->maybeLogout();
+	}
 
-    public function testEditAdminListing()
-    {
-        $this->logInfo('Editing GD Place listing as admin......');
-        $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
-        $this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
-        $this->byLinkText("Test Listing")->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
-        $this->byId('title')->value('Test Listing modified');
-        // Submit the form
-        $this->byId('publish')->click();
-        $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Place updated."), "updated text not found.");
-    }
+	public function testEditAdminListing()
+	{
+		$this->logInfo('Editing GD Place listing as admin......');
+		$this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
+		$this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
+		$this->byLinkText("Test Listing")->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+		$this->byId('title')->value('Test Listing modified');
+		// Submit the form
+		$this->byId('publish')->click();
+		$this->waitForPageLoadAndCheckForErrors();
+		$this->assertTrue( $this->isTextPresent("Place updated."), "updated 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 +7 added lines, -7 removed lines

@@ -18,20 +18,20 @@ 
     {
         $this->logInfo('Editing GD Place listing as user......');
         $this->maybeUserLogin(self::GDTEST_BASE_URL.'author/test-user/?geodir_dashbord=true&stype=gd_place', true);
-        $this->assertTrue( $this->isTextPresent("Places by"), "'Places by' text not found");
+        $this->assertTrue($this->isTextPresent("Places by"), "'Places by' text not found");
         $this->byClassName('geodir-edit')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+        $this->assertTrue($this->isTextPresent("Edit Place"), "Edit Place text not found");
         $this->byId('post_desc')->value('Test Desc modified');
         $this->byId('geodir_accept_term_condition')->click();
         // Submit the form
         $this->byXPath("//div[@id='geodir-add-listing-submit']//input[@type='submit']")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
+        $this->assertTrue($this->isTextPresent("This is a preview of your listing"), "Not in preview page.");
         // Submit the form
         $this->byClassName('geodir_publish_button')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
+        $this->assertTrue($this->isTextPresent("Thank you, your information has been successfully received"), "Not in success page");
         $this->maybeLogout();
     }
 
@@ -39,15 +39,15 @@ 
     {
         $this->logInfo('Editing GD Place listing as admin......');
         $this->maybeAdminLogin(self::GDTEST_BASE_URL.'wp-admin/edit.php?post_type=gd_place');
-        $this->assertTrue( $this->isTextPresent("post-type-gd_place"), "Not in Places post type");
+        $this->assertTrue($this->isTextPresent("post-type-gd_place"), "Not in Places post type");
         $this->byLinkText("Test Listing")->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Edit Place"), "Edit Place text not found");
+        $this->assertTrue($this->isTextPresent("Edit Place"), "Edit Place text not found");
         $this->byId('title')->value('Test Listing modified');
         // Submit the form
         $this->byId('publish')->click();
         $this->waitForPageLoadAndCheckForErrors();
-        $this->assertTrue( $this->isTextPresent("Place updated."), "updated text not found.");
+        $this->assertTrue($this->isTextPresent("Place updated."), "updated text not found.");
     }
 
     public function tearDown()

tests/lib/wordpress-tests-lib/includes/install.php

Braces +4 added lines, -3 removed lines

@@ -44,9 +44,10 @@
 	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
 
 	// We need to create references to ms global tables.
-	if ( $multisite )
-		$wpdb->{$table} = $prefixed_table;
-}
+	if ( $multisite ) {
+			$wpdb->{$table} = $prefixed_table;
+	}
+	}
 
 // Prefill a permalink structure so that WP doesn't try to determine one itself.
 add_action( 'populate_options', '_set_default_permalink_structure_for_tests' );

Spacing +27 added lines, -27 removed lines

@@ -4,14 +4,14 @@ 
  *
  * @todo Reuse the init/load code in init.php
  */
-error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
+error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
 
 $config_file_path = $argv[1];
-$multisite = ! empty( $argv[2] );
+$multisite = !empty($argv[2]);
 
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 require_once $config_file_path;
-require_once dirname( __FILE__ ) . '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
@@ -21,53 +21,53 @@ 
 
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH.'/wp-settings.php';
 
-require_once ABSPATH . '/wp-admin/includes/upgrade.php';
-require_once ABSPATH . '/wp-includes/wp-db.php';
+require_once ABSPATH.'/wp-admin/includes/upgrade.php';
+require_once ABSPATH.'/wp-includes/wp-db.php';
 
 // Override the PHPMailer
 global $phpmailer;
-require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+require_once(dirname(__FILE__).'/mock-mailer.php');
 $phpmailer = new MockPHPMailer();
 
-$wpdb->query( 'SET storage_engine = INNODB' );
-$wpdb->select( DB_NAME, $wpdb->dbh );
+$wpdb->query('SET storage_engine = INNODB');
+$wpdb->select(DB_NAME, $wpdb->dbh);
 
-echo "Installing..." . PHP_EOL;
+echo "Installing...".PHP_EOL;
 
-foreach ( $wpdb->tables() as $table => $prefixed_table ) {
-	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+foreach ($wpdb->tables() as $table => $prefixed_table) {
+	$wpdb->query("DROP TABLE IF EXISTS $prefixed_table");
 }
 
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
-	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table) {
+	$wpdb->query("DROP TABLE IF EXISTS $prefixed_table");
 
 	// We need to create references to ms global tables.
-	if ( $multisite )
+	if ($multisite)
 		$wpdb->{$table} = $prefixed_table;
 }
 
 // Prefill a permalink structure so that WP doesn't try to determine one itself.
-add_action( 'populate_options', '_set_default_permalink_structure_for_tests' );
+add_action('populate_options', '_set_default_permalink_structure_for_tests');
 
-wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
+wp_install(WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password');
 
 // Delete dummy permalink structure, as prefilled above.
-if ( ! is_multisite() ) {
-	delete_option( 'permalink_structure' );
+if (!is_multisite()) {
+	delete_option('permalink_structure');
 }
-remove_action( 'populate_options', '_set_default_permalink_structure_for_tests' );
+remove_action('populate_options', '_set_default_permalink_structure_for_tests');
 
-if ( $multisite ) {
-	echo "Installing network..." . PHP_EOL;
+if ($multisite) {
+	echo "Installing network...".PHP_EOL;
 
-	define( 'WP_INSTALLING_NETWORK', true );
+	define('WP_INSTALLING_NETWORK', true);
 
-	$title = WP_TESTS_TITLE . ' Network';
+	$title = WP_TESTS_TITLE.' Network';
 	$subdomain_install = false;
 
 	install_network();
-	populate_network( 1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install );
-	$wp_rewrite->set_permalink_structure( '' );
+	populate_network(1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install);
+	$wp_rewrite->set_permalink_structure('');
 }

geodirectory-admin/option-pages/title_meta_settings_array.php

Indentation +358 added lines, -358 removed lines

@@ -10,7 +10,7 @@ 
 
 $gd_wpseo_use = '';
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+	$gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
 }
 
 /**
@@ -21,363 +21,363 @@ 
  */
 $geodir_settings['title_meta_settings'] = apply_filters('geodir_title_meta_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
-
-
-
-
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
-        'desc' => __('%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%', 'geodirectory'),
-        'type' => 'sectionstart',
-        'id' => 'geodir_meta_vars'),
-
-    array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
-
-    array('name' => __('Homepage Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_home_meta'),
-
-    array(
-        'name' => __('Homepage meta title', 'geodirectory'),
-        'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
-        'id' => 'geodir_meta_title_homepage',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => '',
-        'placeholder' => ''
-    ),
-
-    array(
-        'name' => __('Homepage meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_homepage',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
-
-    // details page meta
-    array('name' => __('Details Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_details_meta'),
-
-    array(
-        'name' => __('Details page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_detail',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Details page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_detail',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%excerpt%%', 'geodirectory'),
-        'placeholder' => '%%excerpt%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
-
-    // CPT page meta
-    array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Post type page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Post type page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_pt',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Post type page title', 'geodirectory'),
-        'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
-
-    // Cat listing page meta
-    array('name' => __('Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
-        'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Category listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_cat-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%category%% %%in_location_single%%'
-    ),
-
-    array(
-        'name' => __('Tag listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_tag-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // location page meta
-    array('name' => __('Location Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Location page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_location',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Location page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_location',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%location%%', 'geodirectory'),
-        'placeholder' => '%%location%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // Search page meta
-    array('name' => __('Search Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Search page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_search',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Search page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_search',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Add listing page meta
-    array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Add listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Add listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_add-listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Add listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Edit listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_edit-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Edit %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Edit %%pt_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Author page meta
-    array('name' => __('Author Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Author page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Author page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_author',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array(
-        'name' => __('Author page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author page.', 'geodirectory'),
-        'id' => 'geodir_page_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% by: %%name%%'
-    ),
-
-    array(
-        'name' => __('Author favorite page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
-        'id' => 'geodir_page_title_favorite',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
-        'placeholder' => '%%name%%: Favorite %%pt_plural%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Login page meta
-    array('name' => __('Login Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Login page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_login',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Login page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_login',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
-
-    //Listing success page meta
-    array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Listing success page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing-success',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing success page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing-success',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+	/* Listing Permalink Settings start */
+	array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
+
+
+
+
+	array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
+		'desc' => __('%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%', 'geodirectory'),
+		'type' => 'sectionstart',
+		'id' => 'geodir_meta_vars'),
+
+	array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
+
+	array('name' => __('Homepage Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_home_meta'),
+
+	array(
+		'name' => __('Homepage meta title', 'geodirectory'),
+		'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
+		'id' => 'geodir_meta_title_homepage',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => '',
+		'placeholder' => ''
+	),
+
+	array(
+		'name' => __('Homepage meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_homepage',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
+
+	// details page meta
+	array('name' => __('Details Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_details_meta'),
+
+	array(
+		'name' => __('Details page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_detail',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Details page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_detail',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%excerpt%%', 'geodirectory'),
+		'placeholder' => '%%excerpt%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
+
+	// CPT page meta
+	array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Post type page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Post type page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_pt',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Post type page title', 'geodirectory'),
+		'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
+
+	// Cat listing page meta
+	array('name' => __('Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
+		'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Category listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_cat-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%category%% %%in_location_single%%'
+	),
+
+	array(
+		'name' => __('Tag listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_tag-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// location page meta
+	array('name' => __('Location Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Location page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_location',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Location page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_location',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%location%%', 'geodirectory'),
+		'placeholder' => '%%location%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// Search page meta
+	array('name' => __('Search Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Search page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_search',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Search page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_search',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Add listing page meta
+	array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Add listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Add listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_add-listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Add listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Edit listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_edit-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Edit %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Edit %%pt_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Author page meta
+	array('name' => __('Author Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Author page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Author page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_author',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array(
+		'name' => __('Author page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author page.', 'geodirectory'),
+		'id' => 'geodir_page_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% by: %%name%%'
+	),
+
+	array(
+		'name' => __('Author favorite page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
+		'id' => 'geodir_page_title_favorite',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
+		'placeholder' => '%%name%%: Favorite %%pt_plural%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Login page meta
+	array('name' => __('Login Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Login page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_login',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Login page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_login',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+
+	//Listing success page meta
+	array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Listing success page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing-success',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing success page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing-success',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 $gd_wpseo_use = '';
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.', 'geodirectory')."</b><br />";
 }
 
 /**