GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/Google/IO/Abstract.php

Indentation +165 added lines, -165 removed lines

@@ -28,19 +28,19 @@ 
   const UNKNOWN_CODE = 0;
   const FORM_URLENCODED = 'application/x-www-form-urlencoded';
   private static $CONNECTION_ESTABLISHED_HEADERS = array(
-    "HTTP/1.0 200 Connection established\r\n\r\n",
-    "HTTP/1.1 200 Connection established\r\n\r\n",
+	"HTTP/1.0 200 Connection established\r\n\r\n",
+	"HTTP/1.1 200 Connection established\r\n\r\n",
   );
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
   private static $HOP_BY_HOP = array(
-    'connection' => true,
-    'keep-alive' => true,
-    'proxy-authenticate' => true,
-    'proxy-authorization' => true,
-    'te' => true,
-    'trailers' => true,
-    'transfer-encoding' => true,
-    'upgrade' => true
+	'connection' => true,
+	'keep-alive' => true,
+	'proxy-authenticate' => true,
+	'proxy-authorization' => true,
+	'te' => true,
+	'trailers' => true,
+	'transfer-encoding' => true,
+	'upgrade' => true
   );
 
 
@@ -49,11 +49,11 @@ 
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
-    $timeout = $client->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds');
-    if ($timeout > 0) {
-      $this->setTimeout($timeout);
-    }
+	$this->client = $client;
+	$timeout = $client->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds');
+	if ($timeout > 0) {
+	  $this->setTimeout($timeout);
+	}
   }
 
   /**
@@ -102,13 +102,13 @@ 
    */
   public function setCachedRequest(Google_Http_Request $request)
   {
-    // Determine if the request is cacheable.
-    if (Google_Http_CacheParser::isResponseCacheable($request)) {
-      $this->client->getCache()->set($request->getCacheKey(), $request);
-      return true;
-    }
+	// Determine if the request is cacheable.
+	if (Google_Http_CacheParser::isResponseCacheable($request)) {
+	  $this->client->getCache()->set($request->getCacheKey(), $request);
+	  return true;
+	}
 
-    return false;
+	return false;
   }
 
   /**
@@ -121,37 +121,37 @@ 
    */
   public function makeRequest(Google_Http_Request $request)
   {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false && $cached instanceof Google_Http_Request) {
-      if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
-        return $cached;
-      }
-    }
-
-    if (array_key_exists($request->getRequestMethod(), self::$ENTITY_HTTP_METHODS)) {
-      $request = $this->processEntityRequest($request);
-    }
-
-    list($responseData, $responseHeaders, $respHttpCode) = $this->executeRequest($request);
-
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      $this->updateCachedRequest($cached, $responseHeaders);
-      return $cached;
-    }
-
-    if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
-      $responseHeaders['date'] = date("r");
-    }
-
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($responseData);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    return $request;
+	// First, check to see if we have a valid cached version.
+	$cached = $this->getCachedRequest($request);
+	if ($cached !== false && $cached instanceof Google_Http_Request) {
+	  if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
+		return $cached;
+	  }
+	}
+
+	if (array_key_exists($request->getRequestMethod(), self::$ENTITY_HTTP_METHODS)) {
+	  $request = $this->processEntityRequest($request);
+	}
+
+	list($responseData, $responseHeaders, $respHttpCode) = $this->executeRequest($request);
+
+	if ($respHttpCode == 304 && $cached) {
+	  // If the server responded NOT_MODIFIED, return the cached request.
+	  $this->updateCachedRequest($cached, $responseHeaders);
+	  return $cached;
+	}
+
+	if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
+	  $responseHeaders['date'] = date("r");
+	}
+
+	$request->setResponseHttpCode($respHttpCode);
+	$request->setResponseHeaders($responseHeaders);
+	$request->setResponseBody($responseData);
+	// Store the request in cache (the function checks to see if the request
+	// can actually be cached)
+	$this->setCachedRequest($request);
+	return $request;
   }
 
   /**
@@ -162,11 +162,11 @@ 
    */
   public function getCachedRequest(Google_Http_Request $request)
   {
-    if (false === Google_Http_CacheParser::isRequestCacheable($request)) {
-      return false;
-    }
+	if (false === Google_Http_CacheParser::isRequestCacheable($request)) {
+	  return false;
+	}
 
-    return $this->client->getCache()->get($request->getCacheKey());
+	return $this->client->getCache()->get($request->getCacheKey());
   }
 
   /**
@@ -177,28 +177,28 @@ 
    */
   public function processEntityRequest(Google_Http_Request $request)
   {
-    $postBody = $request->getPostBody();
-    $contentType = $request->getRequestHeader("content-type");
-
-    // Set the default content-type as application/x-www-form-urlencoded.
-    if (false == $contentType) {
-      $contentType = self::FORM_URLENCODED;
-      $request->setRequestHeaders(array('content-type' => $contentType));
-    }
-
-    // Force the payload to match the content-type asserted in the header.
-    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
-      $postBody = http_build_query($postBody, '', '&');
-      $request->setPostBody($postBody);
-    }
-
-    // Make sure the content-length header is set.
-    if (!$postBody || is_string($postBody)) {
-      $postsLength = strlen($postBody);
-      $request->setRequestHeaders(array('content-length' => $postsLength));
-    }
-
-    return $request;
+	$postBody = $request->getPostBody();
+	$contentType = $request->getRequestHeader("content-type");
+
+	// Set the default content-type as application/x-www-form-urlencoded.
+	if (false == $contentType) {
+	  $contentType = self::FORM_URLENCODED;
+	  $request->setRequestHeaders(array('content-type' => $contentType));
+	}
+
+	// Force the payload to match the content-type asserted in the header.
+	if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
+	  $postBody = http_build_query($postBody, '', '&');
+	  $request->setPostBody($postBody);
+	}
+
+	// Make sure the content-length header is set.
+	if (!$postBody || is_string($postBody)) {
+	  $postsLength = strlen($postBody);
+	  $request->setRequestHeaders(array('content-length' => $postsLength));
+	}
+
+	return $request;
   }
 
   /**
@@ -211,21 +211,21 @@ 
    */
   protected function checkMustRevalidateCachedRequest($cached, $request)
   {
-    if (Google_Http_CacheParser::mustRevalidate($cached)) {
-      $addHeaders = array();
-      if ($cached->getResponseHeader('etag')) {
-        // [13.3.4] If an entity tag has been provided by the origin server,
-        // we must use that entity tag in any cache-conditional request.
-        $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
-      } elseif ($cached->getResponseHeader('date')) {
-        $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
-      }
-
-      $request->setRequestHeaders($addHeaders);
-      return true;
-    } else {
-      return false;
-    }
+	if (Google_Http_CacheParser::mustRevalidate($cached)) {
+	  $addHeaders = array();
+	  if ($cached->getResponseHeader('etag')) {
+		// [13.3.4] If an entity tag has been provided by the origin server,
+		// we must use that entity tag in any cache-conditional request.
+		$addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
+	  } elseif ($cached->getResponseHeader('date')) {
+		$addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
+	  }
+
+	  $request->setRequestHeaders($addHeaders);
+	  return true;
+	} else {
+	  return false;
+	}
   }
 
   /**
@@ -235,19 +235,19 @@ 
    */
   protected function updateCachedRequest($cached, $responseHeaders)
   {
-    $hopByHop = self::$HOP_BY_HOP;
-    if (!empty($responseHeaders['connection'])) {
-      $connectionHeaders = array_map(
-          'strtolower',
-          array_filter(
-              array_map('trim', explode(',', $responseHeaders['connection']))
-          )
-      );
-      $hopByHop += array_fill_keys($connectionHeaders, true);
-    }
-
-    $endToEnd = array_diff_key($responseHeaders, $hopByHop);
-    $cached->setResponseHeaders($endToEnd);
+	$hopByHop = self::$HOP_BY_HOP;
+	if (!empty($responseHeaders['connection'])) {
+	  $connectionHeaders = array_map(
+		  'strtolower',
+		  array_filter(
+			  array_map('trim', explode(',', $responseHeaders['connection']))
+		  )
+	  );
+	  $hopByHop += array_fill_keys($connectionHeaders, true);
+	}
+
+	$endToEnd = array_diff_key($responseHeaders, $hopByHop);
+	$cached->setResponseHeaders($endToEnd);
   }
 
   /**
@@ -259,33 +259,33 @@ 
    */
   public function parseHttpResponse($respData, $headerSize)
   {
-    // check proxy header
-    foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
-      if (stripos($respData, $established_header) !== false) {
-        // existed, remove it
-        $respData = str_ireplace($established_header, '', $respData);
-        // Subtract the proxy header size unless the cURL bug prior to 7.30.0
-        // is present which prevented the proxy header size from being taken into
-        // account.
-        if (!$this->needsQuirk()) {
-          $headerSize -= strlen($established_header);
-        }
-        break;
-      }
-    }
-
-    if ($headerSize) {
-      $responseBody = substr($respData, $headerSize);
-      $responseHeaders = substr($respData, 0, $headerSize);
-    } else {
-      $responseSegments = explode("\r\n\r\n", $respData, 2);
-      $responseHeaders = $responseSegments[0];
-      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
-                                                    null;
-    }
-
-    $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
-    return array($responseHeaders, $responseBody);
+	// check proxy header
+	foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
+	  if (stripos($respData, $established_header) !== false) {
+		// existed, remove it
+		$respData = str_ireplace($established_header, '', $respData);
+		// Subtract the proxy header size unless the cURL bug prior to 7.30.0
+		// is present which prevented the proxy header size from being taken into
+		// account.
+		if (!$this->needsQuirk()) {
+		  $headerSize -= strlen($established_header);
+		}
+		break;
+	  }
+	}
+
+	if ($headerSize) {
+	  $responseBody = substr($respData, $headerSize);
+	  $responseHeaders = substr($respData, 0, $headerSize);
+	} else {
+	  $responseSegments = explode("\r\n\r\n", $respData, 2);
+	  $responseHeaders = $responseSegments[0];
+	  $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
+													null;
+	}
+
+	$responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
+	return array($responseHeaders, $responseBody);
   }
 
   /**
@@ -295,45 +295,45 @@ 
    */
   public function getHttpResponseHeaders($rawHeaders)
   {
-    if (is_array($rawHeaders)) {
-      return $this->parseArrayHeaders($rawHeaders);
-    } else {
-      return $this->parseStringHeaders($rawHeaders);
-    }
+	if (is_array($rawHeaders)) {
+	  return $this->parseArrayHeaders($rawHeaders);
+	} else {
+	  return $this->parseStringHeaders($rawHeaders);
+	}
   }
 
   private function parseStringHeaders($rawHeaders)
   {
-    $headers = array();
-    $responseHeaderLines = explode("\r\n", $rawHeaders);
-    foreach ($responseHeaderLines as $headerLine) {
-      if ($headerLine && strpos($headerLine, ':') !== false) {
-        list($header, $value) = explode(': ', $headerLine, 2);
-        $header = strtolower($header);
-        if (isset($headers[$header])) {
-          $headers[$header] .= "\n" . $value;
-        } else {
-          $headers[$header] = $value;
-        }
-      }
-    }
-    return $headers;
+	$headers = array();
+	$responseHeaderLines = explode("\r\n", $rawHeaders);
+	foreach ($responseHeaderLines as $headerLine) {
+	  if ($headerLine && strpos($headerLine, ':') !== false) {
+		list($header, $value) = explode(': ', $headerLine, 2);
+		$header = strtolower($header);
+		if (isset($headers[$header])) {
+		  $headers[$header] .= "\n" . $value;
+		} else {
+		  $headers[$header] = $value;
+		}
+	  }
+	}
+	return $headers;
   }
 
   private function parseArrayHeaders($rawHeaders)
   {
-    $header_count = count($rawHeaders);
-    $headers = array();
-
-    for ($i = 0; $i < $header_count; $i++) {
-      $header = $rawHeaders[$i];
-      // Times will have colons in - so we just want the first match.
-      $header_parts = explode(': ', $header, 2);
-      if (count($header_parts) == 2) {
-        $headers[strtolower($header_parts[0])] = $header_parts[1];
-      }
-    }
-
-    return $headers;
+	$header_count = count($rawHeaders);
+	$headers = array();
+
+	for ($i = 0; $i < $header_count; $i++) {
+	  $header = $rawHeaders[$i];
+	  // Times will have colons in - so we just want the first match.
+	  $header_parts = explode(': ', $header, 2);
+	  if (count($header_parts) == 2) {
+		$headers[strtolower($header_parts[0])] = $header_parts[1];
+	  }
+	}
+
+	return $headers;
   }
 }

Spacing +3 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 abstract class Google_IO_Abstract
@@ -280,8 +280,7 @@ 
     } else {
       $responseSegments = explode("\r\n\r\n", $respData, 2);
       $responseHeaders = $responseSegments[0];
-      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
-                                                    null;
+      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] : null;
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
@@ -311,7 +310,7 @@ 
         list($header, $value) = explode(': ', $headerLine, 2);
         $header = strtolower($header);
         if (isset($headers[$header])) {
-          $headers[$header] .= "\n" . $value;
+          $headers[$header] .= "\n".$value;
         } else {
           $headers[$header] = $value;
         }

geodirectory-admin/class.analytics.stats.php

Indentation +104 added lines, -104 removed lines

@@ -30,135 +30,135 @@ 
 			// Include the Google Service API
 			include_once('google-api-php-client/src/Google/autoload.php');
 
-            $this->client = new Google_Client();
-            $this->client->setApprovalPrompt("force");
-            $this->client->setAccessType('offline');
-            $this->client->setClientId(GEODIR_GA_CLIENTID);
-            $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
-            $this->client->setRedirectUri(GEODIR_GA_REDIRECT);
+			$this->client = new Google_Client();
+			$this->client->setApprovalPrompt("force");
+			$this->client->setAccessType('offline');
+			$this->client->setClientId(GEODIR_GA_CLIENTID);
+			$this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
+			$this->client->setRedirectUri(GEODIR_GA_REDIRECT);
 			
-            $this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
-
-            try {
-                    $this->analytics = new Google_Service_Analytics($this->client);
-                }
-            catch (Google_ServiceException $e)
-                {
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
+			$this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
+
+			try {
+					$this->analytics = new Google_Service_Analytics($this->client);
+				}
+			catch (Google_ServiceException $e)
+				{
+					print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
 					return false;
-                }
+				}
 	}
 
 	function checkLogin()
 	{
-            $ga_google_authtoken = get_option('geodir_ga_auth_token');
+			$ga_google_authtoken = get_option('geodir_ga_auth_token');
 
-            if (!empty($ga_google_authtoken))
-            {
+			if (!empty($ga_google_authtoken))
+			{
 				try
-                {
-                    $this->client->setAccessToken($ga_google_authtoken);
+				{
+					$this->client->setAccessToken($ga_google_authtoken);
 				}
 				catch( Google_AuthException $e )
-                {
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
+				{
+					print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
                             or an SSL issue preventing Google from Authenticating. <br><br>
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
 
-                    return false;
-                }
-            }
-            else
-            {
-                $authCode = get_option('geodir_ga_auth_code');
-
-                if (empty($authCode)) return false;
-
-                try
-                {
-                    $accessToken = $this->client->authenticate($authCode);
-                }
-                catch( Exception $e )
-                {
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
+					return false;
+				}
+			}
+			else
+			{
+				$authCode = get_option('geodir_ga_auth_code');
+
+				if (empty($authCode)) return false;
+
+				try
+				{
+					$accessToken = $this->client->authenticate($authCode);
+				}
+				catch( Exception $e )
+				{
+					print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
                             or an SSL issue preventing Google from Authenticating. <br><br>
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
 
-                    return false;
-                }
-
-                if($accessToken)
-                {
-                    $this->client->setAccessToken($accessToken);
-                    update_option('geodir_ga_auth_token', $accessToken);
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            $this->token =  $this->client->getAccessToken();
-            return true;
+					return false;
+				}
+
+				if($accessToken)
+				{
+					$this->client->setAccessToken($accessToken);
+					update_option('geodir_ga_auth_token', $accessToken);
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			$this->token =  $this->client->getAccessToken();
+			return true;
 	}
 
 	function deauthorize()
 	{
-            update_option('geodir_ga_auth_code', '');
-            update_option('geodir_ga_auth_token', '');
+			update_option('geodir_ga_auth_code', '');
+			update_option('geodir_ga_auth_token', '');
 	}
 
 	function getSingleProfile()
 	{
-            $webproperty_id = get_option('geodir_ga_account_id');
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
-
-            if (empty($webproperty_id)) return false;
-
-            try {
-                $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
-            }
-            catch (Google_ServiceException $e)
-            {
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
-                return false;
-            }
-
-            $profile_id = $profiles->items[0]->id;
-            if (empty($profile_id)) return false;
-
-            $account_array = array();
-            array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
-            return $account_array;
+			$webproperty_id = get_option('geodir_ga_account_id');
+			list($pre, $account_id, $post) = explode('-',$webproperty_id);
+
+			if (empty($webproperty_id)) return false;
+
+			try {
+				$profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
+			}
+			catch (Google_ServiceException $e)
+			{
+				print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
+				return false;
+			}
+
+			$profile_id = $profiles->items[0]->id;
+			if (empty($profile_id)) return false;
+
+			$account_array = array();
+			array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
+			return $account_array;
 	}
 
-        function getAllProfiles()
-        {
-            $profile_array = array();
+		function getAllProfiles()
+		{
+			$profile_array = array();
             
-            try {
-                    $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
-                }
-                catch (Google_ServiceException $e)
-                {
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
-                }
-
-
-            if( !empty( $profiles->items ) )
-            {
-                foreach( $profiles->items as $profile )
-                {
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
-                }
-            }
-
-            return $profile_array;
-        }
+			try {
+					$profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
+				}
+				catch (Google_ServiceException $e)
+				{
+					print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
+				}
+
+
+			if( !empty( $profiles->items ) )
+			{
+				foreach( $profiles->items as $profile )
+				{
+					$profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
+				}
+			}
+
+			return $profile_array;
+		}
 
 	function getAnalyticsAccounts()
 	{
@@ -241,13 +241,13 @@ 
 			$params['max-results'] = $limit;
 		}
            
-           // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
+		   // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
+		   $filtered_id = str_replace( 'ga:', '', $this->accountId );
            
-           if(!$filtered_id){
-                echo 'Error - Account ID is blank';
-                return false;
-           }
+		   if(!$filtered_id){
+				echo 'Error - Account ID is blank';
+				return false;
+		   }
 
 		if($realtime){
 			return $analytics->data_realtime->get(

Spacing +18 added lines, -18 removed lines

@@ -44,7 +44,7 @@ 
                 }
             catch (Google_ServiceException $e)
                 {
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
+                    print '(cas:48) There was an Analytics API service error '.$e->getCode().':'.$e->getMessage();
 					return false;
                 }
 	}
@@ -59,13 +59,13 @@ 
                 {
                     $this->client->setAccessToken($ga_google_authtoken);
 				}
-				catch( Google_AuthException $e )
+				catch (Google_AuthException $e)
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
                             or an SSL issue preventing Google from Authenticating. <br><br>
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
 
                     return false;
                 }
@@ -80,18 +80,18 @@ 
                 {
                     $accessToken = $this->client->authenticate($authCode);
                 }
-                catch( Exception $e )
+                catch (Exception $e)
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
                             or an SSL issue preventing Google from Authenticating. <br><br>
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
 
                     return false;
                 }
 
-                if($accessToken)
+                if ($accessToken)
                 {
                     $this->client->setAccessToken($accessToken);
                     update_option('geodir_ga_auth_token', $accessToken);
@@ -102,7 +102,7 @@ 
                 }
             }
 
-            $this->token =  $this->client->getAccessToken();
+            $this->token = $this->client->getAccessToken();
             return true;
 	}
 
@@ -115,7 +115,7 @@ 
 	function getSingleProfile()
 	{
             $webproperty_id = get_option('geodir_ga_account_id');
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
+            list($pre, $account_id, $post) = explode('-', $webproperty_id);
 
             if (empty($webproperty_id)) return false;
 
@@ -124,7 +124,7 @@ 
             }
             catch (Google_ServiceException $e)
             {
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
+                print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
                 return false;
             }
 
@@ -145,15 +145,15 @@ 
                 }
                 catch (Google_ServiceException $e)
                 {
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
+                    print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
                 }
 
 
-            if( !empty( $profiles->items ) )
+            if (!empty($profiles->items))
             {
-                foreach( $profiles->items as $profile )
+                foreach ($profiles->items as $profile)
                 {
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
+                    $profile_array[$profile->id] = str_replace('http://', '', $profile->name);
                 }
             }
 
@@ -242,20 +242,20 @@ 
 		}
            
            // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
+           $filtered_id = str_replace('ga:', '', $this->accountId);
            
