GeoDirectory / geodirectory

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

geodirectory-admin/geodir_admin_ajax.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 *
 	 * @since 1.0.0
 	 */
-	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
+	include_once(geodir_plugin_path().'/geodirectory-admin/option-pages/create_field.php');
     die;
 }
 

Indentation +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@
 	 * @since 1.0.0
 	 */
 	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
-    gd_die();
+	gd_die();
 }
 
 
 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] != '') {
-    switch ($_REQUEST['ajax_action']):
-        case 'get_cat_dl':
-            geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
-            break;
-    endswitch;
+	switch ($_REQUEST['ajax_action']):
+		case 'get_cat_dl':
+			geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
+			break;
+	endswitch;
 }
\ No newline at end of file

geodirectory-widgets/geodirectory_features_widget.php

Spacing +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
         ?>
         <?php if ($title) {
         echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
+        echo $before_title.$title.$after_title;
         echo '</div>';
     } ?>
         <?php
@@ -42,16 +42,16 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+            if (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) {
                 echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+                if ($instance['title'.$i]) {
+                    echo "<h3 class='gd-fe-title'>".$instance['title'.$i]."</h3>";
                 }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+                if ($instance['image'.$i]) {
+                    echo "<div class='gd-fe-image'>".gd_features_parse_image($instance['image'.$i], $icon_color)."</div>";
                 }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+                if ($instance['desc'.$i]) {
+                    echo "<div class='gd-fe-desc'>".gd_features_parse_desc($instance['desc'.$i])."</div>";
                 }
                 echo "</li>";
             } else {
@@ -78,15 +78,15 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
+            if (isset($new_instance['title'.$i]) || isset($new_instance['image'.$i]) || isset($new_instance['desc'.$i])) {
+                if ($new_instance['title'.$i]) {
+                    $instance['title'.$i] = $new_instance['title'.$i];
                 }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
+                if ($new_instance['image'.$i]) {
+                    $instance['image'.$i] = $new_instance['image'.$i];
                 }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
+                if ($new_instance['desc'.$i]) {
+                    $instance['desc'.$i] = $new_instance['desc'.$i];
                 }
             } else {
                 break;
@@ -101,7 +101,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
+        $instance = wp_parse_args((array) $instance, array(
             'title' => '',
             'icon_color' => '#757575',
             'title1' => '',
@@ -138,35 +138,35 @@ 
         </p>
 
 
-        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
+        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>">
             <?php
 
             $i = 1;
             while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+                if ($i == 1 || (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) && ($instance['title'.$i] || $instance['image'.$i] || $instance['desc'.$i])) {
                     ?>
-                    <div class="gdrep<?php echo $i;?>">
+                    <div class="gdrep<?php echo $i; ?>">
                         <p class="features-title">
                             <label
                                 data-gdrep-title-num="1"><?php printf(__('Title %d:', 'geodirectory'), $i); ?></label>
-                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title' . $i); ?>"
-                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title' . $i])); ?>"
+                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title'.$i); ?>"
+                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title'.$i])); ?>"
                                    class="widefat"/>
                         </p>
 
                         <p class="features-image">
                             <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
                             <input data-gdrep-image="1" type="text" class="widefat"
-                                   name="<?php echo $this->get_field_name('image' . $i); ?>"
-                                   value="<?php echo esc_attr(strip_tags($instance['image' . $i])); ?>"/>
+                                   name="<?php echo $this->get_field_name('image'.$i); ?>"
+                                   value="<?php echo esc_attr(strip_tags($instance['image'.$i])); ?>"/>
                         </p>
 
                         <p class="features-desc">
                             <label><?php echo __('Description:', 'geodirectory'); ?></label>
-                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc' . $i); ?>"
+                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc'.$i); ?>"
                                       rows="3"
-                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc' . $i])); ?></textarea>
+                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc'.$i])); ?></textarea>
                         </p>
                     </div>
                 <?php
@@ -179,8 +179,8 @@ 
 
             ?>
             <input class="button button-primary left"
-                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
-                   type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
+                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>','<?php echo $this->get_field_name('xxx'); ?>')"
+                   type="button" value="<?php _e('Add item', 'geodirectory'); ?>"/>
         </div>
 
 
@@ -193,12 +193,12 @@ 
 function gd_features_parse_image($image, $icon_color)
 {
     if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
+        $image = '<img src="'.$image.'" />';
     } elseif (substr($image, 0, 3) === "fa-") {
         if (empty($icon_color)) {
             $icon_color = '#757575';
         }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+        $image = '<i style="color:'.$icon_color.'" class="fa '.$image.'"></i>';
     }
     return $image;
 }

Indentation +128 added lines, -128 removed lines

@@ -3,117 +3,117 @@ 
 class Geodir_Features_Widget extends WP_Widget
 {
 
-    /**
-     * Class constructor.
-     */
-    public function __construct()
-    {
-        $widget_ops = array(
-            'description' => __('Displays "GD Features" widget', 'geodirectory'),
-            'classname' => 'widget_gd_features',
-        );
-        parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
-
-    }
-
-    /**
-     * Display the widget.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance The widget settings, as saved by the user.
-     */
-    public function widget($args, $instance)
-    {
-        extract($args);
-
-        $title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
-        $icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
-
-        echo $before_widget;
-        ?>
+	/**
+	 * Class constructor.
+	 */
+	public function __construct()
+	{
+		$widget_ops = array(
+			'description' => __('Displays "GD Features" widget', 'geodirectory'),
+			'classname' => 'widget_gd_features',
+		);
+		parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
+
+	}
+
+	/**
+	 * Display the widget.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance The widget settings, as saved by the user.
+	 */
+	public function widget($args, $instance)
+	{
+		extract($args);
+
+		$title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
+		$icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
+
+		echo $before_widget;
+		?>
         <?php if ($title) {
-        echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
-        echo '</div>';
-    } ?>
+		echo '<div class="geodir_list_heading clearfix">';
+		echo $before_title . $title . $after_title;
+		echo '</div>';
+	} ?>
         <?php
-        echo "<ul class='gd-features'>";
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
-                echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
-                }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
-                }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
-                }
-                echo "</li>";
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        echo "</ul>";
-        ?>
+		echo "<ul class='gd-features'>";
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+				echo "<li>";
+				if ($instance['title' . $i]) {
+					echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+				}
+				if ($instance['image' . $i]) {
+					echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+				}
+				if ($instance['desc' . $i]) {
+					echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+				}
+				echo "</li>";
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		echo "</ul>";
+		?>
         <?php echo $after_widget; ?>
     <?php
-    }
-
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['icon_color'] = strip_tags($new_instance['icon_color']);
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
-                }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
-                }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
-                }
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        return $instance;
-    }
-
-    public function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
-            'title' => '',
-            'icon_color' => '#757575',
-            'title1' => '',
-            'image1' => '',
-            'desc1' => '',
-        ));
-
-
-        $title = strip_tags($instance['title']);
-        $icon_color = strip_tags($instance['icon_color']);
-
-        ?>
+	}
+
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['icon_color'] = strip_tags($new_instance['icon_color']);
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
+				if ($new_instance['title' . $i]) {
+					$instance['title' . $i] = $new_instance['title' . $i];
+				}
+				if ($new_instance['image' . $i]) {
+					$instance['image' . $i] = $new_instance['image' . $i];
+				}
+				if ($new_instance['desc' . $i]) {
+					$instance['desc' . $i] = $new_instance['desc' . $i];
+				}
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		return $instance;
+	}
+
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance, array(
+			'title' => '',
+			'icon_color' => '#757575',
+			'title1' => '',
+			'image1' => '',
+			'desc1' => '',
+		));
+
+
+		$title = strip_tags($instance['title']);
+		$icon_color = strip_tags($instance['icon_color']);
+
+		?>
         <p>
             <b>Heads Up!</b> If you don't have enough content, You can keep some boxes blank.
         </p>