-           if(!$filtered_id){
+           if (!$filtered_id) {
                 echo 'Error - Account ID is blank';
                 return false;
            }
 
-		if($realtime){
+		if ($realtime) {
 			return $analytics->data_realtime->get(
 				'ga:'.$filtered_id,
 				$metric,
 				$params
 			);
-		}else{
+		} else {
 			return $analytics->data_ga->get(
 				'ga:'.$filtered_id,
 				$startDate,
@@ -279,7 +279,7 @@ 
 	 **/
 	function verifyStartDate($date)
 	{
-		if ( strtotime($date) > strtotime('2005-01-01') )
+		if (strtotime($date) > strtotime('2005-01-01'))
 			return $date;
 		else
 			return '2005-01-01';

Braces +22 added lines, -22 removed lines

@@ -41,8 +41,7 @@ 
 
             try {
                     $this->analytics = new Google_Service_Analytics($this->client);
-                }
-            catch (Google_ServiceException $e)
+                } catch (Google_ServiceException $e)
                 {
                     print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
 					return false;
@@ -58,8 +57,7 @@ 
 				try
                 {
                     $this->client->setAccessToken($ga_google_authtoken);
-				}
-				catch( Google_AuthException $e )
+				} catch( Google_AuthException $e )
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -69,18 +67,18 @@ 
 
                     return false;
                 }
-            }
-            else
+            } else
             {
                 $authCode = get_option('geodir_ga_auth_code');
 
-                if (empty($authCode)) return false;
+                if (empty($authCode)) {
+                	return false;
+                }
 
                 try
                 {
                     $accessToken = $this->client->authenticate($authCode);
-                }
-                catch( Exception $e )
+                } catch( Exception $e )
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -95,8 +93,7 @@ 
                 {
                     $this->client->setAccessToken($accessToken);
                     update_option('geodir_ga_auth_token', $accessToken);
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -117,19 +114,22 @@ 
             $webproperty_id = get_option('geodir_ga_account_id');
             list($pre, $account_id, $post) = explode('-',$webproperty_id);
 
-            if (empty($webproperty_id)) return false;
+            if (empty($webproperty_id)) {
+            	return false;
+            }
 
             try {
                 $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
-            }
-            catch (Google_ServiceException $e)
+            } catch (Google_ServiceException $e)
             {
                 print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
                 return false;
             }
 
             $profile_id = $profiles->items[0]->id;
-            if (empty($profile_id)) return false;
+            if (empty($profile_id)) {
+            	return false;
+            }
 
             $account_array = array();
             array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
@@ -142,8 +142,7 @@ 
             
             try {
                     $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
-                }
-                catch (Google_ServiceException $e)
+                } catch (Google_ServiceException $e)
                 {
                     print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
                 }
@@ -255,7 +254,7 @@ 
 				$metric,
 				$params
 			);
-		}else{
+		} else{
 			return $analytics->data_ga->get(
 				'ga:'.$filtered_id,
 				$startDate,
@@ -279,10 +278,11 @@ 
 	 **/
 	function verifyStartDate($date)
 	{
-		if ( strtotime($date) > strtotime('2005-01-01') )
-			return $date;
-		else
-			return '2005-01-01';
+		if ( strtotime($date) > strtotime('2005-01-01') ) {
+					return $date;
+		} else {
+					return '2005-01-01';
+		}
 	}
 
 } // END class	
\ No newline at end of file

geodirectory-functions/compatibility/Twenty_Seventeen.php

Spacing +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 
-add_filter('post_thumbnail_html','geodir_2017_remove_header',10,5);
-function geodir_2017_remove_header($html, $post_ID, $post_thumbnail_id, $size, $attr){
-	if($size=='twentyseventeen-featured-image'){
+add_filter('post_thumbnail_html', 'geodir_2017_remove_header', 10, 5);
+function geodir_2017_remove_header($html, $post_ID, $post_thumbnail_id, $size, $attr) {
+	if ($size == 'twentyseventeen-featured-image') {
 
-		if(geodir_is_page('detail') || geodir_is_page('add-listing')){
-			$html = '';// nothing up top
+		if (geodir_is_page('detail') || geodir_is_page('add-listing')) {
+			$html = ''; // nothing up top
 		}
 
 	}
@@ -63,19 +63,19 @@ 
 
 }
 
-function geodir_twentyseventeen_body_classes($classes){
+function geodir_twentyseventeen_body_classes($classes) {
 
-	if(geodir_is_page('add-listing')
+	if (geodir_is_page('add-listing')
 	   || geodir_is_page('preview')
 	   || geodir_is_page('home')
 	   || geodir_is_page('location')
 	   || geodir_is_page('listing')
 	   || geodir_is_page('search')
 	   || geodir_is_page('author')
-	){
+	) {
 		$classes[] = 'has-sidebar';
 	}
 	return $classes;
 }
-add_filter( 'body_class', 'geodir_twentyseventeen_body_classes' );
+add_filter('body_class', 'geodir_twentyseventeen_body_classes');
 

Braces +4 added lines, -8 removed lines

@@ -46,17 +46,13 @@
 
 	if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
-	}
-	elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
-	}
-	elseif (geodir_is_page('detail')) {
+	} elseif (geodir_is_page('detail')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
-	}
-	elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('search')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
-	}
-	elseif (geodir_is_page('author')) {
+	} elseif (geodir_is_page('author')) {
 		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
 	}
 

geodirectory-admin/option-pages/create_field.php

Indentation +65 added lines, -65 removed lines

@@ -16,100 +16,100 @@
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    $response = godir_set_sort_field_order($field_ids);
-    if (is_array($response)) {
-        wp_send_json($response);
-    } else {
-        echo $response;
-    }
+	$response = godir_set_sort_field_order($field_ids);
+	if (is_array($response)) {
+		wp_send_json($response);
+	} else {
+		echo $response;
+	}
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -37,23 +37,23 @@ 
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_sort_field_delete($field_id);
@@ -61,11 +61,11 @@ 
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+        if (is_array($_REQUEST[$pkey]) || $pkey == 'default_value') {
             $tags = 'skip_field';
         } else {
             $tags = '';
@@ -80,7 +80,7 @@ 
 
     if (is_int($return)) {
         $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+        geodir_custom_field_adminhtml($field_type, $lastid, 'submit', $field_type_key);
     } else {
         echo $return;
     }
@@ -88,7 +88,7 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {

Braces +12 added lines, -8 removed lines

@@ -46,23 +46,26 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
@@ -88,8 +91,9 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {

geodirectory-functions/signup_function.php

Braces +74 added lines, -48 removed lines

@@ -25,11 +25,13 @@ 
                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

-}

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

 

 /**

  * Redirect to SSL url, if SSL is being used.

@@ -60,7 +62,9 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) {
+    	echo $message . "\n";
+    }
 

 }

 

@@ -141,14 +145,16 @@ 
     global $wpdb;

 

     $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+    if (empty($_POST['user_login']) && empty($_POST['user_email'])) {
+            $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
+    }
 

     if (strpos($_POST['user_login'], '@')) {

         //$user_data = get_user_by_email(trim($_POST['user_login']));

         $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+        if (empty($user_data)) {
+                    $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
+        }
     } else {

         $login = trim($_POST['user_login']);

         $user_data = get_user_by('email', $login);

@@ -161,8 +167,9 @@ 
      */

     do_action('lostpassword_post');

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

     if (!$user_data) {

         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

@@ -192,8 +199,9 @@ 
         )

     );

 

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+    if (empty($user)) {
+            return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
+    }
 

     $new_pass = wp_generate_password(12, false);

 

@@ -282,13 +290,14 @@ 
     }

 

     // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

+    if ($user_login == '') {
+            $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
+    } elseif (!validate_username($user_login)) {

         $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

         $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+    } elseif (username_exists($user_login)) {
+            $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
+    }
 

     // Check the e-mail address

     if ($user_email == '') {

@@ -296,8 +305,9 @@ 
     } elseif (!is_email($user_email)) {

         $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

         $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+    } elseif (email_exists($user_email)) {
+            $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
+    }
 

     /**

      * Called when registering a new user.

@@ -317,8 +327,9 @@ 
      */

     $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

 

     if (!isset($user_pass) || $user_pass == '') {

@@ -423,28 +434,33 @@ 
 

     $errors = new WP_Error();

 

-    if (isset($_GET['key']))

-        $action = 'resetpass';

+    if (isset($_GET['key'])) {
+            $action = 'resetpass';
+    }
 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action)) {
+            $action = 'login';
+    }
 

     nocache_headers();

 

     if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) {
+                    $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);
+        }
 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) {
+                    update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
+        }
     }

 

     //Set a cookie now to see if they are supported by the browser.

     //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+    if (SITECOOKIEPATH != COOKIEPATH) {
+            setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+    }
 

     /**

      * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

@@ -465,8 +481,9 @@ 
 

             $redirect_to = $_SERVER['HTTP_REFERER'];

             //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

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

+            if (isset($_REQUEST['redirect_to'])) {
+                            $redirect_to = $_REQUEST['redirect_to'];
+            }
             $redirect_to = home_url();

             wp_safe_redirect($redirect_to);

             exit();

@@ -486,7 +503,9 @@ 
                     gd_die();

                 }

             }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) {
+            	$errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
+            }
         /**

          * Called in the geodir_user_signup() function during the lostpassword case.

          *

@@ -582,8 +601,9 @@ 
                     }

 

 

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

+                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                                            $secure_cookie = false;
+                    }
 

                     $user = wp_signon('', $secure_cookie);

 

@@ -652,22 +672,26 @@ 
                     $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

 

                     $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

+                else {
+                	:

+                    $_REQUEST['redirect_to'] = home_url();
+                }
                 endif;

 

             }

             if (isset($_REQUEST['redirect_to'])) {

                 $redirect_to = $_REQUEST['redirect_to'];

                 // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) {
+                                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+                }
             } else {

                 $redirect_to = admin_url();

             }

 

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

+            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                            $secure_cookie = false;
+            }
             $user = wp_signon('', $secure_cookie);

 

 

@@ -702,11 +726,13 @@ 
             $errors = $user;

 

             // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

+            if (!empty($_GET['loggedout'])) {
+                            $errors = new WP_Error();
+            }
             // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
+                            $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
+            }
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

Indentation +621 added lines, -621 removed lines

@@ -17,18 +17,18 @@ 
  */

 function geodir_is_login($redirect = false)

 {

-    global $current_user;

-    if (!$current_user->ID) {

-        if ($redirect) {

-            ?>

+	global $current_user;

+	if (!$current_user->ID) {

+		if ($redirect) {

+			?>

             <script type="text/javascript">

                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

+		} else

+			return false;

+	} else

+		return true;

 }

 

 /**

@@ -42,25 +42,25 @@ 
 {

 

 // Redirect to https login if forced to use SSL

-    if (force_ssl_admin() && !is_ssl()) {

-        if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

-            wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

-            exit();

-        } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

-            exit();

-        }

-    }

-

-    /**

-     * Filter the login message.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Login message.

-     */

-    $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+	if (force_ssl_admin() && !is_ssl()) {

+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

+			wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

+			exit();

+		} else {

+			wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+			exit();

+		}

+	}

+

+	/**

+	 * Filter the login message.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Login message.

+	 */

+	$message = apply_filters('login_message', $message);

+	if (!empty($message)) echo $message . "\n";

 

 }

 

@@ -73,59 +73,59 @@ 
  */

 function geodir_get_site_email_id()

 {

-    if (get_option('site_email')) {

+	if (get_option('site_email')) {

 

-        return get_option('site_email');

+		return get_option('site_email');

 

-    } else {

+	} else {

 

-        return get_option('admin_email');

+		return get_option('admin_email');

 

-    }

+	}

 

 }

 

 

 if (!function_exists('get_site_emailName')) {

-    /**

-     * Get site name for sending emails.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Site name.

-     */

-    function get_site_emailName()

+	/**

+	 * Get site name for sending emails.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Site name.

+	 */

+	function get_site_emailName()

 

-    {

+	{

 

-        if (get_option('site_email_name')) {

+		if (get_option('site_email_name')) {

 

-            return stripslashes(get_option('site_email_name'));

+			return stripslashes(get_option('site_email_name'));

 

-        } else {

+		} else {

 

-            return stripslashes(get_option('blogname'));

+			return stripslashes(get_option('blogname'));

 

-        }

+		}

 

-    }

+	}

 }

 

 if (!function_exists('is_allow_user_register')) {

-    /**

-     * Checks whether the site allowing user registration or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool|string

-     */

-    function is_allow_user_register()

+	/**

+	 * Checks whether the site allowing user registration or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool|string

+	 */

+	function is_allow_user_register()

 

-    {

+	{

 

-        return get_option('users_can_register');

+		return get_option('users_can_register');

 

-    }

+	}

 }

 

 /**

@@ -138,107 +138,107 @@ 
  */

 function geodir_retrieve_password()

 {

-    global $wpdb;

-

-    $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

-

-    if (strpos($_POST['user_login'], '@')) {

-        //$user_data = get_user_by_email(trim($_POST['user_login']));

-        $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

-    } else {

-        $login = trim($_POST['user_login']);

-        $user_data = get_user_by('email', $login);

-    }

-

-    /**

-     * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

-     *

-     * @since 1.0.0

-     */

-    do_action('lostpassword_post');

-

-    if ($errors->get_error_code())

-        return $errors;

-

-    if (!$user_data) {

-        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

-        return $errors;

-    }

-

-    // redefining user_login ensures we return the right case in the email

-    $user_login = $user_data->user_login;

-    $user_email = $user_data->user_email;

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param string $user_login The users username.

-     */

-    do_action('retrieve_password', $user_login);

-

-    ////////////////////////////////////

-    $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

-    $user_login = $_POST['user_login'];

-

-    $user = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

-            array($user_login, $user_login)

-        )

-    );

-

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

-

-    $new_pass = wp_generate_password(12, false);

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param object $user The user object.

-     * @param string $new_pass The new pass being sent to the user.

-     */

-    do_action('password_reset', $user, $new_pass);

-

-    wp_set_password($new_pass, $user->ID);

-    update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

-    //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

-    //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

-    $user_email = $user_data->user_email;

-    $user_name = geodir_get_client_name($user->ID);

-    $fromEmail = geodir_get_site_email_id();

-    $fromEmailName = get_site_emailName();

-    $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

-    /**

-     * Filter the password reset email subject part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $title Password reset email subject.

-     */

-    $title = apply_filters('password_reset_title', $title);

-    /**

-     * Filter the password reset email message part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Password reset email message.

-     * @param string $new_pass The new password string.

-     */

-    $message = apply_filters('password_reset_message', $message, $new_pass);

-    //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

-

-    return true;

+	global $wpdb;

+

+	$errors = new WP_Error();

+	if (empty($_POST['user_login']) && empty($_POST['user_email']))

+		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+

+	if (strpos($_POST['user_login'], '@')) {

+		//$user_data = get_user_by_email(trim($_POST['user_login']));

+		$user_data = get_user_by('email', trim($_POST['user_login']));

+		if (empty($user_data))

+			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+	} else {

+		$login = trim($_POST['user_login']);

+		$user_data = get_user_by('email', $login);

+	}

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('lostpassword_post');

+

+	if ($errors->get_error_code())

+		return $errors;

+

+	if (!$user_data) {

+		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

+		return $errors;

+	}

+

+	// redefining user_login ensures we return the right case in the email

+	$user_login = $user_data->user_login;

+	$user_email = $user_data->user_email;

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param string $user_login The users username.

+	 */

+	do_action('retrieve_password', $user_login);

+

+	////////////////////////////////////

+	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

+	$user_login = $_POST['user_login'];

+

+	$user = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

+			array($user_login, $user_login)

+		)

+	);

+

+	if (empty($user))

+		return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+

+	$new_pass = wp_generate_password(12, false);

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param object $user The user object.

+	 * @param string $new_pass The new pass being sent to the user.

+	 */

+	do_action('password_reset', $user, $new_pass);

+

+	wp_set_password($new_pass, $user->ID);

+	update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

+	$message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

+	$message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

+	$message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+	//$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

+	//$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

+	$user_email = $user_data->user_email;

+	$user_name = geodir_get_client_name($user->ID);

+	$fromEmail = geodir_get_site_email_id();

+	$fromEmailName = get_site_emailName();

+	$title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

+	/**

+	 * Filter the password reset email subject part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $title Password reset email subject.

+	 */

+	$title = apply_filters('password_reset_title', $title);

+	/**

+	 * Filter the password reset email message part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Password reset email message.

+	 * @param string $new_pass The new password string.

+	 */

+	$message = apply_filters('password_reset_message', $message, $new_pass);

+	//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

+	geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+

+	return true;

 }

 

 /**

@@ -253,80 +253,80 @@ 
  */

 function geodir_register_new_user($user_login, $user_email)

 {

-    global $wpdb;

-    $errors = new WP_Error();

-

-

-    $user_login = sanitize_user($user_login);

-    $user_login = str_replace(",", "", $user_login);

-    $user_email = str_replace(",", "", $user_email);

-    /**

-     * Filter the user registration email.

-     *

-     * @since 1.0.0

-     *

-     * @param string $user_email User registration email.

-     */

-    $user_email = apply_filters('user_registration_email', $user_email);

-

-

-    if (get_option('geodir_allow_cpass')) {

-        $user_pass = $_REQUEST['user_pass'];

-        $user_pass2 = $_REQUEST['user_pass2'];

-        // Check the password

-        if ($user_pass != $user_pass2) {

-            $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

-        } elseif (strlen($user_pass) < 7) {

-            $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

-        }

-    }

-

-    // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

-        $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

-        $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

-

-    // Check the e-mail address

-    if ($user_email == '') {

-        $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

-    } elseif (!is_email($user_email)) {

-        $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

-        $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

-

-    /**

-     * Called when registering a new user.

-     *

-     * This is a WordPress core hook.

-     *

-     * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

-     * @since 1.0.0

-     */

-    do_action('register_post', $user_login, $user_email, $errors);

-    /**

-     * Filter the registration error messages.

-     *

-     * @since 1.0.0

-     *

-     * @param object $errors Registration error messages.

-     */

-    $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

-

-    if ($errors->get_error_code())

-        return $errors;

-

-

-    if (!isset($user_pass) || $user_pass == '') {

-        $user_pass = wp_generate_password(12, false);

-    }

-    $user_id = wp_create_user($user_login, $user_pass, $user_email);

-    $user_web = '';

-    /*$user_add1 = $_POST['user_add1'];

+	global $wpdb;

+	$errors = new WP_Error();

+

+

+	$user_login = sanitize_user($user_login);

+	$user_login = str_replace(",", "", $user_login);

+	$user_email = str_replace(",", "", $user_email);

+	/**

+	 * Filter the user registration email.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $user_email User registration email.

+	 */

+	$user_email = apply_filters('user_registration_email', $user_email);

+

+

+	if (get_option('geodir_allow_cpass')) {

+		$user_pass = $_REQUEST['user_pass'];

+		$user_pass2 = $_REQUEST['user_pass2'];

+		// Check the password

+		if ($user_pass != $user_pass2) {

+			$errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

+		} elseif (strlen($user_pass) < 7) {

+			$errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

+		}

+	}

+

+	// Check the username

+	if ($user_login == '')

+		$errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

+	elseif (!validate_username($user_login)) {

+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

+		$user_login = '';

+	} elseif (username_exists($user_login))

+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+

+	// Check the e-mail address

+	if ($user_email == '') {

+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

+	} elseif (!is_email($user_email)) {

+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

+		$user_email = '';

+	} elseif (email_exists($user_email))

+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+

+	/**

+	 * Called when registering a new user.

+	 *

+	 * This is a WordPress core hook.

+	 *

+	 * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

+	 * @since 1.0.0

+	 */

+	do_action('register_post', $user_login, $user_email, $errors);

+	/**

+	 * Filter the registration error messages.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param object $errors Registration error messages.

+	 */

+	$errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

+

+	if ($errors->get_error_code())

+		return $errors;

+

+

+	if (!isset($user_pass) || $user_pass == '') {

+		$user_pass = wp_generate_password(12, false);

+	}

+	$user_id = wp_create_user($user_login, $user_pass, $user_email);

+	$user_web = '';

+	/*$user_add1 = $_POST['user_add1'];

     $user_add2 = $_POST['user_add2'];

     $user_city = $_POST['user_city'];

     $user_state = $_POST['user_state'];

@@ -335,79 +335,79 @@ 
     $user_web = $_POST['user_web'];

     $user_phone = $_POST['user_phone'];

     $user_twitter = $_POST['user_twitter'];	*/

-    $user_fname = sanitize_user($_POST['user_fname']);

-    $user_fname = str_replace(",", "", $user_fname);

+	$user_fname = sanitize_user($_POST['user_fname']);

+	$user_fname = str_replace(",", "", $user_fname);

 	if ( empty( $user_fname ) ) {

 		$user_fname = strstr( $user_login, '@', true );

 	}

 

-    /**

-     * Filter the submitted user meta.

-     *

-     * @since 1.0.0

-     *

-     * @param int $user_id User ID.

-     */

-    $user_address_info = apply_filters('geodir_manage_user_meta', array(

-        "user_add1" => '',

-        "user_add2" => '',

-        "user_city" => '',

-        "user_state" => '',

-        "user_country" => '',

-        "user_postalcode" => '',

-        "user_phone" => '',

-        "user_twitter" => '',

-        "first_name" => $user_fname,

-        "last_name" => '',

-    ), $user_id);

-    foreach ($user_address_info as $key => $val) {

-        update_user_meta($user_id, $key, $val); // User Address Information Here

-    }

-    //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

-    $userName = $user_fname;

-    update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

-    //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

-

-    $user_nicename = geodir_generate_user_nicename( $userName, $user_login );

-

-    $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

-

-    $wpdb->query($updateUsersql);

-

-    if (!$user_id) {

-        $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

-        return $errors;

-    }

-    global $upload_folder_path;

-

-    if ($user_id) {

+	/**

+	 * Filter the submitted user meta.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param int $user_id User ID.

+	 */

+	$user_address_info = apply_filters('geodir_manage_user_meta', array(

+		"user_add1" => '',

+		"user_add2" => '',

+		"user_city" => '',

+		"user_state" => '',

+		"user_country" => '',

+		"user_postalcode" => '',

+		"user_phone" => '',

+		"user_twitter" => '',

+		"first_name" => $user_fname,

+		"last_name" => '',

+	), $user_id);

+	foreach ($user_address_info as $key => $val) {

+		update_user_meta($user_id, $key, $val); // User Address Information Here

+	}

+	//update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

+	$userName = $user_fname;

+	update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

+	//update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

+

+	$user_nicename = geodir_generate_user_nicename( $userName, $user_login );

+

+	$updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

+

+	$wpdb->query($updateUsersql);

+

+	if (!$user_id) {

+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

+		return $errors;

+	}

+	global $upload_folder_path;

+

+	if ($user_id) {

 		clean_user_cache($user_id);

-        /**

-         * Called after registering a user and before the registration email is sent.

-         *

-         * @since 1.0.0

-         * @param int $user_id The user ID of the registered user.

-         */

-        do_action('geodir_user_register', $user_id);

-        ///////REGISTRATION EMAIL START//////

-        $fromEmail = geodir_get_site_email_id();

-        $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

+		/**

+		 * Called after registering a user and before the registration email is sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $user_id The user ID of the registered user.

+		 */

+		do_action('geodir_user_register', $user_id);

+		///////REGISTRATION EMAIL START//////

+		$fromEmail = geodir_get_site_email_id();

+		$fromEmailName = get_site_emailName();

+		$message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

 <p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

 <p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

 

-        /////////////customer email//////////////

-        //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

-        //////REGISTRATION EMAIL END////////

-    }

+		/////////////customer email//////////////

+		//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

+		geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+		//////REGISTRATION EMAIL END////////

+	}

 

-    if (get_option('ptthemes_auto_login')) {

-        $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

-        return $errors;

-    }

+	if (get_option('ptthemes_auto_login')) {

+		$errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

+		return $errors;

+	}

 

-    return array($user_id, $user_pass);

+	return array($user_id, $user_pass);

 }

 

 /**

@@ -420,333 +420,333 @@ 
  */

 function geodir_user_signup()

 {

-    global $errors;

-    $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

-

-    $errors = new WP_Error();

-

-    if (isset($_GET['key']))

-        $action = 'resetpass';

-

-    // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

-

-    nocache_headers();

-

-    if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

-

-        $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

-    }

-

-    //Set a cookie now to see if they are supported by the browser.

-    //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

-

-    /**

-     * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

-     *

-     * Used dynamic hook login_form_$action

-     *

-     * @since 1.0.0

-     */

-    do_action('login_form_' . $action);

-

-    $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

-

-    switch ($action):

-

-        case 'logout' :

-            //check_admin_referer('log-out');

-            wp_logout();

-

-            $redirect_to = $_SERVER['HTTP_REFERER'];

-            //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

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

-            $redirect_to = home_url();

-            wp_safe_redirect($redirect_to);

-            exit();

-

-            break;

-

-        case 'lostpassword' :

-        case 'retrievepassword' :

-            if ($http_post) {

-                $errors = geodir_retrieve_password();

-                $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

-                if (!is_wp_error($errors)) {

-                    wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

-                    gd_die();

-                } else {

-                    wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

-                    gd_die();

-                }

-            }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

-        /**

-         * Called in the geodir_user_signup() function during the lostpassword case.

-         *

-         * @since 1.0.0

-         */

-        do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

-            $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

-

-            break;

-

-        case 'resetpass' :

-        case 'rp' :

-            $errors = reset_password($_GET['key'], $_GET['login']);

-

-            if (!is_wp_error($errors)) {

-                wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

-                exit();

-            }

-

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

-            exit();

-

-            break;

-

-        case 'register' :

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            if (!get_option('users_can_register')) {

-                wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

-                exit();

-            }

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            global $user_email, $user_fname;

-            $user_login = '';

-            $user_email = '';

-            if ($http_post) {

-                $user_login = $_POST['user_email'];

-                $user_email = $_POST['user_email'];

-                $user_fname = $_POST['user_fname'];

-

-                $errors = geodir_register_new_user($user_login, $user_email);

-

-                /* display error in registration form */

-                if (is_wp_error($errors)) {

-                    $error_code = $errors->get_error_code();

-                    $error_message = $errors->get_error_message($error_code);

-                    if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

-                        if ($error_code == 'empty_username') {

-                            $error_code = 'empty_email';

-                        } else if ($error_code == 'invalid_username') {

-                            $error_code = 'invalid_email';

-                        } else if ($error_code == 'username_exists') {

-                            $error_code = 'email_exists';

-                        }

-

-                        $error_message = $errors->get_error_message($error_code);

-                    }

-                    global $geodir_signup_error;

-                    $geodir_signup_error = $error_message;

-                }

-

-                if (!is_wp_error($errors)) {

-                    $_POST['log'] = $user_login;

-                    $_POST['pwd'] = $errors[1];

-                    $_POST['testcookie'] = 1;

-

-                    $secure_cookie = '';

-                    // If the user wants ssl but the session is not ssl, force a secure cookie.

-                    if (!empty($_POST['log'])) {

-                        $user_name = sanitize_user($_POST['log']);

-                        if ($user = get_user_by('email', $user_name)) {

-                            if (get_user_option('use_ssl', $user->ID)) {

-                                $secure_cookie = true;

-                                force_ssl_admin(true);

-                            }

-                        }

-                    }

-

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

-

-                    if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                        if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

-                            $redirect_to = $_SERVER['HTTP_REFERER'];

-                        } else {

-                            $redirect_to = home_url();

-                        }

-

-                    }

-

-                    if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

-

-                        $redirect_to = $_REQUEST['redirect_add_listing'];

-                    }

-

-

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

-

-                    $user = wp_signon('', $secure_cookie);

-

-                    $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

-                    /**

-                     * Filter the login redirect URL.

-                     *

-                     * @since 1.4.9

-                     * @param string $redirect_to The redirect destination URL.

-                     * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

-                     * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-                     */

-                    $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

-

-

-                    if (!is_wp_error($user)) {

-                        wp_safe_redirect($redirect_to);

-                        exit();

-                    }

-                    exit();

-                }

-            }

-

-            break;

-

-        case 'login' :

-        default:

-            $secure_cookie = '';

-

-            if (!empty($_POST['log'])) {

-                $user_name = sanitize_user($_POST['log']);

-                if ($user = get_user_by('login', $user_name)) {

-

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                } elseif ($user = get_user_by('email', $user_name)) {

-                    $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                }

-            }

-            ///////////////////////////

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

-                $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

-            }

-

-

-            if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                if (is_user_logged_in()) :

-                    $user_ID = !empty($user->ID) ? $user->ID : get_current_user_id();

-                    $post_types = geodir_get_posttypes();

+	global $errors;

+	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

+

+	$errors = new WP_Error();

+

+	if (isset($_GET['key']))

+		$action = 'resetpass';

+

+	// validate action so as to default to the login screen

+	if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+		$action = 'login';

+

+	nocache_headers();

+

+	if (defined('RELOCATE')) { // Move flag is set

+		if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

+			$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+

+		$schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

+		if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

+			update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+	}

+

+	//Set a cookie now to see if they are supported by the browser.

+	//setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

+	if (SITECOOKIEPATH != COOKIEPATH)

+		setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+

+	/**

+	 * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

+	 *

+	 * Used dynamic hook login_form_$action

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('login_form_' . $action);

+

+	$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

+

+	switch ($action):

+

+		case 'logout' :

+			//check_admin_referer('log-out');

+			wp_logout();

+

+			$redirect_to = $_SERVER['HTTP_REFERER'];

+			//$redirect_to = home_url().'/?ptype=login&loggedout=true';

+			if (isset($_REQUEST['redirect_to']))

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

+			$redirect_to = home_url();

+			wp_safe_redirect($redirect_to);

+			exit();

+

+			break;

+

+		case 'lostpassword' :

+		case 'retrievepassword' :

+			if ($http_post) {

+				$errors = geodir_retrieve_password();

+				$error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

+				if (!is_wp_error($errors)) {

+					wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

+					gd_die();

+				} else {

+					wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

+					gd_die();

+				}

+			}

+			if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+		/**

+		 * Called in the geodir_user_signup() function during the lostpassword case.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('lost_password');

+			$message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+			$user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

+

+			break;

+

+		case 'resetpass' :

+		case 'rp' :

+			$errors = reset_password($_GET['key'], $_GET['login']);

+

+			if (!is_wp_error($errors)) {

+				wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

+				exit();

+			}

+

+			wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+			exit();

+

+			break;

+

+		case 'register' :

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			if (!get_option('users_can_register')) {

+				wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

+				exit();

+			}

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			global $user_email, $user_fname;

+			$user_login = '';

+			$user_email = '';

+			if ($http_post) {

+				$user_login = $_POST['user_email'];

+				$user_email = $_POST['user_email'];

+				$user_fname = $_POST['user_fname'];

+

+				$errors = geodir_register_new_user($user_login, $user_email);

+

+				/* display error in registration form */

+				if (is_wp_error($errors)) {

+					$error_code = $errors->get_error_code();

+					$error_message = $errors->get_error_message($error_code);

+					if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

+						if ($error_code == 'empty_username') {

+							$error_code = 'empty_email';

+						} else if ($error_code == 'invalid_username') {

+							$error_code = 'invalid_email';

+						} else if ($error_code == 'username_exists') {

+							$error_code = 'email_exists';

+						}

+

+						$error_message = $errors->get_error_message($error_code);

+					}

+					global $geodir_signup_error;

+					$geodir_signup_error = $error_message;

+				}

+

+				if (!is_wp_error($errors)) {

+					$_POST['log'] = $user_login;

+					$_POST['pwd'] = $errors[1];

+					$_POST['testcookie'] = 1;

+

+					$secure_cookie = '';

+					// If the user wants ssl but the session is not ssl, force a secure cookie.

+					if (!empty($_POST['log'])) {

+						$user_name = sanitize_user($_POST['log']);

+						if ($user = get_user_by('email', $user_name)) {

+							if (get_user_option('use_ssl', $user->ID)) {

+								$secure_cookie = true;

+								force_ssl_admin(true);

+							}

+						}

+					}

+

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

+

+					if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+						if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

+							$redirect_to = $_SERVER['HTTP_REFERER'];

+						} else {

+							$redirect_to = home_url();

+						}

+

+					}

+

+					if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

+

+						$redirect_to = $_REQUEST['redirect_add_listing'];

+					}

+

+

+					if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+						$secure_cookie = false;

+

+					$user = wp_signon('', $secure_cookie);

+

+					$requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

+					/**

+					 * Filter the login redirect URL.

+					 *

+					 * @since 1.4.9

+					 * @param string $redirect_to The redirect destination URL.

+					 * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

+					 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+					 */

+					$redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

+

+

+					if (!is_wp_error($user)) {

+						wp_safe_redirect($redirect_to);

+						exit();

+					}

+					exit();

+				}

+			}

+

+			break;

+

+		case 'login' :

+		default:

+			$secure_cookie = '';

+

+			if (!empty($_POST['log'])) {

+				$user_name = sanitize_user($_POST['log']);

+				if ($user = get_user_by('login', $user_name)) {

+

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				} elseif ($user = get_user_by('email', $user_name)) {

+					$_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				}

+			}

+			///////////////////////////

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

+				$_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

+			}

+

+

+			if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+				if (is_user_logged_in()) :

+					$user_ID = !empty($user->ID) ? $user->ID : get_current_user_id();

+					$post_types = geodir_get_posttypes();

                     

-                    if ( !empty( $_REQUEST['stype'] ) ) {

-                        $dashboard_post_type = sanitize_text_field($_REQUEST['stype']);

-                    } else {

-                        $user_listings = geodir_user_post_listing_count( $user_ID );

-                        if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {

-                            $dashboard_post_type = $dashboard_post_types[0];

-                        }

-                    }

-                    if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {

-                        $dashboard_post_type = $post_types[0];

-                    }

+					if ( !empty( $_REQUEST['stype'] ) ) {

+						$dashboard_post_type = sanitize_text_field($_REQUEST['stype']);

+					} else {

+						$user_listings = geodir_user_post_listing_count( $user_ID );

+						if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {

+							$dashboard_post_type = $dashboard_post_types[0];

+						}

+					}

+					if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {

+						$dashboard_post_type = $post_types[0];

+					}

                     

-                    $author_link = get_author_posts_url($user_ID);

-                    $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $dashboard_post_type), false);

-

-                    /**

-                     * Filter the author link.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $default_author_link Default author link.

-                     * @param int $user_ID The user ID.

-                     */

-                    $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

-

-                    $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

-                endif;

-

-            }

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

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

-                // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

-            } else {

-                $redirect_to = admin_url();

-            }

-

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

-            $user = wp_signon('', $secure_cookie);

-

-

-            /**

-             * Filter the login redirect URL.

-             *

-             * @since 1.4.9

-             * @param string $redirect_to The redirect destination URL.

-             * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-             */

-            $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

-

-            if (is_wp_error($user)) {

-                if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

-                }

-            }

-            if (!is_wp_error($user)) {

-

-                // Some servers are not logging the user in properly after wp_signon, se we set the user here.

-                //wp_set_current_user($user->ID);

-                //echo '###';exit;

-

-                if ($redirect_to) {

-                    wp_redirect($redirect_to);

-                } else {

-                    wp_redirect(home_url());

-                }

-                gd_die();

-            }

-

-            $errors = $user;

-

-            // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

-            // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

-

-            // Some parts of this script use the main login form to display a message

-            if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

-            } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

-                $successmsg = USER_REG_NOT_ALLOW_MSG;

-            } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

-                $successmsg = EMAIL_CONFIRM_LINK_MSG;

-            } elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

-                $successmsg = NEW_PW_EMAIL_MSG;

-            } elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

-                $successmsg = REG_COMPLETE_MSG;

-            }

-

-            if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

-                if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

-                } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

-                }

-                gd_die();

-            }

-            break;

-    endswitch; // end action switch

+					$author_link = get_author_posts_url($user_ID);

+					$default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $dashboard_post_type), false);

+

+					/**

+					 * Filter the author link.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $default_author_link Default author link.

+					 * @param int $user_ID The user ID.

+					 */

+					$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

+

+					$_REQUEST['redirect_to'] = $default_author_link;

+				else:

+					$_REQUEST['redirect_to'] = home_url();

+				endif;

+

+			}

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

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

+				// Redirect to https if user wants ssl

+				if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+			} else {

+				$redirect_to = admin_url();

+			}

+

+			if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+				$secure_cookie = false;

+			$user = wp_signon('', $secure_cookie);

+

+

+			/**

+			 * Filter the login redirect URL.

+			 *

+			 * @since 1.4.9

+			 * @param string $redirect_to The redirect destination URL.

+			 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+			 */

+			$redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

+

+			if (is_wp_error($user)) {

+				if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

+					wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+				}

+			}

+			if (!is_wp_error($user)) {

+

+				// Some servers are not logging the user in properly after wp_signon, se we set the user here.

+				//wp_set_current_user($user->ID);

+				//echo '###';exit;

+

+				if ($redirect_to) {

+					wp_redirect($redirect_to);

+				} else {

+					wp_redirect(home_url());

+				}

+				gd_die();

+			}

+

+			$errors = $user;

+

+			// Clear errors if loggedout is set.

+			if (!empty($_GET['loggedout']))

+				$errors = new WP_Error();

+			// If cookies are disabled we can't log in even with a valid user+pass

+			if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

+				$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+

+			// Some parts of this script use the main login form to display a message

+			if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

+				$successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+			} elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

+				$successmsg = USER_REG_NOT_ALLOW_MSG;

+			} elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

+				$successmsg = EMAIL_CONFIRM_LINK_MSG;

+			} elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

+				$successmsg = NEW_PW_EMAIL_MSG;

+			} elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

+				$successmsg = REG_COMPLETE_MSG;

+			}

+

+			if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

+				if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

+					wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+				} else {

+					wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+				}

+				gd_die();

+			}

+			break;

+	endswitch; // end action switch

 }

 

 function geodir_generate_user_nicename( $display_name, $user_login ) {

Spacing +41 added lines, -41 removed lines

@@ -22,7 +22,7 @@ 
         if ($redirect) {

             ?>

             <script type="text/javascript">

-                window.location.href = '<?php echo geodir_login_url();?>';

+                window.location.href = '<?php echo geodir_login_url(); ?>';

             </script>

         <?php

         } else

@@ -47,7 +47,7 @@ 
             wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

             exit();

         } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+            wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);

             exit();

         }

     }

@@ -60,7 +60,7 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) echo $message."\n";

 

 }

 

@@ -208,9 +208,9 @@ 
 

     wp_set_password($new_pass, $user->ID);

     update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+    $message = '<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>';

+    $message .= '<p>'.sprintf(__('Username: %s', 'geodirectory'), $user->user_login)."</p>";

+    $message .= '<p>'.sprintf(__('Password: %s', 'geodirectory'), $new_pass)."</p>";

     //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

     //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

     $user_email = $user_data->user_email;

@@ -236,7 +236,7 @@ 
      */

     $message = apply_filters('password_reset_message', $message, $new_pass);

     //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email

 

     return true;

 }

@@ -315,7 +315,7 @@ 
      *

      * @param object $errors Registration error messages.

      */

-    $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

+    $errors = apply_filters('registration_errors', $errors, $user_login, $user_email);

 

     if ($errors->get_error_code())

         return $errors;

@@ -337,8 +337,8 @@ 
     $user_twitter = $_POST['user_twitter'];	*/

     $user_fname = sanitize_user($_POST['user_fname']);

     $user_fname = str_replace(",", "", $user_fname);

-	if ( empty( $user_fname ) ) {

-		$user_fname = strstr( $user_login, '@', true );

+	if (empty($user_fname)) {

+		$user_fname = strstr($user_login, '@', true);

 	}

 

     /**

@@ -368,7 +368,7 @@ 
     update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

     //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

 

-    $user_nicename = geodir_generate_user_nicename( $userName, $user_login );

+    $user_nicename = geodir_generate_user_nicename($userName, $user_login);

 

     $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

 

@@ -392,13 +392,13 @@ 
         ///////REGISTRATION EMAIL START//////

         $fromEmail = geodir_get_site_email_id();

         $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

-<p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

-<p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

+        $message = __('<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>

+<p>' . __('Username:', 'geodirectory').' '.$user_login.'</p>

+<p>' . __('Password:', 'geodirectory').' '.$user_pass.'</p>');

 

         /////////////customer email//////////////

         //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email

         //////REGISTRATION EMAIL END////////

     }

 

@@ -429,7 +429,7 @@ 
         $action = 'resetpass';

 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_'.$action))

         $action = 'login';

 

     nocache_headers();

@@ -439,8 +439,8 @@ 
             $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']) != home_url())

+            update_option('siteurl', dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']));

     }

 

     //Set a cookie now to see if they are supported by the browser.

@@ -455,7 +455,7 @@ 
      *

      * @since 1.0.0

      */

-    do_action('login_form_' . $action);

+    do_action('login_form_'.$action);

 

     $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

 

@@ -495,7 +495,7 @@ 
          * @since 1.0.0

          */

         do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+            $message = '<div class="sucess_msg">'.ENTER_USER_EMAIL_NEW_PW_MSG.'</div>';

             $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

 

             break;

@@ -509,7 +509,7 @@ 
                 exit();

             }

 

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+            wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));

             exit();

 

             break;

@@ -642,15 +642,15 @@ 
                     $user_ID = !empty($user->ID) ? $user->ID : get_current_user_id();

                     $post_types = geodir_get_posttypes();

                     

-                    if ( !empty( $_REQUEST['stype'] ) ) {

+                    if (!empty($_REQUEST['stype'])) {

                         $dashboard_post_type = sanitize_text_field($_REQUEST['stype']);

                     } else {

-                        $user_listings = geodir_user_post_listing_count( $user_ID );

-                        if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {

+                        $user_listings = geodir_user_post_listing_count($user_ID);

+                        if (!empty($user_listings) && $dashboard_post_types = array_keys($user_listings)) {

                             $dashboard_post_type = $dashboard_post_types[0];

                         }

                     }

-                    if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {

+                    if (!(!empty($dashboard_post_type) && in_array($dashboard_post_type, $post_types))) {

                         $dashboard_post_type = $post_types[0];

                     }

                     

@@ -698,7 +698,7 @@ 
 

             if (is_wp_error($user)) {

                 if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+                    wp_redirect($_SERVER['HTTP_REFERER'].'&emsg=1');

                 }

             }

             if (!is_wp_error($user)) {

@@ -726,7 +726,7 @@ 
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+                $successmsg = '<div class="sucess_msg">'.YOU_ARE_LOGED_OUT_MSG.'</div>';

             } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

                 $successmsg = USER_REG_NOT_ALLOW_MSG;

             } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

@@ -739,9 +739,9 @@ 
 

             if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

                 if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+                    wp_redirect($_REQUEST['pagetype'].'&emsg=1');

                 } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+                    wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));

                 }

                 gd_die();

             }