@@ -141,11 +141,11 @@ 
         <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
             <?php
 
-            $i = 1;
-            while ($i < 100) {
+			$i = 1;
+			while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
-                    ?>
+				if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+					?>
                     <div class="gdrep<?php echo $i;?>">
                         <p class="features-title">
                             <label
@@ -170,14 +170,14 @@ 
                         </p>
                     </div>
                 <?php
-                } else {
-                    break;
-                }
+				} else {
+					break;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            ?>
+			?>
             <input class="button button-primary left"
                    onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
                    type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
@@ -185,25 +185,25 @@ 
 
 
     <?php
-    }
+	}
 
 }
 
 register_widget("Geodir_Features_Widget");
 function gd_features_parse_image($image, $icon_color)
 {
-    if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
-    } elseif (substr($image, 0, 3) === "fa-") {
-        if (empty($icon_color)) {
-            $icon_color = '#757575';
-        }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
-    }
-    return $image;
+	if (substr($image, 0, 4) === "http") {
+		$image = '<img src="' . $image . '" />';
+	} elseif (substr($image, 0, 3) === "fa-") {
+		if (empty($icon_color)) {
+			$icon_color = '#757575';
+		}
+		$image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+	}
+	return $image;
 }
 
 function gd_features_parse_desc($desc)
 {
-    return $desc;
+	return $desc;
 }