@@ -749,28 +749,28 @@ 
     endswitch; // end action switch

 }

 

-function geodir_generate_user_nicename( $display_name, $user_login ) {

+function geodir_generate_user_nicename($display_name, $user_login) {

 	global $wpdb;

 	$user_nicename = '';

-	if ( ! empty( $display_name ) ) {

-		$user_nicename = sanitize_user( $display_name, true );

+	if (!empty($display_name)) {

+		$user_nicename = sanitize_user($display_name, true);

 	}

-	if ( empty( $user_nicename ) ) {

+	if (empty($user_nicename)) {

 		$user_nicename = $user_login;

 	}

-	$user_nicename = mb_substr( $user_nicename, 0, 50 );

-	$user_nicename = sanitize_title( $user_nicename );

-	$user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );

+	$user_nicename = mb_substr($user_nicename, 0, 50);

+	$user_nicename = sanitize_title($user_nicename);

+	$user_nicename = apply_filters('pre_user_nicename', $user_nicename);

 				

-	$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));

+	$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $user_nicename, $user_login));

 		

-	if ( $user_nicename_check ) {

+	if ($user_nicename_check) {

 		$suffix = 2;

 		while ($user_nicename_check) {

 			// user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.

-			$base_length = 49 - mb_strlen( $suffix );

-			$alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";

-			$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));

+			$base_length = 49 - mb_strlen($suffix);

+			$alt_user_nicename = mb_substr($user_nicename, 0, $base_length)."-$suffix";

+			$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $alt_user_nicename, $user_login));

 			$suffix++;

 		}

 		$user_nicename = $alt_user_nicename;

geodirectory-functions/map-functions/map_template_tags.php

Braces +8 added lines, -6 removed lines

@@ -225,10 +225,11 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

+                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters']) {
+                                    $show_entire_cat_panel = "none";
+                } else {
+                                    $show_entire_cat_panel = "''";
+                }
                 ?>

 

                 <?php if ($geodir_map_options['enable_map_direction']) { ?>

@@ -302,8 +303,9 @@ 
 				}

 				

 				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

+				if (empty($geodir_default_map_search_pt)) {
+									$geodir_default_map_search_pt = 'gd_place';
+				}
 

                 global $gd_session;

                 $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

Indentation +145 added lines, -145 removed lines

@@ -67,80 +67,80 @@ 
  */

 function geodir_draw_map($map_args = array())

 {

-    global $map_canvas_arr;

-    $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

-    $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

-

-    $default_location = geodir_get_default_location();

-

-    $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-    $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-    $map_default_zoom = 12;

-    // map options default values

-    $width = 950;

-    $height = 450;

-    $child_collapse = '0';

-    $sticky = '';

-    $enable_cat_filters = false;

-    $enable_text_search = false;

-    $enable_post_type_filters = false;

-    $enable_location_filters = false;

-    $enable_jason_on_load = false;

-    $enable_map_direction = false;

-    $enable_marker_cluster = false;

-    $enable_map_resize_button = false;

-    $maptype = 'ROADMAP';

-

-    $geodir_map_options = array(

-        'width' => $width,

-        'height' => $height,

-        'child_collapse' => $child_collapse,

-        'sticky' => $sticky,

-        'enable_map_resize_button' => $enable_map_resize_button,

-        'enable_cat_filters' => $enable_cat_filters,

-        'enable_text_search' => $enable_text_search,

-        'enable_post_type_filters' => $enable_post_type_filters,

-        'enable_location_filters' => $enable_location_filters,

-        'enable_jason_on_load' => $enable_jason_on_load,

-        'enable_map_direction' => $enable_map_direction,

-        'enable_marker_cluster' => $enable_marker_cluster,

-        'ajax_url' => geodir_get_ajax_url(),

-        'map_canvas_name' => $map_canvas_name,

-        'inputText' => __('Title or Keyword', 'geodirectory'),

-        'latitude' => $map_default_lat,

-        'longitude' => $map_default_lng,

-        'zoom' => $map_default_zoom,

-        'scrollwheel' => true,

-        'streetViewControl' => true,

-        'fullscreenControl' => false,

-        'maptype' => $maptype,

-        'showPreview' => '0',

-        'maxZoom' => 21,

-        'autozoom' => true,

-        'bubble_size' => 'small',

-        'token' => '68f48005e256696074e1da9bf9f67f06',

-        'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

-    );

-

-

-

-    if (!empty($map_args)) {

-        foreach ($map_args as $map_option_key => $map_option_value) {

-            $geodir_map_options[$map_option_key] = $map_option_value;

-        }

-    }

-

-    if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

-    } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

-    }

-

-    if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

-    } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

-    }

-

-    /**

+	global $map_canvas_arr;

+	$map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';

+	$map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';

+

+	$default_location = geodir_get_default_location();

+

+	$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+	$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+	$map_default_zoom = 12;

+	// map options default values

+	$width = 950;

+	$height = 450;

+	$child_collapse = '0';

+	$sticky = '';

+	$enable_cat_filters = false;

+	$enable_text_search = false;

+	$enable_post_type_filters = false;

+	$enable_location_filters = false;

+	$enable_jason_on_load = false;

+	$enable_map_direction = false;

+	$enable_marker_cluster = false;

+	$enable_map_resize_button = false;

+	$maptype = 'ROADMAP';

+

+	$geodir_map_options = array(

+		'width' => $width,

+		'height' => $height,

+		'child_collapse' => $child_collapse,

+		'sticky' => $sticky,

+		'enable_map_resize_button' => $enable_map_resize_button,

+		'enable_cat_filters' => $enable_cat_filters,

+		'enable_text_search' => $enable_text_search,

+		'enable_post_type_filters' => $enable_post_type_filters,

+		'enable_location_filters' => $enable_location_filters,

+		'enable_jason_on_load' => $enable_jason_on_load,

+		'enable_map_direction' => $enable_map_direction,

+		'enable_marker_cluster' => $enable_marker_cluster,

+		'ajax_url' => geodir_get_ajax_url(),

+		'map_canvas_name' => $map_canvas_name,

+		'inputText' => __('Title or Keyword', 'geodirectory'),

+		'latitude' => $map_default_lat,

+		'longitude' => $map_default_lng,

+		'zoom' => $map_default_zoom,

+		'scrollwheel' => true,

+		'streetViewControl' => true,

+		'fullscreenControl' => false,

+		'maptype' => $maptype,

+		'showPreview' => '0',

+		'maxZoom' => 21,

+		'autozoom' => true,

+		'bubble_size' => 'small',

+		'token' => '68f48005e256696074e1da9bf9f67f06',

+		'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')

+	);

+

+

+

+	if (!empty($map_args)) {

+		foreach ($map_args as $map_option_key => $map_option_value) {

+			$geodir_map_options[$map_option_key] = $map_option_value;

+		}

+	}

+

+	if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

+	} else {

+		$geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+	}

+

+	if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

+	} else {

+		$geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+	}

+

+	/**

 	 * Filter the options to use in google map.

 	 *

 	 * @since 1.0.0

@@ -149,9 +149,9 @@ 
 	 */

 	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

-    $map_canvas_arr[$map_canvas_name] = array();

+	$map_canvas_arr[$map_canvas_name] = array();

 

-    /**

+	/**

 	 * Filter the post types to display data on map.

 	 *

 	 * @since 1.0.0

@@ -169,20 +169,20 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

-        // Set default map options

+	if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+		// Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+		wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

 

-        wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

+		wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

-        if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

-            $map_width = '100%';

-        } else {

-            $map_width = $geodir_map_options['width'];

-        }

+		if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {

+			$map_width = '100%';

+		} else {

+			$map_width = $geodir_map_options['width'];

+		}

 

-        /**

+		/**

 		 * Filter the width of map.

 		 *

 		 * @since 1.0.0

@@ -190,7 +190,7 @@ 
 		 * @param int $map_width Width of map box, eg: gd_place.

 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

-        ?>

+		?>

         <div id="catcher_<?php echo $map_canvas_name;?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

@@ -224,15 +224,15 @@ 
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

                 <?php } else {

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

                 <?php }

 

-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

-                    $show_entire_cat_panel = "none";

-                else

-                    $show_entire_cat_panel = "''";

-                ?>

+				if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

+					$show_entire_cat_panel = "none";

+				else

+					$show_entire_cat_panel = "''";

+				?>

 

                 <?php if ($geodir_map_options['enable_map_direction']) { ?>

                     <div class="gd-input-group gd-get-directions">

@@ -295,8 +295,8 @@ 
                         <select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">

                             <option value="miles"><?php _e('Miles', 'geodirectory'); ?></option>

                             <option <?php if (get_option('geodir_search_dist_1') == 'km') {

-                                echo 'selected="selected"';

-                            } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

+								echo 'selected="selected"';

+							} ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>

                         </select>

                     </div>

 

@@ -308,12 +308,12 @@ 
 				if (empty($geodir_default_map_search_pt))

 					$geodir_default_map_search_pt = 'gd_place';

 

-                global $gd_session;

-                $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

+				global $gd_session;

+				$homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');

 

-                if ($homemap_catlist_ptype) {

-                    $geodir_default_map_search_pt = $homemap_catlist_ptype;

-                }

+				if ($homemap_catlist_ptype) {

+					$geodir_default_map_search_pt = $homemap_catlist_ptype;

+				}

 

 				/**

 				 * Filter the post type to retrieve data for map

@@ -326,13 +326,13 @@ 
 				?>

                 <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

                     <?php

-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

-                    $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+					$geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

 					$map_cat_class = '';

 					if ($geodir_map_options['enable_post_type_filters']) {

 						$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

 					}

-                    ?>

+					?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

                         <div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>

@@ -350,7 +350,7 @@ 
                                 <?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>

                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

-                                    ?>

+									?>

                                     <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

@@ -372,18 +372,18 @@ 
                 <!-- map-category-listings-->

 

                 <?php

-                if ($geodir_map_options['enable_location_filters']) {

-                    $country = get_query_var('gd_country');

+				if ($geodir_map_options['enable_location_filters']) {

+					$country = get_query_var('gd_country');

 					$region = get_query_var('gd_region');

 					$city = get_query_var('gd_city');

-                    $gd_neighbourhood = get_query_var('gd_neighbourhood');

+					$gd_neighbourhood = get_query_var('gd_neighbourhood');

                     

-                    //fix for location/me page

-                    $country = $country != 'me' ? $country : '';

+					//fix for location/me page

+					$country = $country != 'me' ? $country : '';

 					$region = $region != 'me' ? $region : '';

 					$city = $country != 'me' ? $city : '';

-                    $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

-                    ?>

+					$gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

                            value="<?php echo $country;?>"/>

@@ -394,7 +394,7 @@ 
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

                            value="<?php echo $gd_neighbourhood;?>"/>

                 <?php } else { //end of location filter

-                    ?>

+					?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

                 <?php }?>

 

@@ -405,16 +405,16 @@ 
 

 

                 <?php if ($geodir_map_options['enable_post_type_filters']) {

-                    $post_types = geodir_get_posttypes('object');

-                    $all_post_types = geodir_get_posttypes('names');

-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

-                    if (is_array($exclude_post_types)) {

-                        $map_post_types = array_diff($all_post_types, $exclude_post_types);

-                    } else {

-                        $map_post_types = $all_post_types;

-                    }

-                    if (count($map_post_types) > 1) {

-                        ?>

+					$post_types = geodir_get_posttypes('object');

+					$all_post_types = geodir_get_posttypes('names');

+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');

+					if (is_array($exclude_post_types)) {

+						$map_post_types = array_diff($all_post_types, $exclude_post_types);

+					} else {

+						$map_post_types = $all_post_types;

+					}

+					if (count($map_post_types) > 1) {

+						?>

                         <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

                              style="max-width:<?php echo $map_width;?>!important;">

 

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

 

 

-                                    foreach ($post_types as $post_type => $args) {

-                                        if (!in_array($post_type, $exclude_post_types)) {

-                                            $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

+									foreach ($post_types as $post_type => $args) {

+										if (!in_array($post_type, $exclude_post_types)) {

+											$class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

 											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>';

-                                        }

-                                    }

-                                    ?>

+										}

+									}

+									?>

                                 </ul>

                                 <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             </div><?php } ?>

@@ -444,8 +444,8 @@ 
 

                         </div> <!-- map-places-listings-->

                     <?php }

-                } // end of post type filter if

-                ?>

+				} // end of post type filter if

+				?>

 

             </div>

         </div> <!--end of stick trigger container-->

@@ -459,8 +459,8 @@ 
         </script>

         <?php

 

-        if (strpos($geodir_map_options['height'], 'vh')) {

-            ?>

+		if (strpos($geodir_map_options['height'], 'vh')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -482,8 +482,8 @@ 
 

         <?php

 

-        } elseif (strpos($geodir_map_options['height'], 'px')) {

-            ?>

+		} elseif (strpos($geodir_map_options['height'], 'px')) {

+			?>

             <script>

                 (function () {

                     var screenH = jQuery(window).height();

@@ -498,20 +498,20 @@ 
                 }());

             </script>

         <?php

-        }

+		}

 

-        /**

-         * Action that runs after all the map code has been output;

-         *

-         * @since 1.5.3

-         *

-         * @param array $geodir_map_options Array of map settings.

-         * @param string $map_canvas_name The canvas name and ID for the map.

-         */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+		/**

+		 * Action that runs after all the map code has been output;

+		 *

+		 * @since 1.5.3

+		 *

+		 * @param array $geodir_map_options Array of map settings.

+		 * @param string $map_canvas_name The canvas name and ID for the map.

+		 */

+		do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

 

 

-    endif; // Exclude posttypes if end

+	endif; // Exclude posttypes if end

 }

 

 /**

Spacing +61 added lines, -61 removed lines

@@ -132,12 +132,12 @@ 
 

     if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {

     } else {

-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';

+        $geodir_map_options['height'] = $geodir_map_options['height'].'px';

     }

 

     if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {

     } else {

-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';

+        $geodir_map_options['width'] = $geodir_map_options['width'].'px';

     }

 

     /**

@@ -169,10 +169,10 @@ 
 	 */

 	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

-    if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

+    if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

 

-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);

+        wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);

 

         wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);

 

@@ -191,41 +191,41 @@ 
 		 */

 		$map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

-        <div id="catcher_<?php echo $map_canvas_name;?>"></div>

+        <div id="catcher_<?php echo $map_canvas_name; ?>"></div>

         <div class="stick_trigger_container">

             <div class="trigger_sticky triggeroff_sticky"></div>

-            <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"

-                 id="sticky_map_<?php echo $map_canvas_name;?>"

-                 style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+            <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"

+                 id="sticky_map_<?php echo $map_canvas_name; ?>"

+                 style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

 

                 <div class="map_background">

                     <div class="top_banner_section_in clearfix">

-                        <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>

-                        <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>

-                        <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"

-                             style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">

+                        <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>

+                        <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>

+                        <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"

+                             style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">

                             <!-- new map start -->

                             <div class="iprelative">

-                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"

-                                     style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

-                                <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"

-                                     style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>

+                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"

+                                     style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

+                                <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"

+                                     style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>

                                 <!--<div id="home_map_counter"></div>        -->

-                                <div id="<?php echo $map_canvas_name;?>_map_nofound"

+                                <div id="<?php echo $map_canvas_name; ?>_map_nofound"

                                      class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-                                <div id="<?php echo $map_canvas_name;?>_map_notloaded"

+                                <div id="<?php echo $map_canvas_name; ?>_map_notloaded"

                                      class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>

                             </div>

                             <!-- new map end -->

                         </div>

-                        <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>

+                        <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>

                     </div>

                 </div>

                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>

                 <?php } else {

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>

                 <?php }

 

                 if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])

@@ -245,7 +245,7 @@ 
                       <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>

                     </div>

                     <script>

-                        <?php if(geodir_is_page('detail')){?>

+                        <?php if (geodir_is_page('detail')) {?>

                         jQuery(function () {

                             gd_initialize_ac();

                         });

@@ -256,7 +256,7 @@ 
                                 // Create the autocomplete object, restricting the search

                                 // to geographical location types.

                                 autocomplete = new google.maps.places.Autocomplete(

-                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),

+                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),

                                     {types: ['geocode']});

                                 // When the user selects an address from the dropdown,

                                 // populate the address fields in the form.

@@ -270,7 +270,7 @@ 
                                 

                                 if (window.gdMaps == 'osm') {

                                     window.setTimeout(function() {

-                                        calcRoute('<?php echo $map_canvas_name;?>');

+                                        calcRoute('<?php echo $map_canvas_name; ?>');

                                     }, 1000);

                                 }

                             }

@@ -324,7 +324,7 @@ 
 				 */

 				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

 				?>

-                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

+                <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

@@ -334,12 +334,12 @@ 
 					}

                     ?>

                     <div

-                        class="map-category-listing<?php echo $map_cat_class;?>">

+                        class="map-category-listing<?php echo $map_cat_class; ?>">

                         <div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>

-                        <div id="<?php echo $map_canvas_name;?>_cat"

-                             class="<?php echo $map_canvas_name;?>_map_category  map_category"

-                             <?php if ($child_collapse){ ?>checked="checked" <?php }?>

-                             style="max-height:<?php echo $geodir_map_options['height'];?>;">

+                        <div id="<?php echo $map_canvas_name; ?>_cat"

+                             class="<?php echo $map_canvas_name; ?>_map_category  map_category"

+                             <?php if ($child_collapse) { ?>checked="checked" <?php }?>

+                             style="max-height:<?php echo $geodir_map_options['height']; ?>;">

                             <input

                                 onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"

                                 type="text"

@@ -351,11 +351,11 @@ 
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>

                                 <?php } else {$child_collapse = "0";

                                     ?>

-                                    <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>

+                                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>

                                 <?php } ?>

                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>

                                 <div class="geodir_toggle">

-                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>

+                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>

                                     <script>

                                         jQuery(window).load(function() {

                                             geodir_show_sub_cat_collapse_button();

@@ -385,21 +385,21 @@ 
 					$city = $country != 'me' ? $city : '';

                     $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"

-                           value="<?php echo $country;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"

-                           value="<?php echo $region;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"

-                           value="<?php echo $city;?>"/>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"

-                           value="<?php echo $gd_neighbourhood;?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"

+                           value="<?php echo $country; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"

+                           value="<?php echo $region; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"

+                           value="<?php echo $city; ?>"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"

+                           value="<?php echo $gd_neighbourhood; ?>"/>

                 <?php } else { //end of location filter

                     ?>

-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>

+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>

                 <?php }?>

 

-                <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>

+                <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>

 

                 <input type="hidden" name="limitstart" value=""/>

 

@@ -416,8 +416,8 @@ 
                     }

                     if (count($map_post_types) > 1) {

                         ?>

-                        <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"

-                             style="max-width:<?php echo $map_width;?>!important;">

+                        <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"

+                             style="max-width:<?php echo $map_width; ?>!important;">

 

                             <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>

                             <div class="geodir-map-posttype-list"><?php } ?>

@@ -428,7 +428,7 @@ 
                                     foreach ($post_types as $post_type => $args) {

                                         if (!in_array($post_type, $exclude_post_types)) {

                                             $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

-											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>';

+											echo '<li id="'.$post_type.'" '.$class.'><a href="javascript:void(0);" onclick="jQuery(\'#'.$map_canvas_name.'_posttype\').val(\''.$post_type.'\');build_map_ajax_search_param(\''.$map_canvas_name.'\', true)">'.__($args->labels->name, 'geodirectory').'</a></li>';

                                         }

                                     }

                                     ?>

@@ -453,8 +453,8 @@ 
         <script type="text/javascript">

 

             jQuery(document).ready(function () {

-                build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);

-                map_sticky('<?php echo $map_canvas_name;?>');

+                build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);

+                map_sticky('<?php echo $map_canvas_name; ?>');

             });

 

         </script>

@@ -465,18 +465,18 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";

 

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

+                    jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');

 

                 }());

             </script>

@@ -488,13 +488,13 @@ 
             <script>

                 (function () {

                     var screenH = jQuery(window).height();

-                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";

+                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";

                     var ptypeH = '';

-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {

-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();

+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {

+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();

                     }

 

-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');

+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');

 

                 }());

             </script>

@@ -509,7 +509,7 @@ 
          * @param array $geodir_map_options Array of map settings.

          * @param string $map_canvas_name The canvas name and ID for the map.

          */

-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);

+        do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);

 

 

     endif; // Exclude posttypes if end

geodirectory-functions/map-functions/map_on_add_listing_page.php

Braces +7 added lines, -5 removed lines

@@ -46,9 +46,10 @@ 
 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

     $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

-}

+    if (isset($_REQUEST['add_hood'])) {
+            $mapzoom = 10;
+    }
+    }

 

 /**

  * Filter the auto change address fields values

@@ -737,8 +738,9 @@ 
 </script>

 <?php

 $set_button_class = 'geodir_button';

-if (is_admin())

-    $set_button_class = 'button-primary';

+if (is_admin()) {
+    $set_button_class = 'button-primary';
+}
 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

Indentation +70 added lines, -70 removed lines

@@ -35,19 +35,19 @@ 
 $defaultcity = isset($default_location->city) ? $default_location->city : '';

 $lat_lng_blank = false;

 if ($lat == '' && $lng == '') {

-    $lat_lng_blank = true;

-    $city = $defaultcity;

-    $region = isset($default_location->region) ? $default_location->region : '';

-    $country = isset($default_location->country) ? $default_location->country : '';

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

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

+	$lat_lng_blank = true;

+	$city = $defaultcity;

+	$region = isset($default_location->region) ? $default_location->region : '';

+	$country = isset($default_location->country) ? $default_location->country : '';

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

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

 }

 $default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

 if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {

-    $mapzoom = 4;

-    if (isset($_REQUEST['add_hood']))

-        $mapzoom = 10;

+	$mapzoom = 4;

+	if (isset($_REQUEST['add_hood']))

+		$mapzoom = 10;

 }

 

 /**

@@ -68,7 +68,7 @@ 
 	 * Fires at the start of the add javascript on the add lsitings map.

 	 *

 	 * @since 1.0.0

-     * @param string $prefix The prefix for all elements.

+	 * @param string $prefix The prefix for all elements.

 	 */

 	do_action('geodir_add_listing_js_start', $prefix);

 	?>

@@ -290,12 +290,12 @@ 
             // fix for regions in GB

 

             $country_arr = <?php

-            /**

-             * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

-             *

-             * @since 1.6.16

-             */

-            echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

+			/**

+			 * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1.

+			 *

+			 * @since 1.6.16

+			 */

+			echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

             if (jQuery.inArray(rr, $country_arr) !== -1) {

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -396,13 +396,13 @@ 
                 getZip = postal_code.long_name;

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

@@ -483,15 +483,15 @@ 
             }

         }

         <?php

-        /**

-         * Fires when marker address updated on map.

-         *

-         * @since 1.0.0

-         * @param string $prefix Identifier used as a prefix for field name

-         */

-        do_action('geodir_update_marker_address', $prefix);

-        echo $updateMarkerAddress = ob_get_clean();

-        ?>

+		/**

+		 * Fires when marker address updated on map.

+		 *

+		 * @since 1.0.0

+		 * @param string $prefix Identifier used as a prefix for field name

+		 */

+		do_action('geodir_update_marker_address', $prefix);

+		echo $updateMarkerAddress = ob_get_clean();

+		?>

     }

     function geodir_codeAddress(set_on_map) {

         var address = jQuery('#<?php echo $prefix.'address';?>').val();

@@ -506,17 +506,17 @@ 
         }

         if(!ISO2){

             <?php

-            if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

-                global $wpdb;

-                $location_result = geodir_get_default_location();

-                if(!empty($location_result)){

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

-                    echo "ISO2 = '$ISO2';";

-                }

-            }

+			if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

+				global $wpdb;

+				$location_result = geodir_get_default_location();

+				if(!empty($location_result)){

+					$ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s",$location_result->country));

+					echo "ISO2 = '$ISO2';";

+				}

+			}

 

 

-            ?>

+			?>

         }

         if (ISO2 == '--') {

             ISO2 = '';

@@ -536,9 +536,9 @@ 
         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

-        $defaultregion = isset($default_location->region) ? $default_location->region : '';

-        $defaultcountry = isset($default_location->country) ? $default_location->country : '';

-        ?>

+		$defaultregion = isset($default_location->region) ? $default_location->region : '';

+		$defaultcountry = isset($default_location->country) ? $default_location->country : '';

+		?>

         if (set_on_map && is_restrict) {

             if (zip != '' && address != '') {

                 address = address + ',' + zip;

@@ -550,12 +550,12 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+			if(is_admin() && isset($_REQUEST['tab'])){?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

             <?php

-               }?>

+			   }?>

 

             if (ISO2 == 'GB') {

                 if(ISO2){

@@ -579,15 +579,15 @@ 
             address =  address.replace(",null,", ",");

         }

         <?php $codeAddress = ob_get_clean();

-        /**

-         * Filter the address variable

-         *

-         * @since 1.0.0

-         *

-         * @param string $codeAddress Row of address to use in google map.

-         */

-        echo apply_filters('geodir_codeaddress', $codeAddress);

-        ?>

+		/**

+		 * Filter the address variable

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param string $codeAddress Row of address to use in google map.

+		 */

+		echo apply_filters('geodir_codeaddress', $codeAddress);

+		?>

         if (!window.gdMaps) { // No Google Map Loaded

             return;

         }

@@ -614,13 +614,13 @@ 
                         updateMarkerPosition(baseMarker.getPosition());

                         //if(set_on_map && is_restrict) {

                         <?php 

-                        /**

-                         * Fires before set geocode position.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_add_listing_codeaddress_before_geocode');

-                        ?>

+						/**

+						 * Fires before set geocode position.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_add_listing_codeaddress_before_geocode');

+						?>

                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

@@ -666,13 +666,13 @@ 
                 updateMarkerPositionOSM(baseMarker.getLatLng());

             }

             <?php 

-            /**

-             * Fires to add javascript variable to use in google map.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_add_listing_geocode_js_vars');

-            ?>

+			/**

+			 * Fires to add javascript variable to use in google map.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_add_listing_geocode_js_vars');

+			?>

             <?php if ($is_map_restrict) { ?>

             if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

                 alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

@@ -821,7 +821,7 @@ 
 <?php

 $set_button_class = 'geodir_button';

 if (is_admin())

-    $set_button_class = 'button-primary';

+	$set_button_class = 'button-primary';

 ?>

 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>

 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

Spacing +82 added lines, -82 removed lines

@@ -82,16 +82,16 @@ 
     window.gdMaps = window.gdMaps || gdMaps;

     

     user_address = false;

-    jQuery('#<?php echo $prefix.'address';?>').keypress(function () {

+    jQuery('#<?php echo $prefix.'address'; ?>').keypress(function () {

         user_address = true;

     });

 

     baseMarker = '';

     geocoder = '';

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat :  '39.952484'; ?>;

-    var <?php echo $prefix;?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng :  '-75.163786'; ?>;

-    <?php if($lat_lng_blank){$lat='';$lng='';}?>

-    var <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12;?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>;

+    var <?php echo $prefix; ?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>;

+    <?php if ($lat_lng_blank) {$lat = ''; $lng = ''; }?>

+    var <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12; ?>;

     var minZoomLevel = <?php echo ($is_map_restrict) ? 5 : 0; ?>;

     var oldstr_address;

     var oldstr_zip;

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

              * @since 1.6.16

              */

-            echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;

+            echo apply_filters("geodir_geocode_region_level", '["GB","ES"]'); ?>;

             if (jQuery.inArray(rr, $country_arr) !== -1) {

                 if (administrative_area_level_2.long_name) {

                     getState = administrative_area_level_2.long_name;

@@ -404,9 +404,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 jQuery.goMap.map.setCenter(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setPosition(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPosition(baseMarker.getPosition());

@@ -415,11 +415,11 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     function centerMap(latlng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         if (window.gdMaps == 'google') {

             jQuery.goMap.map.panTo(baseMarker.getPosition());

         } else if (window.gdMaps == 'osm') {

@@ -428,7 +428,7 @@ 
         }

     }

     function centerMarker() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

         var center = jQuery.goMap.map.getCenter();

         if (window.gdMaps == 'google') {

             baseMarker.setPosition(center);

@@ -437,48 +437,48 @@ 
         }

     }

     function updateMapZoom(zoom) {

-        jQuery('#<?php echo $prefix.'mapzoom';?>').val(zoom);

+        jQuery('#<?php echo $prefix.'mapzoom'; ?>').val(zoom);

     }

     function updateMarkerPosition(markerlatLng) {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat());

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng());

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat());

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng());

     }

     function updateMarkerPositionOSM(markerlatLng) {

-        jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat);

-        jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng);

+        jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat);

+        jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng);

     }

     function updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry) {

-        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields);?>';

-        <?php ob_start();?>

-        var old_country = jQuery("#<?php echo $prefix.'country';?>").val();

-        var old_region = jQuery("#<?php echo $prefix.'region';?>").val();

+        var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields); ?>';

+        <?php ob_start(); ?>

+        var old_country = jQuery("#<?php echo $prefix.'country'; ?>").val();

+        var old_region = jQuery("#<?php echo $prefix.'region'; ?>").val();

         