tests/lib/wordpress-tests-lib/includes/mock-mailer.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
+require_once(ABSPATH.'/wp-includes/class-phpmailer.php');
 
 class MockPHPMailer extends PHPMailer {
 	var $mock_sent = array();

tests/lib/wordpress-tests-lib/includes/testcase-xmlrpc.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
+include_once(ABSPATH.'wp-admin/includes/admin.php');
+include_once(ABSPATH.WPINC.'/class-IXR.php');
+include_once(ABSPATH.WPINC.'/class-wp-xmlrpc-server.php');
 
 class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
 	protected $myxmlrpcserver;
@@ -9,21 +9,21 @@ 
 	function setUp() {
 		parent::setUp();
 
-		add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		add_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->myxmlrpcserver = new wp_xmlrpc_server();
 	}
 
 	function tearDown() {
-		remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		remove_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->remove_added_uploads();
 
 		parent::tearDown();
 	}
 
-	protected function make_user_by_role( $role ) {
-		return self::factory()->user->create( array(
+	protected function make_user_by_role($role) {
+		return self::factory()->user->create(array(
 			'user_login' => $role,
 			'user_pass'  => $role,
 			'role'       => $role

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

Spacing +22 added lines, -22 removed lines

@@ -13,46 +13,46 @@
 	 *
 	 * @return bool|null true if the ticket is resolved, false if not resolved, null on error
 	 */
-	public static function isTracTicketClosed( $trac_url, $ticket_id ) {
-		if ( ! extension_loaded( 'openssl' ) ) {
-			$trac_url = preg_replace( "/^https:/", "http:", $trac_url );
+	public static function isTracTicketClosed($trac_url, $ticket_id) {
+		if (!extension_loaded('openssl')) {
+			$trac_url = preg_replace("/^https:/", "http:", $trac_url);
 		}
 
-		if ( ! isset( self::$trac_ticket_cache[ $trac_url ] ) ) {
+		if (!isset(self::$trac_ticket_cache[$trac_url])) {
 			// In case you're running the tests offline, keep track of open tickets.
-			$file = DIR_TESTDATA . '/.trac-ticket-cache.' . str_replace( array( 'http://', 'https://', '/' ), array( '', '', '-' ), rtrim( $trac_url, '/' ) );
-			$tickets = @file_get_contents( $trac_url . '/query?status=%21closed&format=csv&col=id' );
+			$file = DIR_TESTDATA.'/.trac-ticket-cache.'.str_replace(array('http://', 'https://', '/'), array('', '', '-'), rtrim($trac_url, '/'));
+			$tickets = @file_get_contents($trac_url.'/query?status=%21closed&format=csv&col=id');
 			// Check if our HTTP request failed.
-			if ( false === $tickets ) {
-				if ( file_exists( $file ) ) {
-					register_shutdown_function( array( 'TracTickets', 'usingLocalCache' ) );
-					$tickets = file_get_contents( $file );
+			if (false === $tickets) {
+				if (file_exists($file)) {
+					register_shutdown_function(array('TracTickets', 'usingLocalCache'));
+					$tickets = file_get_contents($file);
 				} else {
-					register_shutdown_function( array( 'TracTickets', 'forcingKnownBugs' ) );
-					self::$trac_ticket_cache[ $trac_url ] = array();
+					register_shutdown_function(array('TracTickets', 'forcingKnownBugs'));
+					self::$trac_ticket_cache[$trac_url] = array();
 					return true; // Assume the ticket is closed, which means it gets run.
 				}
 			} else {
-				$tickets = substr( $tickets, 2 ); // remove 'id' column header
-				$tickets = trim( $tickets );
-				file_put_contents( $file, $tickets );
+				$tickets = substr($tickets, 2); // remove 'id' column header
+				$tickets = trim($tickets);
+				file_put_contents($file, $tickets);
 			}
-			$tickets = explode( "\r\n", $tickets );
-			self::$trac_ticket_cache[ $trac_url ] = $tickets;
+			$tickets = explode("\r\n", $tickets);
+			self::$trac_ticket_cache[$trac_url] = $tickets;
 		}
 
-		return ! in_array( $ticket_id, self::$trac_ticket_cache[ $trac_url ] );
+		return !in_array($ticket_id, self::$trac_ticket_cache[$trac_url]);
 	}
 
 	public static function usingLocalCache() {
-		echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
-		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[30;43m\x1b[2K";
+		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.'.PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 
 	public static function forcingKnownBugs() {
-		echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K";
-		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[37;41m\x1b[2K";
+		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped.".PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 }

geodirectory-templates/reg_frm.php

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
         <?php

         global $geodir_signup_error;

         if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+            echo '<p class="error_msg">'.$geodir_signup_error.'</p>';

             unset($geodir_signup_error);

         } else {

             if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+                echo '<p class="error_msg">'.EMAIL_USERNAME_EXIST_MSG.'</p>';

             } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+                echo '<p class="error_msg">'.REGISTRATION_DESABLED_MSG.'</p>';

             }

         }

         ?>

Indentation +39 added lines, -39 removed lines

@@ -9,13 +9,13 @@ 
  * @package GeoDirectory

  */

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 }

 ?>

 <div id="sign_up">

@@ -26,28 +26,28 @@ 
         <h4>

             <?php

 

-            /**

-             * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

+			/**

+			 * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

 

-            ?>

+			?>

         </h4>

         <?php

-        global $geodir_signup_error;

-        if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

-            unset($geodir_signup_error);

-        } else {

-            if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

-            } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

-            }

-        }

-        ?>

+		global $geodir_signup_error;

+		if ($geodir_signup_error != '') {

+			echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+			unset($geodir_signup_error);

+		} else {

+			if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

+				echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+			} else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

+				echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+			}

+		}

+		?>

 

         <form name="cus_registerform" id="cus_registerform" method="post">

             <input type="hidden" name="action" value="register"/>

@@ -57,8 +57,8 @@ 
                 <div class="form_row clearfix">

                     <input placeholder='<?php echo FIRST_NAME_TEXT; ?>' type="text" name="user_fname" id="user_fname"

                            class="textfield" value="<?php if (isset($user_fname)) {

-                        echo esc_attr(stripslashes($user_fname));

-                    } ?>" size="25"/>

+						echo esc_attr(stripslashes($user_fname));

+					} ?>" size="25"/>

                     <span id="user_fnameInfo"></span>

                 </div>

             </div>

@@ -66,10 +66,10 @@ 
             <div class="form_row clearfix">

                 <input placeholder='<?php echo EMAIL_TEXT; ?>' type="text" name="user_email" id="user_email"

                        class="textfield" value="<?php global $user_email;

-                if (!isset($user_email)) {

-                    $user_email = '';

-                }

-                echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

+				if (!isset($user_email)) {

+					$user_email = '';

+				}

+				echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

 

                 <?php if (!get_option('geodir_allow_cpass')) { ?>

 				<div id="reg_passmail">

@@ -100,14 +100,14 @@ 
             <?php } ?>

 

             <?php

-            /**

-             * Called just before the register new user button on the register form template.

-             *

-             * Also used by other plugins to add social connect buttons.

-             *

-             * @since 1.0.0

-             */

-            do_action('social_connect_form'); ?>

+			/**

+			 * Called just before the register new user button on the register form template.

+			 *

+			 * Also used by other plugins to add social connect buttons.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('social_connect_form'); ?>

             <input type="submit" name="registernow" value="<?php echo REGISTER_NOW_TEXT; ?>" class="geodir_button"/>

         </form>

     </div>