-        if (user_address == false || jQuery('#<?php echo $prefix.'address';?>').val() == '') {

-            jQuery("#<?php echo $prefix.'address';?>").val(getAddress).trigger("blur");

+        if (user_address == false || jQuery('#<?php echo $prefix.'address'; ?>').val() == '') {

+            jQuery("#<?php echo $prefix.'address'; ?>").val(getAddress).trigger("blur");

         }

         if (getAddress) {

             oldstr_address = getAddress;

         }

 

-        jQuery("#<?php echo $prefix.'zip';?>").val(getZip);

+        jQuery("#<?php echo $prefix.'zip'; ?>").val(getZip);

         if (getZip) {

             oldstr_zip = getZip;

         }

         if (set_map_val_in_fields) {

             if (getCountry) {

-                jQuery('#<?php echo $prefix .'country'; ?> option[value=""]').attr("selected",false);

-                jQuery('#<?php echo $prefix.'country';?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

-                jQuery("#<?php echo $prefix.'country';?>").trigger("chosen:updated");

+                jQuery('#<?php echo $prefix.'country'; ?> option[value=""]').attr("selected",false);

+                jQuery('#<?php echo $prefix.'country'; ?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);

+                jQuery("#<?php echo $prefix.'country'; ?>").trigger("chosen:updated");

             }

             if (getState) {

-                if (jQuery('input[id="<?php echo $prefix.'region';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'region';?>").val(getState);

+                if (jQuery('input[id="<?php echo $prefix.'region'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'region'; ?>").val(getState);

                 }

             }

             if (getCity) {

-                if (jQuery('input[id="<?php echo $prefix.'city';?>"]').attr('id')) {

-                    jQuery("#<?php echo $prefix.'city';?>").val(getCity);

+                if (jQuery('input[id="<?php echo $prefix.'city'; ?>"]').attr('id')) {

+                    jQuery("#<?php echo $prefix.'city'; ?>").val(getCity);

                 }

             }

         }

@@ -494,23 +494,23 @@ 
         ?>

     }

     function geodir_codeAddress(set_on_map) {

-        var address = jQuery('#<?php echo $prefix.'address';?>').val();

-        var zip = jQuery('#<?php echo $prefix.'zip';?>').val();

-        var city = jQuery('#<?php echo $prefix.'city';?>').val();

-        var region = jQuery('#<?php echo $prefix.'region';?>').val();

-        var country = jQuery('#<?php echo $prefix.'country';?>').val();

-        var country_selected = jQuery('#<?php echo $prefix.'country';?>').find('option:selected');

+        var address = jQuery('#<?php echo $prefix.'address'; ?>').val();

+        var zip = jQuery('#<?php echo $prefix.'zip'; ?>').val();

+        var city = jQuery('#<?php echo $prefix.'city'; ?>').val();

+        var region = jQuery('#<?php echo $prefix.'region'; ?>').val();

+        var country = jQuery('#<?php echo $prefix.'country'; ?>').val();

+        var country_selected = jQuery('#<?php echo $prefix.'country'; ?>').find('option:selected');

         var ISO2 = country_selected.data('country_code');

-        if (!ISO2 && jQuery('#<?php echo $prefix.'country';?>').data('country_code')) {

-            ISO2 = jQuery('#<?php echo $prefix.'country';?>').data('country_code');

+        if (!ISO2 && jQuery('#<?php echo $prefix.'country'; ?>').data('country_code')) {

+            ISO2 = jQuery('#<?php echo $prefix.'country'; ?>').data('country_code');

         }

         if(!ISO2){

             <?php

-            if(!defined('GEODIRLOCATION_TEXTDOMAIN')){

+            if (!defined('GEODIRLOCATION_TEXTDOMAIN')) {

                 global $wpdb;

                 $location_result = geodir_get_default_location();

-                if(!empty($location_result)){

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

+                if (!empty($location_result)) {

+                    $ISO2 = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country=%s", $location_result->country));

                     echo "ISO2 = '$ISO2';";

                 }

             }

@@ -526,13 +526,13 @@ 
             zip = '';

         }

         if (typeof city == "undefined") {

-            city = '<?php echo addslashes_gpc($city);?>';

+            city = '<?php echo addslashes_gpc($city); ?>';

         }

         if (typeof region == "undefined") {

-            region = '<?php echo addslashes_gpc($region);?>';

+            region = '<?php echo addslashes_gpc($region); ?>';

         }

         if (typeof country == "undefined") {

-            country = '<?php echo addslashes_gpc($country);?>';

+            country = '<?php echo addslashes_gpc($country); ?>';

         }

         var is_restrict = '<?php echo $is_map_restrict; ?>';

         <?php ob_start();

@@ -550,7 +550,7 @@ 
             if( address == city || address == region || address == country || address == zip )

                 address = '';

             <?php

-            if(is_admin() && isset($_REQUEST['tab'])){?>

+            if (is_admin() && isset($_REQUEST['tab'])) {?>

             if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {

                 address = '';

             }

@@ -607,7 +607,7 @@ 
             geocoder.geocode({'address': address, 'country': ISO2},

                 function (results, status) {

                     console.log(status);

-                    jQuery("#<?php echo $prefix.'map';?>").goMap();

+                    jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         baseMarker.setPosition(results[0].geometry.location);

                         jQuery.goMap.map.setCenter(results[0].geometry.location);

@@ -624,21 +624,21 @@ 
                         geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});

                         //}

                     } else {

-                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:','geodirectory'));?> ' + status);

+                        alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:', 'geodirectory')); ?> ' + status);

                     }

                 });

         }

     }

     function gdMaxMap() {

-        jQuery("#<?php echo $prefix.'map';?>").goMap();

+        jQuery("#<?php echo $prefix.'map'; ?>").goMap();

 

-        jQuery('#<?php echo $prefix.'map';?>').toggleClass('map-fullscreen');

+        jQuery('#<?php echo $prefix.'map'; ?>').toggleClass('map-fullscreen');

         jQuery('.map_category').toggleClass('map_category_fullscreen');

-        jQuery('#<?php echo $prefix;?>trigger').toggleClass('map_category_fullscreen');

+        jQuery('#<?php echo $prefix; ?>trigger').toggleClass('map_category_fullscreen');

         jQuery('body').toggleClass('body_fullscreen');

-        jQuery('#<?php echo $prefix;?>loading_div').toggleClass('loading_div_fullscreen');

-        jQuery('#<?php echo $prefix;?>advmap_nofound').toggleClass('nofound_fullscreen');

-        jQuery('#<?php echo $prefix;?>triggermap').toggleClass('triggermap_fullscreen');

+        jQuery('#<?php echo $prefix; ?>loading_div').toggleClass('loading_div_fullscreen');

+        jQuery('#<?php echo $prefix; ?>advmap_nofound').toggleClass('nofound_fullscreen');

+        jQuery('#<?php echo $prefix; ?>triggermap').toggleClass('triggermap_fullscreen');

         jQuery('.TopLeft').toggleClass('TopLeft_fullscreen');

         window.setTimeout(function () {

             if (window.gdMaps == 'google') {

@@ -674,9 +674,9 @@ 
             do_action('geodir_add_listing_geocode_js_vars');

             ?>

             <?php if ($is_map_restrict) { ?>

-            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {

-                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');

-                jQuery("#<?php echo $prefix.'map';?>").goMap();

+            if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {

+                alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');

+                jQuery("#<?php echo $prefix.'map'; ?>").goMap();

                 centerMap(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 baseMarker.setLatLng(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));

                 updateMarkerPositionOSM(baseMarker.getLatLng());

@@ -685,39 +685,39 @@ 
             <?php } ?>

             updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry);

         } else {

-            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');

+            alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');

         }

     }

     

     jQuery(function ($) {

-        $("#<?php echo $prefix.'map';?>").goMap({

-            latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-            longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

-            zoom: <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT,

+        $("#<?php echo $prefix.'map'; ?>").goMap({

+            latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+            longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

+            zoom: <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT,

             maptype: 'ROADMAP', // Map type - HYBRID, ROADMAP, SATELLITE, TERRAIN

             streetViewControl: true,

-            <?php if(get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,';}?>

+            <?php if (get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,'; }?>

         });

 

         if (window.gdMaps) {

             geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : [];

 

             baseMarker = $.goMap.createMarker({

-                latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT,

-                longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG,

+                latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT,

+                longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG,

                 id: 'baseMarker',

-                icon: '<?php echo $marker_icon;?>',

+                icon: '<?php echo $marker_icon; ?>',

                 draggable: true,

                 addToMap: true, // For OSM

-                w: parseFloat('<?php echo $icon_size['w'];?>'),

-                h: parseFloat('<?php echo $icon_size['h'];?>'),

+                w: parseFloat('<?php echo $icon_size['w']; ?>'),

+                h: parseFloat('<?php echo $icon_size['h']; ?>'),

             });

         } else {

-            jQuery('#<?php echo $prefix.'advmap_nofound';?>').hide();

-            jQuery('#<?php echo $prefix.'advmap_notloaded';?>').show();

+            jQuery('#<?php echo $prefix.'advmap_nofound'; ?>').hide();

+            jQuery('#<?php echo $prefix.'advmap_notloaded'; ?>').show();

         }

         

-        $("#<?php echo $prefix;?>set_address_button").click(function () {

+        $("#<?php echo $prefix; ?>set_address_button").click(function () {

             var set_on_map = true;

             geodir_codeAddress(set_on_map);

         });

@@ -752,14 +752,14 @@ 
                 updateMapZoom($.goMap.map.zoom);

             });

 

-            var maxMap = document.getElementById('<?php echo $prefix;?>triggermap');

+            var maxMap = document.getElementById('<?php echo $prefix; ?>triggermap');

             google.maps.event.addDomListener(maxMap, 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country); ?>';

             geocoder.geocode({'address': CITY_ADDRESS},

                 function (results, status) {

-                    $("#<?php echo $prefix.'map';?>").goMap();

+                    $("#<?php echo $prefix.'map'; ?>").goMap();

                     if (status == google.maps.GeocoderStatus.OK) {

                         // Bounds for North America

                         var bound_lat_lng = String(results[0].geometry.bounds);

@@ -770,13 +770,13 @@ 
                             new google.maps.LatLng(bound_lat_lng[2], bound_lat_lng[3])

                         );

                     } else {

-                        alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                        alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                     }

                 });

             <?php } ?>

             // Limit the zoom level

             google.maps.event.addListener($.goMap.map, 'zoom_changed', function () {

-                $("#<?php echo $prefix.'map';?>").goMap();

+                $("#<?php echo $prefix.'map'; ?>").goMap();

                 if ($.goMap.map.getZoom() < minZoomLevel) $.goMap.map.setZoom(minZoomLevel);

             });

         } else if (window.gdMaps == 'osm') {

@@ -802,10 +802,10 @@ 
                 updateMapZoom($.goMap.map.getZoom());

             });

 

-            L.DomEvent.addListener($('<?php echo $prefix;?>triggermap'), 'click', gdMaxMap);

+            L.DomEvent.addListener($('<?php echo $prefix; ?>triggermap'), 'click', gdMaxMap);

 

             <?php if ($is_map_restrict) { ?>

-            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country);?>';

+            var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country); ?>';

             //geocodePositionOSM('', CITY_ADDRESS);

             <?php } ?>

             // Limit the zoom level

@@ -828,14 +828,14 @@ 
 <div class="top_banner_section_inn geodir_map_container clearfix" style="margin-top:10px;">

     <div class="TopLeft"><span id="<?php echo $prefix; ?>triggermap" style="margin-top:-11px;margin-left:-12px;"></span></div>

     <div class="TopRight"></div>

-    <div id="<?php echo $prefix . 'map'; ?>" class="geodir_map" style="height:300px">

+    <div id="<?php echo $prefix.'map'; ?>" class="geodir_map" style="height:300px">

         <!-- new map start -->

         <div class="iprelative">

-            <div id="<?php echo $prefix . 'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

+            <div id="<?php echo $prefix.'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div>

             <div id="<?php echo $prefix; ?>loading_div" style="height:300px"></div>

             <div id="<?php echo $prefix; ?>advmap_counter"></div>

             <div id="<?php echo $prefix; ?>advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>

-            <div id="<?php echo $prefix;?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

+            <div id="<?php echo $prefix; ?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>

         </div>

         <!-- new map end -->

     </div>

geodirectory_shortcodes.php

Braces +1 added lines, -1 removed lines

@@ -427,7 +427,7 @@
         }
 
         return $output;
-    }else{
+    } else{
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array

Indentation +909 added lines, -909 removed lines

@@ -7,7 +7,7 @@ 
  */
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 require_once('geodirectory-functions/shortcode_functions.php');
 
@@ -32,43 +32,43 @@ 
  */
 function geodir_sc_add_listing($atts)
 {
-    ob_start();
-    $defaults = array(
-        'pid' => '',
-        'listing_type' => 'gd_place',
-        'login_msg' => __('You must login to post.', 'geodirectory'),
-        'show_login' => false,
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    foreach ($params as $key => $value) {
-        $_REQUEST[$key] = $value;
-    }
-
-    $user_id = get_current_user_id();
-    if (!$user_id) {
-        echo $params['login_msg'];
-        if ($params['show_login']) {
-            echo "<br />";
-            $defaults = array(
-                'before_widget' => '',
-                'after_widget' => '',
-                'before_title' => '',
-                'after_title' => '',
-            );
-
-            geodir_loginwidget_output($defaults, $defaults);
-        }
-
-
-    } else {
-       // Add listing page will be used if shortcode is detected in page content, no need to call it here
-    }
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	$defaults = array(
+		'pid' => '',
+		'listing_type' => 'gd_place',
+		'login_msg' => __('You must login to post.', 'geodirectory'),
+		'show_login' => false,
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	foreach ($params as $key => $value) {
+		$_REQUEST[$key] = $value;
+	}
+
+	$user_id = get_current_user_id();
+	if (!$user_id) {
+		echo $params['login_msg'];
+		if ($params['show_login']) {
+			echo "<br />";
+			$defaults = array(
+				'before_widget' => '',
+				'after_widget' => '',
+				'before_title' => '',
+				'after_title' => '',
+			);
+
+			geodir_loginwidget_output($defaults, $defaults);
+		}
+
+
+	} else {
+	   // Add listing page will be used if shortcode is detected in page content, no need to call it here
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -96,136 +96,136 @@ 
  */
 function geodir_sc_home_map($atts)
 {
-    ob_start();
-    $defaults = array(
-        'width' => '960',
-        'height' => '425',
-        'maptype' => 'ROADMAP',
-        'zoom' => '13',
-        'autozoom' => '',
-        'child_collapse' => '0',
-        'scrollwheel' => '0',
+	ob_start();
+	$defaults = array(
+		'width' => '960',
+		'height' => '425',
+		'maptype' => 'ROADMAP',
+		'zoom' => '13',
+		'autozoom' => '',
+		'child_collapse' => '0',
+		'scrollwheel' => '0',
 		'marker_cluster' => false,
-        'latitude' => '',
-        'longitude' => ''
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_home_map',
-        'latitude' => $params['latitude'],
-        'longitude' => $params['longitude'],
-
-        /**
-         * Filter the widget width of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['width'] The map width.
-         */
-        'width' => apply_filters('widget_width', $params['width']),
-        /**
-         * Filter the widget height of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['height'] The map height.
-         */
-        'height' => apply_filters('widget_heigh', $params['height']),
-        /**
-         * Filter the widget maptype of the map on home/listings page.
-         *
-         * @since 1.0.0
+		'latitude' => '',
+		'longitude' => ''
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_home_map',
+		'latitude' => $params['latitude'],
+		'longitude' => $params['longitude'],
+
+		/**
+		 * Filter the widget width of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['width'] The map width.
+		 */
+		'width' => apply_filters('widget_width', $params['width']),
+		/**
+		 * Filter the widget height of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['height'] The map height.
+		 */
+		'height' => apply_filters('widget_heigh', $params['height']),
+		/**
+		 * Filter the widget maptype of the map on home/listings page.
+		 *
+		 * @since 1.0.0
 		 * @since 1.5.2 Added TERRAIN map type.
-         * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
-         */
-        'maptype' => apply_filters('widget_maptype', $params['maptype']),
-        /**
-         * Filter the widget scrollwheel value of the map on home/listings page.
-         *
-         * Should the scrollwheel zoom the map or not.
-         *
-         * @since 1.0.0
-         * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
-         */
-        'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
-        /**
-         * Filter the widget zoom level of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param int $params['zoom'] The zoom level of the map. Between 1-19.
-         */
-        'zoom' => apply_filters('widget_zoom', $params['zoom']),
-        /**
-         * Filter the widget auto zoom value of the map on home/listings page.
-         *
-         * If the map should autozoom to fit the markers shown.
-         *
-         * @since 1.0.0
-         * @param bool $params['autozoom'] True if the map should autozoom, false if not.
-         */
-        'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
-        /**
-         * Filter the widget child_collapse value of the map on home/listings page.
-         *
-         * If the map should auto collapse the child categories if the category bar is present.
-         *
-         * @since 1.0.0
-         * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
-         */
-        'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
-        'enable_cat_filters' => true,
-        'enable_text_search' => true,
-        'enable_post_type_filters' => true,
-        /**
-         * Filter the widget enable_location_filters value of the map on home/listings page.
-         *
-         * This is used when the location addon is used.
-         *
-         * @since 1.0.0
-         * @param bool $val True if location filters should be used, false if not.
-         */
-        'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
-        'enable_jason_on_load' => false,
-        'enable_marker_cluster' => false,
-        'enable_map_resize_button' => true,
-        'map_class_name' => 'geodir-map-home-page',
-        'is_geodir_home_map_widget' => true,
-    );
+		 * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
+		 */
+		'maptype' => apply_filters('widget_maptype', $params['maptype']),
+		/**
+		 * Filter the widget scrollwheel value of the map on home/listings page.
+		 *
+		 * Should the scrollwheel zoom the map or not.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
+		 */
+		'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
+		/**
+		 * Filter the widget zoom level of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param int $params['zoom'] The zoom level of the map. Between 1-19.
+		 */
+		'zoom' => apply_filters('widget_zoom', $params['zoom']),
+		/**
+		 * Filter the widget auto zoom value of the map on home/listings page.
+		 *
+		 * If the map should autozoom to fit the markers shown.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['autozoom'] True if the map should autozoom, false if not.
+		 */
+		'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
+		/**
+		 * Filter the widget child_collapse value of the map on home/listings page.
+		 *
+		 * If the map should auto collapse the child categories if the category bar is present.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
+		 */
+		'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
+		'enable_cat_filters' => true,
+		'enable_text_search' => true,
+		'enable_post_type_filters' => true,
+		/**
+		 * Filter the widget enable_location_filters value of the map on home/listings page.
+		 *
+		 * This is used when the location addon is used.
+		 *
+		 * @since 1.0.0
+		 * @param bool $val True if location filters should be used, false if not.
+		 */
+		'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
+		'enable_jason_on_load' => false,
+		'enable_marker_cluster' => false,
+		'enable_map_resize_button' => true,
+		'map_class_name' => 'geodir-map-home-page',
+		'is_geodir_home_map_widget' => true,
+	);
 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-        $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
-            if ($map_args['autozoom']) {
-                $map_args['enable_marker_cluster_no_reposition'] = false;
-            } else {
-                $map_args['enable_marker_cluster_no_reposition'] = true;
-            }
+		$map_args['enable_marker_cluster'] = true;
+		if(get_option('geodir_marker_cluster_type')) {
+			if ($map_args['autozoom']) {
+				$map_args['enable_marker_cluster_no_reposition'] = false;
+			} else {
+				$map_args['enable_marker_cluster_no_reposition'] = true;
+			}
 
-            $map_args['enable_marker_cluster_server'] = true ;
+			$map_args['enable_marker_cluster_server'] = true ;
 
-        }
+		}
 	} else {
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
-        $map_args['enable_marker_cluster_no_reposition'] = true;
-    }
+	// if lat and long set in shortcode, hack it so the map is not repositioned
+	if(!empty($params['latitude']) && !empty($params['longitude']) ){
+		$map_args['enable_marker_cluster_no_reposition'] = true;
+	}
 
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    add_action('wp_footer', 'geodir_home_map_add_script', 100);
+	add_action('wp_footer', 'geodir_home_map_add_script', 100);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_homepage_map', 'geodir_sc_home_map');
 
@@ -264,218 +264,218 @@ 
  */
 function geodir_sc_listing_map($atts) {
 
-    // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
-
-        global $add_post_in_marker_array, $gd_sc_map_params;
-        $backup_globals                             = array();
-        $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
-        $backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
-
-        $defaults = array(
-            'width'          => '294',
-            'height'         => '370',
-            'zoom'           => '13',
-            'autozoom'       => '',
-            'sticky'         => '',
-            'showall'        => '0',
-            'scrollwheel'    => '0',
-            'maptype'        => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false,
-            'post_type'      => 'gd_place',
-            'category'       => '0',
-            'event_type'     => 'all'
-        );
-
-        $params = shortcode_atts( $defaults, $atts );
-
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
-            $params['post_type'] = 'gd_place';
-        }
-
-        // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
-            'orderby' => 'count',
-            'order'   => 'DESC',
-            'fields'  => 'ids'
-        ) );
-
-        // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
-        }
-
-        // Array_intersect returns only the items in $params['category'] that are also in our category list
-        // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
-
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
-        }
-
-        $params = gdsc_validate_map_args( $params );
-
-        $gd_sc_map_params = $params;
-
-        $query_args = array(
-            'posts_per_page' => 1000000, //@todo kiran why was this added? 
-            'is_geodir_loop' => true,
-            'gd_location'    => false,
-            'post_type'      => $params['post_type'],
-        );
-
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-
-            ######### WPML #########
-            if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
-            }
-            ######### WPML #########
-
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field'    => 'id',
-                'terms'    => $params['category']
-            );
-
-            $query_args['tax_query'] = array( $tax_query );
-        }
-
-        $add_post_in_marker_array = true;
-
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
-            global $geodir_event_widget_listview;
-            $geodir_event_widget_listview = true;
-
-            $query_args['geodir_event_type'] = $params['event_type'];
-
-            $listings = geodir_event_get_widget_events( $query_args );
-
-            $geodir_event_widget_listview = false;
-        } else {
-            $listings = geodir_get_widget_listings( $query_args );
-        }
-
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
-            }
-        }
-
-        ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
-
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
-
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
-
-        $default_location = geodir_get_default_location();
-
-        $map_args = array(
-            'map_canvas_name'          => 'gd_listing_map',
-            'width'                    => $params['width'],
-            'height'                   => $params['height'],
-            'zoom'                     => $params['zoom'],
-            'autozoom'                 => $params['autozoom'],
-            'sticky'                   => $params['sticky'],
-            'showall'                  => $params['showall'],
-            'scrollwheel'              => $params['scrollwheel'],
-            'maptype'                  => $params['maptype'],
-            'child_collapse'           => 0,
-            'enable_cat_filters'       => false,
-            'enable_text_search'       => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters'  => false,
-            'enable_jason_on_load'     => true,
-            'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
-            'streetViewControl'        => true,
-            'showPreview'              => '0',
-            'maxZoom'                  => 21,
-            'bubble_size'              => 'small',
-        );
-
-        if ( is_single() ) {
-            global $post;
-            if ( isset( $post->post_latitude ) ) {
-                $map_args['latitude']  = $post->post_latitude;
-                $map_args['longitude'] = $post->post_longitude;
-            }
-
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
-        }
-
-        // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-
-        geodir_draw_map( $map_args );
-
-        $output = ob_get_contents();
-
-        ob_end_clean();
-
-        foreach ( $backup_globals as $global => $value ) {
-            ${$global} = $value;
-        }
-
-        return $output;
-    }else{
-        ob_start();
-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
-        $defaults = array(
-            'width' => '294',
-            'height' => '370',
-            'zoom' => '13',
-            'autozoom' => '',
-            'sticky' => '',
-            'showall' => '0',
-            'scrollwheel' => '0',
-            'maptype' => 'ROADMAP',
-            'child_collapse' => 0,
-            'marker_cluster' => false
-        );
-        $params = shortcode_atts($defaults, $atts);
-        $params = gdsc_validate_map_args($params);
-        $map_args = array(
-            'map_canvas_name' => 'gd_listing_map',
-            'width' => $params['width'],
-            'height' => $params['height'],
-            'zoom' => $params['zoom'],
-            'autozoom' => $params['autozoom'],
-            'sticky' => $params['sticky'],
-            'showall' => $params['showall'],
-            'scrollwheel' => $params['scrollwheel'],
-            'child_collapse' => 0,
-            'enable_cat_filters' => false,
-            'enable_text_search' => false,
-            'enable_post_type_filters' => false,
-            'enable_location_filters' => false,
-            'enable_jason_on_load' => true,
-        );
-        if (is_single()) {
-            global $post;
-            $map_default_lat = $address_latitude = $post->post_latitude;
-            $map_default_lng = $address_longitude = $post->post_longitude;
-            $mapview = $post->post_mapview;
-            $map_args['zoom'] = $post->post_mapzoom;
-            $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-        } else {
-            $default_location = geodir_get_default_location();
-            $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            $map_args['map_class_name'] = 'geodir-map-listing-page';
+	// if some params are set then we need a new query, if not then we can use the main query
+	if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+
+		global $add_post_in_marker_array, $gd_sc_map_params;
+		$backup_globals                             = array();
+		$backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array;
+		$backup_globals['gd_sc_map_params']         = $gd_sc_map_params;
+
+		$defaults = array(
+			'width'          => '294',
+			'height'         => '370',
+			'zoom'           => '13',
+			'autozoom'       => '',
+			'sticky'         => '',
+			'showall'        => '0',
+			'scrollwheel'    => '0',
+			'maptype'        => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false,
+			'post_type'      => 'gd_place',
+			'category'       => '0',
+			'event_type'     => 'all'
+		);
+
+		$params = shortcode_atts( $defaults, $atts );
+
+		if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+			$params['post_type'] = 'gd_place';
+		}
+
+		// Validate the selected category/ies - Grab the current list based on post_type
+		$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+		$categories        = get_terms( $category_taxonomy, array(
+			'orderby' => 'count',
+			'order'   => 'DESC',
+			'fields'  => 'ids'
+		) );
+
+		// Make sure we have an array
+		if ( ! ( is_array( $params['category'] ) ) ) {
+			$params['category'] = explode( ',', $params['category'] );
+		}
+
+		// Array_intersect returns only the items in $params['category'] that are also in our category list
+		// Otherwise it becomes empty and later on that will mean "All"
+		$params['category'] = array_intersect( $params['category'], $categories );
+
+		if ( $params['post_type'] == 'gd_event' ) {
+			$params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+		}
+
+		$params = gdsc_validate_map_args( $params );
+
+		$gd_sc_map_params = $params;
+
+		$query_args = array(
+			'posts_per_page' => 1000000, //@todo kiran why was this added? 
+			'is_geodir_loop' => true,
+			'gd_location'    => false,
+			'post_type'      => $params['post_type'],
+		);
+
+		if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
+			$category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+
+			######### WPML #########
+			if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
+				$category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+			}
+			######### WPML #########
+
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field'    => 'id',
+				'terms'    => $params['category']
+			);
+
+			$query_args['tax_query'] = array( $tax_query );
+		}
+
+		$add_post_in_marker_array = true;
+
+		if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+			global $geodir_event_widget_listview;
+			$geodir_event_widget_listview = true;
+
+			$query_args['geodir_event_type'] = $params['event_type'];
+
+			$listings = geodir_event_get_widget_events( $query_args );
+
+			$geodir_event_widget_listview = false;
+		} else {
+			$listings = geodir_get_widget_listings( $query_args );
+		}
+
+		if ( ! empty( $listings ) ) {
+			foreach ( $listings as $listing ) {
+				create_marker_jason_of_posts( $listing );
+			}
+		}
+
+		ob_start();
+		add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+
+		add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+
+		add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+
+		$default_location = geodir_get_default_location();
+
+		$map_args = array(
+			'map_canvas_name'          => 'gd_listing_map',
+			'width'                    => $params['width'],
+			'height'                   => $params['height'],
+			'zoom'                     => $params['zoom'],
+			'autozoom'                 => $params['autozoom'],
+			'sticky'                   => $params['sticky'],
+			'showall'                  => $params['showall'],
+			'scrollwheel'              => $params['scrollwheel'],
+			'maptype'                  => $params['maptype'],
+			'child_collapse'           => 0,
+			'enable_cat_filters'       => false,
+			'enable_text_search'       => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters'  => false,
+			'enable_jason_on_load'     => true,
+			'ajax_url'                 => geodir_get_ajax_url(),
+			'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
+			'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+			'streetViewControl'        => true,
+			'showPreview'              => '0',
+			'maxZoom'                  => 21,
+			'bubble_size'              => 'small',
+		);
+
+		if ( is_single() ) {
+			global $post;
+			if ( isset( $post->post_latitude ) ) {
+				$map_args['latitude']  = $post->post_latitude;
+				$map_args['longitude'] = $post->post_longitude;
+			}
+
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
+		}
+
+		// Add marker cluster
+		if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+
+		geodir_draw_map( $map_args );
+
+		$output = ob_get_contents();
+
+		ob_end_clean();
+
+		foreach ( $backup_globals as $global => $value ) {
+			${$global} = $value;
+		}
+
+		return $output;
+	}else{
+		ob_start();
+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array
+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
+		$defaults = array(
+			'width' => '294',
+			'height' => '370',
+			'zoom' => '13',
+			'autozoom' => '',
+			'sticky' => '',
+			'showall' => '0',
+			'scrollwheel' => '0',
+			'maptype' => 'ROADMAP',
+			'child_collapse' => 0,
+			'marker_cluster' => false
+		);
+		$params = shortcode_atts($defaults, $atts);
+		$params = gdsc_validate_map_args($params);
+		$map_args = array(
+			'map_canvas_name' => 'gd_listing_map',
+			'width' => $params['width'],
+			'height' => $params['height'],
+			'zoom' => $params['zoom'],
+			'autozoom' => $params['autozoom'],
+			'sticky' => $params['sticky'],
+			'showall' => $params['showall'],
+			'scrollwheel' => $params['scrollwheel'],
+			'child_collapse' => 0,
+			'enable_cat_filters' => false,
+			'enable_text_search' => false,
+			'enable_post_type_filters' => false,
+			'enable_location_filters' => false,
+			'enable_jason_on_load' => true,
+		);
+		if (is_single()) {
+			global $post;
+			$map_default_lat = $address_latitude = $post->post_latitude;
+			$map_default_lng = $address_longitude = $post->post_longitude;
+			$mapview = $post->post_mapview;
+			$map_args['zoom'] = $post->post_mapzoom;
+			$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+		} else {
+			$default_location = geodir_get_default_location();
+			$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			$map_args['map_class_name'] = 'geodir-map-listing-page';
 			if ( geodir_is_page( 'search' ) ) {
 				$map_default_lat = '';
 				$map_default_lng = '';
@@ -491,31 +491,31 @@ 
 					}
 				}
 			}
-        }
-        if (empty($mapview)) {
-            $mapview = 'ROADMAP';
-        }
-        // Set default map options
-        $map_args['ajax_url'] = geodir_get_ajax_url();
-        $map_args['latitude'] = $map_default_lat;
-        $map_args['longitude'] = $map_default_lng;
-        $map_args['streetViewControl'] = true;
-        $map_args['maptype'] = $mapview;
-        $map_args['showPreview'] = '0';
-        $map_args['maxZoom'] = 21;
-        $map_args['bubble_size'] = 'small';
-
-        // Add marker cluster
-        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-            $map_args['enable_marker_cluster'] = true;
-        } else {
-            $map_args['enable_marker_cluster'] = false;
-        }
-        geodir_draw_map($map_args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        return $output;
-    }
+		}
+		if (empty($mapview)) {
+			$mapview = 'ROADMAP';
+		}
+		// Set default map options
+		$map_args['ajax_url'] = geodir_get_ajax_url();
+		$map_args['latitude'] = $map_default_lat;
+		$map_args['longitude'] = $map_default_lng;
+		$map_args['streetViewControl'] = true;
+		$map_args['maptype'] = $mapview;
+		$map_args['showPreview'] = '0';
+		$map_args['maxZoom'] = 21;
+		$map_args['bubble_size'] = 'small';
+
+		// Add marker cluster
+		if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+			$map_args['enable_marker_cluster'] = true;
+		} else {
+			$map_args['enable_marker_cluster'] = false;
+		}
+		geodir_draw_map($map_args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		return $output;
+	}
 }
 
 add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider');
@@ -548,120 +548,120 @@ 
  */
 function geodir_sc_listing_slider($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'slideshow' => '0',
-        'animation_loop' => 0,
-        'direction_nav' => 0,
-        'slideshow_speed' => 5000,
-        'animation_speed' => 600,
-        'animation' => 'slide',
-        'order_by' => 'latest',
-        'show_title' => '',
-        'show_featured_only' => '',
-        'title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-
-    /*
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'slideshow' => '0',
+		'animation_loop' => 0,
+		'direction_nav' => 0,
+		'slideshow_speed' => 5000,
+		'animation_speed' => 600,
+		'animation' => 'slide',
+		'order_by' => 'latest',
+		'show_title' => '',
+		'show_featured_only' => '',
+		'title' => '',
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+
+	/*
      *
      * Now we begin the validation of the attributes.
      */
-    // Check we have a valid post_type
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Check we have a valid sort_order
-    $params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
-
-    // Match the chosen animation to our options
-    $animation_list = array('slide', 'fade');
-    if (!(in_array($params['animation'], $animation_list))) {
-        $params['animation'] = 'slide';
-    }
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Manage the entered categories
-    if (0 != $params['category'] || '' != $params['category']) {
-        $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
-    }
-    // Convert show_title to a bool
-    $params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
-
-    // Convert show_featured_only to a bool
-    $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
-
-    /*
+	// Check we have a valid post_type
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Check we have a valid sort_order
+	$params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
+
+	// Match the chosen animation to our options
+	$animation_list = array('slide', 'fade');
+	if (!(in_array($params['animation'], $animation_list))) {
+		$params['animation'] = 'slide';
+	}
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Manage the entered categories
+	if (0 != $params['category'] || '' != $params['category']) {
+		$params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
+	}
+	// Convert show_title to a bool
+	$params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
+
+	// Convert show_featured_only to a bool
+	$params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
+
+	/*
      * Hopefully all attributes are now valid, and safe to pass forward
      */
 
-    // redeclare vars after validation
-
-    if (isset($params['direction_nav'])) {
-        $params['directionNav'] = $params['direction_nav'];
-    }
-    if (isset($params['animation_loop'])) {
-        $params['animationLoop'] = $params['animation_loop'];
-    }
-    if (isset($params['slideshow_speed'])) {
-        $params['slideshowSpeed'] = $params['slideshow_speed'];
-    }
-    if (isset($params['animation_speed'])) {
-        $params['animationSpeed'] = $params['animation_speed'];
-    }
-    if (isset($params['order_by'])) {
-        $params['list_sort'] = $params['order_by'];
-    }
-
-    $query_args = array(
-        'post_number' => $params['post_number'],
-        'is_geodir_loop' => true,
-        'post_type' => $params['post_type'],
-        'order_by' => $params['order_by']
-    );
-
-    if (1 == $params['show_featured_only']) {
-        $query_args['show_featured_only'] = 1;
-    }
-
-    if (0 != $params['category'] && '' != $params['category']) {
-        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $params['category'],
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
-
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
-
-    $query_args = array_merge($query_args, $params);
-
-    geodir_listing_slider_widget_output($defaults, $query_args);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	// redeclare vars after validation
+
+	if (isset($params['direction_nav'])) {
+		$params['directionNav'] = $params['direction_nav'];
+	}
+	if (isset($params['animation_loop'])) {
+		$params['animationLoop'] = $params['animation_loop'];
+	}
+	if (isset($params['slideshow_speed'])) {
+		$params['slideshowSpeed'] = $params['slideshow_speed'];
+	}
+	if (isset($params['animation_speed'])) {
+		$params['animationSpeed'] = $params['animation_speed'];
+	}
+	if (isset($params['order_by'])) {
+		$params['list_sort'] = $params['order_by'];
+	}
+
+	$query_args = array(
+		'post_number' => $params['post_number'],
+		'is_geodir_loop' => true,
+		'post_type' => $params['post_type'],
+		'order_by' => $params['order_by']
+	);
+
+	if (1 == $params['show_featured_only']) {
+		$query_args['show_featured_only'] = 1;
+	}
+
+	if (0 != $params['category'] && '' != $params['category']) {
+		$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $params['category'],
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
+
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
+
+	$query_args = array_merge($query_args, $params);
+
+	geodir_listing_slider_widget_output($defaults, $query_args);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_login_box', 'geodir_sc_login_box');
@@ -685,22 +685,22 @@ 
  */
 function geodir_sc_login_box($atts)
 {
-    ob_start();
+	ob_start();
 
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
 
-    geodir_loginwidget_output($defaults, $defaults);
+	geodir_loginwidget_output($defaults, $defaults);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category');
@@ -731,31 +731,31 @@ 
  */
 function geodir_sc_popular_post_category($atts)
 {
-    ob_start();
-    global $geodir_post_category_str;
-    $defaults = array(
-        'category_limit' => 15,
-        'category_restrict' => false,
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-        'title' => '',
-        'default_post_type' => '',
-        'parent_only' => false,
-    );
-
-    $params = shortcode_atts($defaults, $atts, 'popular_post_category');
-    $params['category_limit'] = absint($params['category_limit']);
-    $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
-    $params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
-    geodir_popular_post_category_output($params, $params);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'category_restrict' => false,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
+		'default_post_type' => '',
+		'parent_only' => false,
+	);
+
+	$params = shortcode_atts($defaults, $atts, 'popular_post_category');
+	$params['category_limit'] = absint($params['category_limit']);
+	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
+	$params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
+	geodir_popular_post_category_output($params, $params);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -798,98 +798,98 @@ 
  */
 function geodir_sc_popular_post_view($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => '0',
-        'list_sort' => 'latest',
-        'use_viewing_post_type' => '1',
-        'character_count' => '20',
-        'listing_width' => '',
-        'show_featured_only' => '0',
-        'show_special_only' => '0',
-        'with_pics_only' => '0',
-        'with_videos_only' => '0',
-        'hide_if_empty' => '0',
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'title' => '',
-        'category_title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => '0',
+		'list_sort' => 'latest',
+		'use_viewing_post_type' => '1',
+		'character_count' => '20',
+		'listing_width' => '',
+		'show_featured_only' => '0',
+		'show_special_only' => '0',
+		'with_pics_only' => '0',
+		'with_videos_only' => '0',
+		'hide_if_empty' => '0',
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'title' => '',
+		'category_title' => '',
+	);
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
-
-    // Validate character_count
-    if ($params['character_count'] !== '') {
-        $params['character_count'] = absint($params['character_count']);
-    }
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
-    $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
-    $params['hide_if_empty'] = gdsc_to_bool_val($params['hide_if_empty']);
-
-    /**
-     * End of validation
-     */
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Validate our incoming params
+	 */
+
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+	$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category'] = array_intersect($params['category'], $categories);
 
-    geodir_popular_postview_output($params, $params);
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
+
+	// Validate character_count
+	if ($params['character_count'] !== '') {
+		$params['character_count'] = absint($params['character_count']);
+	}
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
+	$params['hide_if_empty'] = gdsc_to_bool_val($params['hide_if_empty']);
 
-    $output = ob_get_contents();
+	/**
+	 * End of validation
+	 */
 
-    ob_end_clean();
+	geodir_popular_postview_output($params, $params);
 
-    return $output;
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -911,37 +911,37 @@ 
  * @return string Recent reviews HTML.
  */
 function geodir_sc_recent_reviews($atts) {
-    ob_start();
-    $defaults = array(
+	ob_start();
+	$defaults = array(
 		'title' => '',
 		'count' => 5,
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts);
+	$params = shortcode_atts($defaults, $atts);
 
-    $count = absint($params['count']);
-    if (0 == $count) {
-        $count = 1;
-    }
+	$count = absint($params['count']);
+	if (0 == $count) {
+		$count = 1;
+	}
 	
 	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
-    $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
+	$comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
-    if ($comments_li) {
-        if ($title != '') { ?>
+	if ($comments_li) {
+		if ($title != '') { ?>
 		<h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3>
 		<?php } ?>
         <div class="geodir_sc_recent_reviews_section">
             <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul>
         </div>
     <?php
-    }
-    $output = ob_get_contents();
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_related_listings', 'geodir_sc_related_listings');
@@ -971,63 +971,63 @@ 
  */
 function geodir_sc_related_listings($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_number' => 5,
-        'relate_to' => 'category',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => 0,
-        'listing_width' => '',
-        'list_sort' => 'latest',
-        'character_count' => 20,
-        'is_widget' => 1,
-        'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
-    );
-    // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Begin validating parameters
-     */
+	ob_start();
+	$defaults = array(
+		'post_number' => 5,
+		'relate_to' => 'category',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => 0,
+		'listing_width' => '',
+		'list_sort' => 'latest',
+		'character_count' => 20,
+		'is_widget' => 1,
+		'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
+	);
+	// The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
+
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Begin validating parameters
+	 */
 
-    // Validate that post_number is a number and is 1 or higher
-    $params['post_number'] = absint($params['post_number']);
-    if (0 === $params['post_number']) {
-        $params['post_number'] = 1;
-    }
+	// Validate that post_number is a number and is 1 or higher
+	$params['post_number'] = absint($params['post_number']);
+	if (0 === $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    // Validate relate_to - only category or tags
-    $params['relate_to'] = geodir_strtolower($params['relate_to']);
-    if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
-        $params['relate_to'] = 'category';
-    }
+	// Validate relate_to - only category or tags
+	$params['relate_to'] = geodir_strtolower($params['relate_to']);
+	if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
+		$params['relate_to'] = 'category';
+	}
 
-    // Validate layout selection
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
+	// Validate layout selection
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    // Validate sorting option
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+	// Validate sorting option
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    // Validate add_location_filter
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	// Validate add_location_filter
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
 
-    // Validate listing_width
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+	// Validate listing_width
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    // Validate character_count
-    if ($params['character_count'] !== '') {
-        $params['character_count'] = absint($params['character_count']);
-    }
+	// Validate character_count
+	if ($params['character_count'] !== '') {
+		$params['character_count'] = absint($params['character_count']);
+	}
 
-    if ($related_display = geodir_related_posts_display($params)) {
-        echo $related_display;
-    }
-    $output = ob_get_contents();
+	if ($related_display = geodir_related_posts_display($params)) {
+		echo $related_display;
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 /**
@@ -1051,13 +1051,13 @@ 
  * @return string Advanced search widget HTML.
  */
 function geodir_sc_advanced_search($atts) {
-    $defaults = array(
+	$defaults = array(
 		'title' => '',
 		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advance_search_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'show_adv_search' => 'default',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'show_adv_search' => 'default',
 		'post_type' => ''
 	);
 	
@@ -1081,9 +1081,9 @@ 
 	the_widget('geodir_advance_search_widget', $params, $params );
 	
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search');
 
@@ -1129,48 +1129,48 @@ 
 		'add_location_filter' => '1',
 		'tab_layout' => 'bestof-tabs-on-top',
 		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 	
 	// Post limit needs to be a positive integer
-    $params['post_limit'] = absint($params['post_limit']);
-    if (0 == $params['post_limit']) {
-        $params['post_limit'] = 5;
-    }
+	$params['post_limit'] = absint($params['post_limit']);
+	if (0 == $params['post_limit']) {
+		$params['post_limit'] = 5;
+	}
 	
 	// Category limit needs to be a positive integer
-    $params['categ_limit'] = absint($params['categ_limit']);
-    if (0 == $params['categ_limit']) {
-        $params['categ_limit'] = 3;
-    }
+	$params['categ_limit'] = absint($params['categ_limit']);
+	if (0 == $params['categ_limit']) {
+		$params['categ_limit'] = 3;
+	}
 	
 	// Tab layout validation
-    $params['tab_layout'] = $params['tab_layout'];
-    if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
-        $params['tab_layout'] = 'bestof-tabs-on-top';
-    }
+	$params['tab_layout'] = $params['tab_layout'];
+	if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
+		$params['tab_layout'] = 'bestof-tabs-on-top';
+	}
 	
 	// Validate character_count
-    $params['character_count'] = $params['character_count'];
+	$params['character_count'] = $params['character_count'];
 
 	ob_start();
 	the_widget('geodir_bestof_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget');
 
@@ -1223,162 +1223,162 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    global $post;
-    $defaults = array(
-        'title'                 => '',
-        'post_type'             => 'gd_place',
-        'category'              => 0,
-        'list_sort'             => 'latest',
-        'event_type'            => '',
-        'post_number'           => 10,
-        'post_author'           => '',
-        'layout'                => 'gridview_onehalf',
-        'listing_width'         => '',
-        'character_count'       => 20,
-        'add_location_filter'   => 1,
-        'show_featured_only'    => '',
-        'show_special_only'     => '',
-        'with_pics_only'        => '',
-        'with_videos_only'      => '',
-        'with_pagination'       => '1',
-        'top_pagination'        => '0',
-        'bottom_pagination'     => '1',
-        'without_no_results'    => 0,
-        'tags'                  => '',
-        'show_favorites_only'   => '',
-        'favorites_by_user'     => '',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    $params['title']        = wp_strip_all_tags($params['title']);
-    $params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy      = geodir_get_taxonomies($params['post_type']);
-    $categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids', 'hide_empty' => 0));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category']     = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number']  = absint($params['post_number']);
-    $params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
+	global $post;
+	$defaults = array(
+		'title'                 => '',
+		'post_type'             => 'gd_place',
+		'category'              => 0,
+		'list_sort'             => 'latest',
+		'event_type'            => '',
+		'post_number'           => 10,
+		'post_author'           => '',
+		'layout'                => 'gridview_onehalf',
+		'listing_width'         => '',
+		'character_count'       => 20,
+		'add_location_filter'   => 1,
+		'show_featured_only'    => '',
+		'show_special_only'     => '',
+		'with_pics_only'        => '',
+		'with_videos_only'      => '',
+		'with_pagination'       => '1',
+		'top_pagination'        => '0',
+		'bottom_pagination'     => '1',
+		'without_no_results'    => 0,
+		'tags'                  => '',
+		'show_favorites_only'   => '',
+		'favorites_by_user'     => '',
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	$params['title']        = wp_strip_all_tags($params['title']);
+	$params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy      = geodir_get_taxonomies($params['post_type']);
+	$categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids', 'hide_empty' => 0));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category']     = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number']  = absint($params['post_number']);
+	$params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
     
-    // Post_number needs to be a positive integer
-    if (!empty($params['post_author'])) {
-        // 'current' left for backwards compatibility
-        if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
-            if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
-                $params['post_author'] = $post->post_author;
-            } else {
-                $params['post_author'] = -1; // Don't show any listings.
-            }
-        } else if ($params['post_author'] == 'current_user' ) {
-            if ($current_user_id = get_current_user_id()) {
-                $params['post_author'] = $current_user_id;
-            } else {
-                $params['post_author'] = -1; // If not logged in then don't show any listings.
-            }
-        } else if (absint($params['post_author']) > 0) {
-            $params['post_author'] = absint($params['post_author']);
-        } else {
-            $params['post_author'] = -1; // Don't show any listings.
-        }
-    } else {
-        unset($params['post_author']);
-    }
-
-    // Validate character_count
-    //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout']           = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort']        = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
-    $params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
-    $params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
-    $params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
+	// Post_number needs to be a positive integer
+	if (!empty($params['post_author'])) {
+		// 'current' left for backwards compatibility
+		if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
+			if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
+				$params['post_author'] = $post->post_author;
+			} else {
+				$params['post_author'] = -1; // Don't show any listings.
+			}
+		} else if ($params['post_author'] == 'current_user' ) {
+			if ($current_user_id = get_current_user_id()) {
+				$params['post_author'] = $current_user_id;
+			} else {
+				$params['post_author'] = -1; // If not logged in then don't show any listings.
+			}
+		} else if (absint($params['post_author']) > 0) {
+			$params['post_author'] = absint($params['post_author']);
+		} else {
+			$params['post_author'] = -1; // Don't show any listings.
+		}
+	} else {
+		unset($params['post_author']);
+	}
+
+	// Validate character_count
+	//todo: is this necessary?
+	$params['character_count']  = $params['character_count'];
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout']           = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort']        = gdsc_validate_sort_choice($params['list_sort'], $params['post_type']);
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
     
-    // User favorites
-    $params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
-    if (!empty($params['show_favorites_only'])) {
-        if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
-            if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
-                $params['favorites_by_user'] = $post->post_author;
-            } else {
-                $params['favorites_by_user'] = 0;
-            }
-        } else if ($params['favorites_by_user'] == 'current_user' || empty($params['favorites_by_user'])) {
-            if ($current_user_id = get_current_user_id()) {
-                $params['favorites_by_user'] = $current_user_id;
-            } else {
-                $params['favorites_by_user'] = 0;
-            }
-        } else if (absint($params['favorites_by_user']) > 0) {
-            $params['favorites_by_user'] = absint($params['favorites_by_user']);
-        } else {
-            $params['favorites_by_user'] = 0;
-        }
-    }
-
-    // Clean tags
-    if (!empty($params['tags'])) {
-        if (!is_array($params['tags'])) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $params['tags'] = str_replace($comma, ',', $params['tags']);
-            }
-            $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
-            $params['tags'] = array_map('trim', $params['tags']);
-        }
-    } else {
-        $params['tags'] = array();
-    }
-
-    /**
-     * End of validation
-     */
-    if (isset($atts['geodir_ajax'])) {
-        $params['geodir_ajax'] = $atts['geodir_ajax'];
-        unset($atts['geodir_ajax']);
-    }
-    if (isset($atts['pageno'])) {
-        $params['pageno'] = $atts['pageno'];
-        unset($atts['pageno']);
-    }
-
-    if ( !empty($atts['shortcode_content']) ) {
-        $content = $atts['shortcode_content'];
-    }
-    $params['shortcode_content'] = trim($content);
-    $atts['shortcode_content'] = trim($content);
+	// User favorites
+	$params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
+	if (!empty($params['show_favorites_only'])) {
+		if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
+			if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
+				$params['favorites_by_user'] = $post->post_author;
+			} else {
+				$params['favorites_by_user'] = 0;
+			}
+		} else if ($params['favorites_by_user'] == 'current_user' || empty($params['favorites_by_user'])) {
+			if ($current_user_id = get_current_user_id()) {
+				$params['favorites_by_user'] = $current_user_id;
+			} else {
+				$params['favorites_by_user'] = 0;
+			}
+		} else if (absint($params['favorites_by_user']) > 0) {
+			$params['favorites_by_user'] = absint($params['favorites_by_user']);
+		} else {
+			$params['favorites_by_user'] = 0;
+		}
+	}
+
+	// Clean tags
+	if (!empty($params['tags'])) {
+		if (!is_array($params['tags'])) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$params['tags'] = str_replace($comma, ',', $params['tags']);
+			}
+			$params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
+			$params['tags'] = array_map('trim', $params['tags']);
+		}
+	} else {
+		$params['tags'] = array();
+	}
+
+	/**
+	 * End of validation
+	 */
+	if (isset($atts['geodir_ajax'])) {
+		$params['geodir_ajax'] = $atts['geodir_ajax'];
+		unset($atts['geodir_ajax']);
+	}
+	if (isset($atts['pageno'])) {
+		$params['pageno'] = $atts['pageno'];
+		unset($atts['pageno']);
+	}
+
+	if ( !empty($atts['shortcode_content']) ) {
+		$content = $atts['shortcode_content'];
+	}
+	$params['shortcode_content'] = trim($content);
+	$atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+	$params['shortcode_atts']       = $atts;
 
-    $output = geodir_sc_gd_listings_output($params);
+	$output = geodir_sc_gd_listings_output($params);
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1418,56 +1418,56 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-    $defaults = array(
-        'title' => '',
-        'post_type' => '', // NULL for all
-        'hide_empty' => '',
-        'show_count' => '',
-        'hide_icon' => '',
-        'cpt_left' => '',
-        'sort_by' => 'count',
-        'max_count' => 'all',
-        'max_level' => '1',
-        'no_cpt_filter' => '',
-        'no_cat_filter' => '',
-        'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
-    // Make sure we have an array
-    $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
-     
-    // Validate the checkboxes used on the widget
-    $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
-    $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+	$defaults = array(
+		'title' => '',
+		'post_type' => '', // NULL for all
+		'hide_empty' => '',
+		'show_count' => '',
+		'hide_icon' => '',
+		'cpt_left' => '',
+		'sort_by' => 'count',
+		'max_count' => 'all',
+		'max_level' => '1',
+		'no_cpt_filter' => '',
+		'no_cat_filter' => '',
+		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+	);
+	$params = shortcode_atts($defaults, $atts);
 
-    if ($params['max_count'] != 'all') {
-        $params['max_count'] = absint($params['max_count']);
-    }
+	/**
+	 * Validate our incoming params
+	 */
+	// Make sure we have an array
+	$params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
+     
+	// Validate the checkboxes used on the widget
+	$params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
+	$params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
+	$params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
+	$params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+
+	if ($params['max_count'] != 'all') {
+		$params['max_count'] = absint($params['max_count']);
+	}
 
-    if ($params['max_level'] != 'all') {
-        $params['max_level'] = absint($params['max_level']);
-    }
+	if ($params['max_level'] != 'all') {
+		$params['max_level'] = absint($params['max_level']);
+	}
 
-    $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
-    $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
+	$params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
+	$params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
 
-    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-    ob_start();
-    the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	ob_start();
+	the_widget('geodir_cpt_categories_widget', $params, $params);
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 
@@ -1482,6 +1482,6 @@ 
  * @return string HTML code.
  */
 function geodir_sc_responsive_videos($atts, $content) {
-    return '<div class="geodir-video-wrapper">'.$content.'</div>';
+	return '<div class="geodir-video-wrapper">'.$content.'</div>';
 }
 add_shortcode('gd_video', 'geodir_sc_responsive_videos');
\ No newline at end of file

Spacing +59 added lines, -59 removed lines

@@ -197,14 +197,14 @@ 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
+        if (get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
                 $map_args['enable_marker_cluster_no_reposition'] = false;
             } else {
                 $map_args['enable_marker_cluster_no_reposition'] = true;
             }
 
-            $map_args['enable_marker_cluster_server'] = true ;
+            $map_args['enable_marker_cluster_server'] = true;
 
         }
 	} else {
@@ -212,7 +212,7 @@ 
 	}
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
+    if (!empty($params['latitude']) && !empty($params['longitude'])) {
         $map_args['enable_marker_cluster_no_reposition'] = true;
     }
 
@@ -265,7 +265,7 @@ 
 function geodir_sc_listing_map($atts) {
 
     // if some params are set then we need a new query, if not then we can use the main query
-    if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) {
+    if (isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type'])) {
 
         global $add_post_in_marker_array, $gd_sc_map_params;
         $backup_globals                             = array();
@@ -288,34 +288,34 @@ 
             'event_type'     => 'all'
         );
 
-        $params = shortcode_atts( $defaults, $atts );
+        $params = shortcode_atts($defaults, $atts);
 
-        if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) {
+        if (!(gdsc_is_post_type_valid($params['post_type']))) {
             $params['post_type'] = 'gd_place';
         }
 
         // Validate the selected category/ies - Grab the current list based on post_type
-        $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
-        $categories        = get_terms( $category_taxonomy, array(
+        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
+        $categories        = get_terms($category_taxonomy, array(
             'orderby' => 'count',
             'order'   => 'DESC',
             'fields'  => 'ids'
-        ) );
+        ));
 
         // Make sure we have an array
-        if ( ! ( is_array( $params['category'] ) ) ) {
-            $params['category'] = explode( ',', $params['category'] );
+        if (!(is_array($params['category']))) {
+            $params['category'] = explode(',', $params['category']);
         }
 
         // Array_intersect returns only the items in $params['category'] that are also in our category list
         // Otherwise it becomes empty and later on that will mean "All"
-        $params['category'] = array_intersect( $params['category'], $categories );
+        $params['category'] = array_intersect($params['category'], $categories);
 
-        if ( $params['post_type'] == 'gd_event' ) {
-            $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] );
+        if ($params['post_type'] == 'gd_event') {
+            $params['event_type'] = gdsc_validate_list_filter_choice($params['event_type']);
         }
 
-        $params = gdsc_validate_map_args( $params );
+        $params = gdsc_validate_map_args($params);
 
         $gd_sc_map_params = $params;
 
@@ -326,12 +326,12 @@ 
             'post_type'      => $params['post_type'],
         );
 
-        if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) {
-            $category_taxonomy = geodir_get_taxonomies( $params['post_type'] );
+        if (!empty($params['category']) && isset($params['category'][0]) && (int) $params['category'][0] != 0) {
+            $category_taxonomy = geodir_get_taxonomies($params['post_type']);
 
             ######### WPML #########
-            if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
-                $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] );
+            if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
+                $category = gd_lang_object_ids($params['category'], $category_taxonomy[0]);
             }
             ######### WPML #########
 
@@ -341,36 +341,36 @@ 
                 'terms'    => $params['category']
             );
 
-            $query_args['tax_query'] = array( $tax_query );
+            $query_args['tax_query'] = array($tax_query);
         }
 
         $add_post_in_marker_array = true;
 
-        if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) {
+        if ($params['post_type'] == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
             global $geodir_event_widget_listview;
             $geodir_event_widget_listview = true;
 
             $query_args['geodir_event_type'] = $params['event_type'];
 
-            $listings = geodir_event_get_widget_events( $query_args );
+            $listings = geodir_event_get_widget_events($query_args);
 
             $geodir_event_widget_listview = false;
         } else {
-            $listings = geodir_get_widget_listings( $query_args );
+            $listings = geodir_get_widget_listings($query_args);
         }
 
-        if ( ! empty( $listings ) ) {
-            foreach ( $listings as $listing ) {
-                create_marker_jason_of_posts( $listing );
+        if (!empty($listings)) {
+            foreach ($listings as $listing) {
+                create_marker_jason_of_posts($listing);
             }
         }
 
         ob_start();
-        add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array
+        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
 
-        add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array
+        add_action('the_post', 'create_list_jsondata'); // Add marker in json array
 
-        add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers
+        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
 
         $default_location = geodir_get_default_location();
 
@@ -391,17 +391,17 @@ 
             'enable_location_filters'  => false,
             'enable_jason_on_load'     => true,
             'ajax_url'                 => geodir_get_ajax_url(),
-            'latitude'                 => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '',
-            'longitude'                => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '',
+            'latitude'                 => isset($default_location->city_latitude) ? $default_location->city_latitude : '',
+            'longitude'                => isset($default_location->city_longitude) ? $default_location->city_longitude : '',
             'streetViewControl'        => true,
             'showPreview'              => '0',
             'maxZoom'                  => 21,
             'bubble_size'              => 'small',
         );
 
-        if ( is_single() ) {
+        if (is_single()) {
             global $post;
-            if ( isset( $post->post_latitude ) ) {
+            if (isset($post->post_latitude)) {
                 $map_args['latitude']  = $post->post_latitude;
                 $map_args['longitude'] = $post->post_longitude;
             }
@@ -412,24 +412,24 @@ 
         }
 
         // Add marker cluster
-        if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) {
+        if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
             $map_args['enable_marker_cluster'] = true;
         } else {
             $map_args['enable_marker_cluster'] = false;
         }
 
-        geodir_draw_map( $map_args );
+        geodir_draw_map($map_args);
 
         $output = ob_get_contents();
 
         ob_end_clean();
 
-        foreach ( $backup_globals as $global => $value ) {
+        foreach ($backup_globals as $global => $value) {
             ${$global} = $value;
         }
 
         return $output;
-    }else{
+    } else {
         ob_start();
         add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
         add_action('the_post', 'create_list_jsondata'); // Add marker in json array
@@ -476,16 +476,16 @@ 
             $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
             $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
             $map_args['map_class_name'] = 'geodir-map-listing-page';
-			if ( geodir_is_page( 'search' ) ) {
+			if (geodir_is_page('search')) {
 				$map_default_lat = '';
 				$map_default_lng = '';
-				if ( isset( $_REQUEST['sgeo_lat'] ) && isset( $_REQUEST['sgeo_lon'] ) ) {
-					$map_default_lat = (float)sanitize_text_field( $_REQUEST['sgeo_lat'] );
-					$map_default_lng = (float)sanitize_text_field( $_REQUEST['sgeo_lon'] );
+				if (isset($_REQUEST['sgeo_lat']) && isset($_REQUEST['sgeo_lon'])) {
+					$map_default_lat = (float) sanitize_text_field($_REQUEST['sgeo_lat']);
+					$map_default_lng = (float) sanitize_text_field($_REQUEST['sgeo_lon']);
 				}
-				if ( empty( $map_default_lat ) && empty( $map_default_lng ) && ! empty( $_REQUEST['set_location_type'] ) && ! empty( $_REQUEST['set_location_val'] ) && function_exists( 'geodir_get_location_by_id' ) ) {
-					$location = geodir_get_location_by_id( '', (int)$_REQUEST['set_location_val'] );
-					if ( ! empty( $location ) ) {
+				if (empty($map_default_lat) && empty($map_default_lng) && !empty($_REQUEST['set_location_type']) && !empty($_REQUEST['set_location_val']) && function_exists('geodir_get_location_by_id')) {
+					$location = geodir_get_location_by_id('', (int) $_REQUEST['set_location_val']);
+					if (!empty($location)) {
 						$map_default_lat = $location->city_latitude;
 						$map_default_lng = $location->city_longitude;
 					}
@@ -1065,20 +1065,20 @@ 
 	
 	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
-		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
+	if ($show_adv_search != '') {
+		$show_adv_class = 'geodir-advance-search-'.$show_adv_search.' ';
 		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
 			$show_adv_search = 'search';
 		}
-		$show_adv_attrs = 'data-show-adv="' . $show_adv_search . '"';
+		$show_adv_attrs = 'data-show-adv="'.$show_adv_search.'"';
 		
-		$params['before_widget'] = str_replace('class="', $show_adv_attrs . ' class="' . $show_adv_class, $params['before_widget']);
+		$params['before_widget'] = str_replace('class="', $show_adv_attrs.' class="'.$show_adv_class, $params['before_widget']);
 	}
 	
 	ob_start();
 	
 	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+	the_widget('geodir_advance_search_widget', $params, $params);
 	
 	$output = ob_get_contents();
     ob_end_clean();
@@ -1273,13 +1273,13 @@ 
     // Post_number needs to be a positive integer
     if (!empty($params['post_author'])) {
         // 'current' left for backwards compatibility
-        if ( $params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
+        if ($params['post_author'] == 'current' || $params['post_author'] == 'current_author') {
             if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
                 $params['post_author'] = $post->post_author;
             } else {
                 $params['post_author'] = -1; // Don't show any listings.
             }
-        } else if ($params['post_author'] == 'current_user' ) {
+        } else if ($params['post_author'] == 'current_user') {
             if ($current_user_id = get_current_user_id()) {
                 $params['post_author'] = $current_user_id;
             } else {
@@ -1296,7 +1296,7 @@ 
 
     // Validate character_count
     //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
+    $params['character_count'] = $params['character_count'];
 
     // Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
@@ -1308,7 +1308,7 @@ 
 
     // Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
     // Validate the checkboxes used on the widget
     $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
@@ -1323,7 +1323,7 @@ 
     // User favorites
     $params['show_favorites_only']  = gdsc_to_bool_val($params['show_favorites_only']);
     if (!empty($params['show_favorites_only'])) {
-        if ( $params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
+        if ($params['favorites_by_user'] == 'current' || $params['favorites_by_user'] == 'current_author') {
             if (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) {
                 $params['favorites_by_user'] = $post->post_author;
             } else {
@@ -1346,7 +1346,7 @@ 
     if (!empty($params['tags'])) {
         if (!is_array($params['tags'])) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $params['tags'] = str_replace($comma, ',', $params['tags']);
             }
             $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
@@ -1368,13 +1368,13 @@ 
         unset($atts['pageno']);
     }
 
-    if ( !empty($atts['shortcode_content']) ) {
+    if (!empty($atts['shortcode_content'])) {
         $content = $atts['shortcode_content'];
     }
     $params['shortcode_content'] = trim($content);
     $atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+    $params['shortcode_atts'] = $atts;
 
     $output = geodir_sc_gd_listings_output($params);
 
@@ -1446,8 +1446,8 @@ 
     // Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+    $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']);
+    $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']);
 
     if ($params['max_count'] != 'all') {
         $params['max_count'] = absint($params['max_count']);

geodirectory-admin/option-pages/general_settings_array.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     ),

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

 

-));/* General Options End*/

+)); /* General Options End*/

 

 /**

  * Filter GD Google Analytic Settings array.

Indentation +273 added lines, -273 removed lines

@@ -16,92 +16,92 @@ 
  */

 $general_options = apply_filters('geodir_general_options', array(

 

-    array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

-

-    array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

-

-    array(

-        'name' => __('Sender name', 'geodirectory'),

-        'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

-        'id' => 'site_email_name',

-        'type' => 'text',

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

-        'std' => get_bloginfo('name') // Default value for the page title - changed in settings

-    ),

-

-    array(

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

-        'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

-        'id' => 'site_email',

-        'type' => 'text',

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

-        'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

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

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to see wp-admin area', 'geodirectory'),

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

-        'id' => 'geodir_allow_wpadmin',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

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

-        'id' => 'geodir_allow_cpass',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Allow user to choose own password', 'geodirectory'),

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

-        'id' => 'geodir_allow_cpass',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Disable review stars for CPT', 'geodirectory'),

-        'desc' => __('Disable review stars for certain CPT without disabling comments on listings.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_disable_rating_cpt',

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

-        'std' => '',

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

-    array(

-        'name' => __('User deleted posts go to trash', 'geodirectory'),

-        'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

-        'id' => 'geodir_disable_perm_delete',

-        'type' => 'checkbox',

-        'std' => '1'

-    ),

-    array(

-        'name' => __('Max upload file size(in mb)', 'geodirectory'),

-        'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

-        'id' => 'geodir_upload_max_filesize',

-        'type' => 'text',

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

-        'std' => '2'

-    ),

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

+	array('name' => __('General', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'general_options'),

+

+	array('name' => __('General Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'general_options'),

+

+	array(

+		'name' => __('Sender name', 'geodirectory'),

+		'desc' => __('(Name that will be shown as email sender when users receive emails from this site)', 'geodirectory'),

+		'id' => 'site_email_name',

+		'type' => 'text',

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

+		'std' => get_bloginfo('name') // Default value for the page title - changed in settings

+	),

+

+	array(

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

+		'desc' => __('(Emails to users will be sent via this mail ID)', 'geodirectory'),

+		'id' => 'site_email',

+		'type' => 'text',

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

+		'std' => get_bloginfo('admin_email') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

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

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to see wp-admin area', 'geodirectory'),

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

+		'id' => 'geodir_allow_wpadmin',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

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

+		'id' => 'geodir_allow_cpass',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Allow user to choose own password', 'geodirectory'),

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

+		'id' => 'geodir_allow_cpass',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Disable review stars for CPT', 'geodirectory'),

+		'desc' => __('Disable review stars for certain CPT without disabling comments on listings.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_disable_rating_cpt',

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

+		'std' => '',

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+	array(

+		'name' => __('User deleted posts go to trash', 'geodirectory'),

+		'desc' => __('If checked a user deleted post will go to trash, otherwise it will be permanently deleted', 'geodirectory'),

+		'id' => 'geodir_disable_perm_delete',

+		'type' => 'checkbox',

+		'std' => '1'

+	),

+	array(

+		'name' => __('Max upload file size(in mb)', 'geodirectory'),

+		'desc' => __('(Maximum upload file size in MB, 1 MB = 1024 KB. Must be greater then 0(ZERO), for ex: 2. This setting will overwrite the max upload file size limit in image/file upload & import listings for entire GeoDirectory core + GeoDirectory plugins.)', 'geodirectory'),

+		'id' => 'geodir_upload_max_filesize',

+		'type' => 'text',

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

+		'std' => '2'

+	),

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

 

 ));/* General Options End*/

 

@@ -113,104 +113,104 @@ 
  */

 $google_analytic_settings = apply_filters('geodir_google_analytic_settings', array(

 

-    array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

-

-    array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

-

-

-

-    array(

-        'name' => __('Show business owner google analytics stats?', 'geodirectory'),

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

-        'id' => 'geodir_ga_stats',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

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

-        'id' => 'geodir_ga_stats',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Google analytics access', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_ga_token',

-        'type' => 'google_analytics',

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

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

-    ),

-

-    array(

-        'name' => __('Google analytics Auth Code', 'geodirectory'),

-        'desc' => __('You must save this setting before accounts will show.', 'geodirectory'),

-        'id' => 'geodir_ga_auth_code',

-        'type' => 'text',

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

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

-    ),

-

-    array(

-        'name' => __('Analytics Account', 'geodirectory'),

-        'desc' => __('Select the account that you setup for this site.', 'geodirectory'),

-        'id' => 'geodir_ga_account_id',

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

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => geodir_gd_accounts()

-    ),

-

-

-    array(

-        'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

-        'desc' => __('Yes <small>(this will automatically add the correct tracking code to your site)</small>', 'geodirectory'),

-        'id' => 'geodir_ga_add_tracking_code',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

-        'desc' => __('No <small>(if you already have tracking code added you should not add it again)</small>', 'geodirectory'),

-        'id' => 'geodir_ga_add_tracking_code',

-        'std' => '1',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Anonymize user IP?', 'geodirectory'),

-        'desc' => __('In most cases this is not required, this is to comply with certain country laws such as Germany.', 'geodirectory'),

-        'id' => 'geodir_ga_anonymize_ip',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-

-    array(

-        'name' => __('Auto refresh active users?', 'geodirectory'),

-        'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

-        'id' => 'geodir_ga_auto_refresh',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Time interval for auto refresh active users', 'geodirectory'),

-        'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

-        'id' => 'geodir_ga_refresh_time',

-        'type' => 'text',

-        'std' => '5'

-    ),

-

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

+	array('name' => __('Google Analytics', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'google_analytic_settings'),

+

+	array('name' => __('Google Analytic Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'google_analytic_settings'),

+

+

+

+	array(

+		'name' => __('Show business owner google analytics stats?', 'geodirectory'),

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

+		'id' => 'geodir_ga_stats',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show business owner Google Analytics stats?', 'geodirectory'),

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

+		'id' => 'geodir_ga_stats',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Google analytics access', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_ga_token',

+		'type' => 'google_analytics',

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

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

+	),

+

+	array(

+		'name' => __('Google analytics Auth Code', 'geodirectory'),

+		'desc' => __('You must save this setting before accounts will show.', 'geodirectory'),

+		'id' => 'geodir_ga_auth_code',

+		'type' => 'text',

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

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

+	),

+

+	array(

+		'name' => __('Analytics Account', 'geodirectory'),

+		'desc' => __('Select the account that you setup for this site.', 'geodirectory'),

+		'id' => 'geodir_ga_account_id',

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

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => geodir_gd_accounts()

+	),

+

+

+	array(

+		'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

+		'desc' => __('Yes <small>(this will automatically add the correct tracking code to your site)</small>', 'geodirectory'),

+		'id' => 'geodir_ga_add_tracking_code',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Add Google analytics tracking code to site?', 'geodirectory'),

+		'desc' => __('No <small>(if you already have tracking code added you should not add it again)</small>', 'geodirectory'),

+		'id' => 'geodir_ga_add_tracking_code',

+		'std' => '1',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Anonymize user IP?', 'geodirectory'),

+		'desc' => __('In most cases this is not required, this is to comply with certain country laws such as Germany.', 'geodirectory'),

+		'id' => 'geodir_ga_anonymize_ip',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+

+	array(

+		'name' => __('Auto refresh active users?', 'geodirectory'),

+		'desc' => __('If ticked it uses the auto refresh time below, if not it never refreshes unless the refresh button is clicked.', 'geodirectory'),

+		'id' => 'geodir_ga_auto_refresh',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Time interval for auto refresh active users', 'geodirectory'),

+		'desc' => __('Time interval in seconds to auto refresh active users. The active users will be auto refreshed after this time interval. Leave blank or use 0(zero) to disable auto refresh. Default: 5', 'geodirectory'),

+		'id' => 'geodir_ga_refresh_time',

+		'type' => 'text',

+		'std' => '5'

+	),

+

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

 

 )); // google_analytic_settings End

 

@@ -222,84 +222,84 @@ 
  */

 $search_settings = apply_filters('geodir_search_settings', array(

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

-

-    array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

-

-    array(

-        'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

-        'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

-        'id' => 'geodir_search_dist',

-        'type' => 'text',

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

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

-    ),

-

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

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

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'miles',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Show search distances in miles or km', 'geodirectory'),

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

-        'id' => 'geodir_search_dist_1',

-        'std' => 'miles',

-        'type' => 'radio',

-        'value' => 'km',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

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

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'meters',

-        'radiogroup' => 'start'

-    ),

-

-    array(

-        'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

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

-        'id' => 'geodir_search_dist_2',

-        'std' => 'meters',

-        'type' => 'radio',

-        'value' => 'feet',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

-        'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

-        'id' => 'geodir_search_near_addition',

-        'type' => 'text',

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

-        'std' => ''

-    ),

-    array(

-        'name' => __('Individual word search limit', 'geodirectory'),

-        'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

-        'id' => 'geodir_search_word_limit',

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

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            '0' => __('Disabled', 'geodirectory'),

-            '1' => __('1 Character words excluded', 'geodirectory'),

-            '2' => __('2 Character words and less excluded', 'geodirectory'),

-            '3' => __('3 Character words and less excluded', 'geodirectory'),

-        ))

-    ),

-

-

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

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'search_settings'),

+

+	array('name' => __('Search Settings', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'search_settings'),

+

+	array(

+		'name' => __('Limit squared distance area to X miles (helps improve search speed)', 'geodirectory'),

+		'desc' => __('Enter whole number only ex. 40 (Tokyo is largest city in the world @40 sq miles) LEAVE BLANK FOR NO DISTANCE LIMIT', 'geodirectory'),

+		'id' => 'geodir_search_dist',

+		'type' => 'text',

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

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

+	),

+

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

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

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'miles',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Show search distances in miles or km', 'geodirectory'),

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

+		'id' => 'geodir_search_dist_1',

+		'std' => 'miles',

+		'type' => 'radio',

+		'value' => 'km',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

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

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'meters',

+		'radiogroup' => 'start'

+	),

+

+	array(

+		'name' => __('If distance is less than 0.01 show distance in meters or feet', 'geodirectory'),

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

+		'id' => 'geodir_search_dist_2',

+		'std' => 'meters',

+		'type' => 'radio',

+		'value' => 'feet',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Add location specific text to (Near) search for Google', 'geodirectory'),

+		'desc' => __('This is usefull if your directory is limted to one location such as: New York or Australia (this setting should be blank if using default country, regions etc with multilocation addon as it will automatically add them)', 'geodirectory'),

+		'id' => 'geodir_search_near_addition',

+		'type' => 'text',

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

+		'std' => ''

+	),

+	array(

+		'name' => __('Individual word search limit', 'geodirectory'),

+		'desc' => __('With this option you can limit individual words being searched for, for example searching for `Jo Brown` would return results with words like `Jones`, you can exclude these types of small character words if you wish.', 'geodirectory'),

+		'id' => 'geodir_search_word_limit',

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

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'0' => __('Disabled', 'geodirectory'),

+			'1' => __('1 Character words excluded', 'geodirectory'),

+			'2' => __('2 Character words and less excluded', 'geodirectory'),

+			'3' => __('3 Character words and less excluded', 'geodirectory'),

+		))

+	),

+

+

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

 

 )); //search_settings End

 

@@ -311,17 +311,17 @@ 
  */

 $dummy_data_settings = apply_filters('geodir_dummy_data_settings', array(

 

-    array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

-

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_dummy_data_installer',

-        'type' => 'dummy_installer',

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

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

-    ),

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

+	array('name' => __('Dummy Data', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'dummy_data_settings'),

+

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_dummy_data_installer',

+		'type' => 'dummy_installer',

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

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

+	),

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

 

 )); //dummy_data_settings End