GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/service/Google_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
   /**
    * Given a variable name, discover its type.
    *
-   * @param $name
+   * @param string $name
    * @param $item
    * @return object The object from the item.
    */

Indentation +46 added lines, -46 removed lines

@@ -24,11 +24,11 @@ 
  */
 class Google_Model {
   public function __construct( /* polymorphic */ ) {
-    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
-      // Initialize the model with the array's contents.
-      $array = func_get_arg(0);
-      $this->mapTypes($array);
-    }
+	if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
+	  // Initialize the model with the array's contents.
+	  $array = func_get_arg(0);
+	  $this->mapTypes($array);
+	}
   }
 
   /**
@@ -38,30 +38,30 @@ 
    * @return void
    */
   protected function mapTypes($array) {
-    foreach ($array as $key => $val) {
-      $this->$key = $val;
+	foreach ($array as $key => $val) {
+	  $this->$key = $val;
 
-      $keyTypeName = "__$key" . 'Type';
-      $keyDataType = "__$key" . 'DataType';
-      if ($this->useObjects() && property_exists($this, $keyTypeName)) {
-        if ($this->isAssociativeArray($val)) {
-          if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-            foreach($val as $arrayKey => $arrayItem) {
-              $val[$arrayKey] = $this->createObjectFromName($keyTypeName, $arrayItem);
-            }
-            $this->$key = $val;
-          } else {
-            $this->$key = $this->createObjectFromName($keyTypeName, $val);
-          }
-        } else if (is_array($val)) {
-          $arrayObject = array();
-          foreach ($val as $arrayIndex => $arrayItem) {
-            $arrayObject[$arrayIndex] = $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-          $this->$key = $arrayObject;
-        }
-      }
-    }
+	  $keyTypeName = "__$key" . 'Type';
+	  $keyDataType = "__$key" . 'DataType';
+	  if ($this->useObjects() && property_exists($this, $keyTypeName)) {
+		if ($this->isAssociativeArray($val)) {
+		  if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+			foreach($val as $arrayKey => $arrayItem) {
+			  $val[$arrayKey] = $this->createObjectFromName($keyTypeName, $arrayItem);
+			}
+			$this->$key = $val;
+		  } else {
+			$this->$key = $this->createObjectFromName($keyTypeName, $val);
+		  }
+		} else if (is_array($val)) {
+		  $arrayObject = array();
+		  foreach ($val as $arrayIndex => $arrayItem) {
+			$arrayObject[$arrayIndex] = $this->createObjectFromName($keyTypeName, $arrayItem);
+		  }
+		  $this->$key = $arrayObject;
+		}
+	  }
+	}
   }
 
   /**
@@ -70,16 +70,16 @@ 
    * @return bool True if the array is associative.
    */
   protected function isAssociativeArray($array) {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
+	if (!is_array($array)) {
+	  return false;
+	}
+	$keys = array_keys($array);
+	foreach($keys as $key) {
+	  if (is_string($key)) {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /**
@@ -90,13 +90,13 @@ 
    * @return object The object from the item.
    */
   private function createObjectFromName($name, $item) {
-    $type = $this->$name;
-    return new $type($item);
+	$type = $this->$name;
+	return new $type($item);
   }
 
   protected function useObjects() {
-    global $apiConfig;
-    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
+	global $apiConfig;
+	return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
   }
 
   /**
@@ -107,9 +107,9 @@ 
    * @param string $method Method expecting an array as an argument.
    */
   public function assertIsArray($obj, $type, $method) {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception("Incorrect parameter type passed to $method(), expected an"
-          . " array containing items of type $type.");
-    }
+	if ($obj && !is_array($obj)) {
+	  throw new Google_Exception("Incorrect parameter type passed to $method(), expected an"
+		  . " array containing items of type $type.");
+	}
   }
 }

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
  */
 class Google_Model {
   public function __construct( /* polymorphic */ ) {
-    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
+    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
       // Initialize the model with the array's contents.
       $array = func_get_arg(0);
       $this->mapTypes($array);
@@ -41,12 +41,12 @@ 
     foreach ($array as $key => $val) {
       $this->$key = $val;
 
-      $keyTypeName = "__$key" . 'Type';
-      $keyDataType = "__$key" . 'DataType';
+      $keyTypeName = "__$key".'Type';
+      $keyDataType = "__$key".'DataType';
       if ($this->useObjects() && property_exists($this, $keyTypeName)) {
         if ($this->isAssociativeArray($val)) {
           if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-            foreach($val as $arrayKey => $arrayItem) {
+            foreach ($val as $arrayKey => $arrayItem) {
               $val[$arrayKey] = $this->createObjectFromName($keyTypeName, $arrayItem);
             }
             $this->$key = $val;
@@ -74,7 +74,7 @@ 
       return false;
     }
     $keys = array_keys($array);
-    foreach($keys as $key) {
+    foreach ($keys as $key) {
       if (is_string($key)) {
         return true;
       }

geodirectory-admin/google-api-php-client/src/service/Google_ServiceResource.php

Doc Comments +6 added lines, -1 removed lines

@@ -53,6 +53,11 @@ 
   /** @var array $methods */
   private $methods;
 
+  /**
+   * @param Google_AnalyticsService $service
+   * @param string $serviceName
+   * @param string $resourceName
+   */
   public function __construct($service, $serviceName, $resourceName, $resource) {
     $this->service = $service;
     $this->serviceName = $serviceName;
@@ -61,7 +66,7 @@ 
   }
 
   /**
-   * @param $name
+   * @param string $name
    * @param $arguments
    * @return Google_HttpRequest|array
    * @throws Google_Exception

Indentation +143 added lines, -143 removed lines

@@ -27,18 +27,18 @@ 
 class Google_ServiceResource {
   // Valid query parameters that work, but don't appear in discovery.
   private $stackParameters = array(
-      'alt' => array('type' => 'string', 'location' => 'query'),
-      'boundary' => array('type' => 'string', 'location' => 'query'),
-      'fields' => array('type' => 'string', 'location' => 'query'),
-      'trace' => array('type' => 'string', 'location' => 'query'),
-      'userIp' => array('type' => 'string', 'location' => 'query'),
-      'userip' => array('type' => 'string', 'location' => 'query'),
-      'quotaUser' => array('type' => 'string', 'location' => 'query'),
-      'file' => array('type' => 'complex', 'location' => 'body'),
-      'data' => array('type' => 'string', 'location' => 'body'),
-      'mimeType' => array('type' => 'string', 'location' => 'header'),
-      'uploadType' => array('type' => 'string', 'location' => 'query'),
-      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
+	  'alt' => array('type' => 'string', 'location' => 'query'),
+	  'boundary' => array('type' => 'string', 'location' => 'query'),
+	  'fields' => array('type' => 'string', 'location' => 'query'),
+	  'trace' => array('type' => 'string', 'location' => 'query'),
+	  'userIp' => array('type' => 'string', 'location' => 'query'),
+	  'userip' => array('type' => 'string', 'location' => 'query'),
+	  'quotaUser' => array('type' => 'string', 'location' => 'query'),
+	  'file' => array('type' => 'complex', 'location' => 'body'),
+	  'data' => array('type' => 'string', 'location' => 'body'),
+	  'mimeType' => array('type' => 'string', 'location' => 'header'),
+	  'uploadType' => array('type' => 'string', 'location' => 'query'),
+	  'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
   );
 
   /** @var Google_Service $service */
@@ -54,10 +54,10 @@ 
   private $methods;
 
   public function __construct($service, $serviceName, $resourceName, $resource) {
-    $this->service = $service;
-    $this->serviceName = $serviceName;
-    $this->resourceName = $resourceName;
-    $this->methods = isset($resource['methods']) ? $resource['methods'] : array($resourceName => $resource);
+	$this->service = $service;
+	$this->serviceName = $serviceName;
+	$this->resourceName = $resourceName;
+	$this->methods = isset($resource['methods']) ? $resource['methods'] : array($resourceName => $resource);
   }
 
   /**
@@ -67,139 +67,139 @@ 
    * @throws Google_Exception
    */
   public function __call($name, $arguments) {
-    if (! isset($this->methods[$name])) {
-      throw new Google_Exception("Unknown function: {$this->serviceName}->{$this->resourceName}->{$name}()");
-    }
-    $method = $this->methods[$name];
-    $parameters = $arguments[0];
-
-    // postBody is a special case since it's not defined in the discovery document as parameter, but we abuse the param entry for storing it
-    $postBody = null;
-    if (isset($parameters['postBody'])) {
-      if (is_object($parameters['postBody'])) {
-        $this->stripNull($parameters['postBody']);
-      }
-
-      // Some APIs require the postBody to be set under the data key.
-      if (is_array($parameters['postBody']) && 'latitude' == $this->serviceName) {
-        if (!isset($parameters['postBody']['data'])) {
-          $rawBody = $parameters['postBody'];
-          unset($parameters['postBody']);
-          $parameters['postBody']['data'] = $rawBody;
-        }
-      }
-
-      $postBody = is_array($parameters['postBody']) || is_object($parameters['postBody'])
-          ? json_encode($parameters['postBody'])
-          : $parameters['postBody'];
-      unset($parameters['postBody']);
-
-      if (isset($parameters['optParams'])) {
-        $optParams = $parameters['optParams'];
-        unset($parameters['optParams']);
-        $parameters = array_merge($parameters, $optParams);
-      }
-    }
-
-    if (!isset($method['parameters'])) {
-      $method['parameters'] = array();
-    }
+	if (! isset($this->methods[$name])) {
+	  throw new Google_Exception("Unknown function: {$this->serviceName}->{$this->resourceName}->{$name}()");
+	}
+	$method = $this->methods[$name];
+	$parameters = $arguments[0];
+
+	// postBody is a special case since it's not defined in the discovery document as parameter, but we abuse the param entry for storing it
+	$postBody = null;
+	if (isset($parameters['postBody'])) {
+	  if (is_object($parameters['postBody'])) {
+		$this->stripNull($parameters['postBody']);
+	  }
+
+	  // Some APIs require the postBody to be set under the data key.
+	  if (is_array($parameters['postBody']) && 'latitude' == $this->serviceName) {
+		if (!isset($parameters['postBody']['data'])) {
+		  $rawBody = $parameters['postBody'];
+		  unset($parameters['postBody']);
+		  $parameters['postBody']['data'] = $rawBody;
+		}
+	  }
+
+	  $postBody = is_array($parameters['postBody']) || is_object($parameters['postBody'])
+		  ? json_encode($parameters['postBody'])
+		  : $parameters['postBody'];
+	  unset($parameters['postBody']);
+
+	  if (isset($parameters['optParams'])) {
+		$optParams = $parameters['optParams'];
+		unset($parameters['optParams']);
+		$parameters = array_merge($parameters, $optParams);
+	  }
+	}
+
+	if (!isset($method['parameters'])) {
+	  $method['parameters'] = array();
+	}
     
-    $method['parameters'] = array_merge($method['parameters'], $this->stackParameters);
-    foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
-        throw new Google_Exception("($name) unknown parameter: '$key'");
-      }
-    }
-    if (isset($method['parameters'])) {
-      foreach ($method['parameters'] as $paramName => $paramSpec) {
-        if (isset($paramSpec['required']) && $paramSpec['required'] && ! isset($parameters[$paramName])) {
-          throw new Google_Exception("($name) missing required param: '$paramName'");
-        }
-        if (isset($parameters[$paramName])) {
-          $value = $parameters[$paramName];
-          $parameters[$paramName] = $paramSpec;
-          $parameters[$paramName]['value'] = $value;
-          unset($parameters[$paramName]['required']);
-        } else {
-          unset($parameters[$paramName]);
-        }
-      }
-    }
-
-    // Discovery v1.0 puts the canonical method id under the 'id' field.
-    if (! isset($method['id'])) {
-      $method['id'] = $method['rpcMethod'];
-    }
-
-    // Discovery v1.0 puts the canonical path under the 'path' field.
-    if (! isset($method['path'])) {
-      $method['path'] = $method['restPath'];
-    }
-
-    $servicePath = $this->service->servicePath;
-
-    // Process Media Request
-    $contentType = false;
-    if (isset($method['mediaUpload'])) {
-      $media = Google_MediaFileUpload::process($postBody, $parameters);
-      if ($media) {
-        $contentType = isset($media['content-type']) ? $media['content-type']: null;
-        $postBody = isset($media['postBody']) ? $media['postBody'] : null;
-        $servicePath = $method['mediaUpload']['protocols']['simple']['path'];
-        $method['path'] = '';
-      }
-    }
-
-    $url = Google_REST::createRequestUri($servicePath, $method['path'], $parameters);
-    $httpRequest = new Google_HttpRequest($url, $method['httpMethod'], null, $postBody);
-    if ($postBody) {
-      $contentTypeHeader = array();
-      if (isset($contentType) && $contentType) {
-        $contentTypeHeader['content-type'] = $contentType;
-      } else {
-        $contentTypeHeader['content-type'] = 'application/json; charset=UTF-8';
-        $contentTypeHeader['content-length'] = Google_Utils::getStrLen($postBody);
-      }
-      $httpRequest->setRequestHeaders($contentTypeHeader);
-    }
-
-    $httpRequest = Google_Client::$auth->sign($httpRequest);
-    if (Google_Client::$useBatch) {
-      return $httpRequest;
-    }
-
-    // Terminate immediately if this is a resumable request.
-    if (isset($parameters['uploadType']['value'])
-        && Google_MediaFileUpload::UPLOAD_RESUMABLE_TYPE == $parameters['uploadType']['value']) {
-      $contentTypeHeader = array();
-      if (isset($contentType) && $contentType) {
-        $contentTypeHeader['content-type'] = $contentType;
-      }
-      $httpRequest->setRequestHeaders($contentTypeHeader);
-      if ($postBody) {
-        $httpRequest->setPostBody($postBody);
-      }
-      return $httpRequest;
-    }
-
-    return Google_REST::execute($httpRequest);
+	$method['parameters'] = array_merge($method['parameters'], $this->stackParameters);
+	foreach ($parameters as $key => $val) {
+	  if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+		throw new Google_Exception("($name) unknown parameter: '$key'");
+	  }
+	}
+	if (isset($method['parameters'])) {
+	  foreach ($method['parameters'] as $paramName => $paramSpec) {
+		if (isset($paramSpec['required']) && $paramSpec['required'] && ! isset($parameters[$paramName])) {
+		  throw new Google_Exception("($name) missing required param: '$paramName'");
+		}
+		if (isset($parameters[$paramName])) {
+		  $value = $parameters[$paramName];
+		  $parameters[$paramName] = $paramSpec;
+		  $parameters[$paramName]['value'] = $value;
+		  unset($parameters[$paramName]['required']);
+		} else {
+		  unset($parameters[$paramName]);
+		}
+	  }
+	}
+
+	// Discovery v1.0 puts the canonical method id under the 'id' field.
+	if (! isset($method['id'])) {
+	  $method['id'] = $method['rpcMethod'];
+	}
+
+	// Discovery v1.0 puts the canonical path under the 'path' field.
+	if (! isset($method['path'])) {
+	  $method['path'] = $method['restPath'];
+	}
+
+	$servicePath = $this->service->servicePath;
+
+	// Process Media Request
+	$contentType = false;
+	if (isset($method['mediaUpload'])) {
+	  $media = Google_MediaFileUpload::process($postBody, $parameters);
+	  if ($media) {
+		$contentType = isset($media['content-type']) ? $media['content-type']: null;
+		$postBody = isset($media['postBody']) ? $media['postBody'] : null;
+		$servicePath = $method['mediaUpload']['protocols']['simple']['path'];
+		$method['path'] = '';
+	  }
+	}
+
+	$url = Google_REST::createRequestUri($servicePath, $method['path'], $parameters);
+	$httpRequest = new Google_HttpRequest($url, $method['httpMethod'], null, $postBody);
+	if ($postBody) {
+	  $contentTypeHeader = array();
+	  if (isset($contentType) && $contentType) {
+		$contentTypeHeader['content-type'] = $contentType;
+	  } else {
+		$contentTypeHeader['content-type'] = 'application/json; charset=UTF-8';
+		$contentTypeHeader['content-length'] = Google_Utils::getStrLen($postBody);
+	  }
+	  $httpRequest->setRequestHeaders($contentTypeHeader);
+	}
+
+	$httpRequest = Google_Client::$auth->sign($httpRequest);
+	if (Google_Client::$useBatch) {
+	  return $httpRequest;
+	}
+
+	// Terminate immediately if this is a resumable request.
+	if (isset($parameters['uploadType']['value'])
+		&& Google_MediaFileUpload::UPLOAD_RESUMABLE_TYPE == $parameters['uploadType']['value']) {
+	  $contentTypeHeader = array();
+	  if (isset($contentType) && $contentType) {
+		$contentTypeHeader['content-type'] = $contentType;
+	  }
+	  $httpRequest->setRequestHeaders($contentTypeHeader);
+	  if ($postBody) {
+		$httpRequest->setPostBody($postBody);
+	  }
+	  return $httpRequest;
+	}
+
+	return Google_REST::execute($httpRequest);
   }
 
   public  function useObjects() {
-    global $apiConfig;
-    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
+	global $apiConfig;
+	return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
   }
 
   protected function stripNull(&$o) {
-    $o = (array) $o;
-    foreach ($o as $k => $v) {
-      if ($v === null || strstr($k, "\0*\0__")) {
-        unset($o[$k]);
-      }
-      elseif (is_object($v) || is_array($v)) {
-        $this->stripNull($o[$k]);
-      }
-    }
+	$o = (array) $o;
+	foreach ($o as $k => $v) {
+	  if ($v === null || strstr($k, "\0*\0__")) {
+		unset($o[$k]);
+	  }
+	  elseif (is_object($v) || is_array($v)) {
+		$this->stripNull($o[$k]);
+	  }
+	}
   }
 }

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
    * @throws Google_Exception
    */
   public function __call($name, $arguments) {
-    if (! isset($this->methods[$name])) {
+    if (!isset($this->methods[$name])) {
       throw new Google_Exception("Unknown function: {$this->serviceName}->{$this->resourceName}->{$name}()");
     }
     $method = $this->methods[$name];
@@ -107,13 +107,13 @@ 
     
     $method['parameters'] = array_merge($method['parameters'], $this->stackParameters);
     foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+      if ($key != 'postBody' && !isset($method['parameters'][$key])) {
         throw new Google_Exception("($name) unknown parameter: '$key'");
       }
     }
     if (isset($method['parameters'])) {
       foreach ($method['parameters'] as $paramName => $paramSpec) {
-        if (isset($paramSpec['required']) && $paramSpec['required'] && ! isset($parameters[$paramName])) {
+        if (isset($paramSpec['required']) && $paramSpec['required'] && !isset($parameters[$paramName])) {
           throw new Google_Exception("($name) missing required param: '$paramName'");
         }
         if (isset($parameters[$paramName])) {
@@ -128,12 +128,12 @@ 
     }
 
     // Discovery v1.0 puts the canonical method id under the 'id' field.
-    if (! isset($method['id'])) {
+    if (!isset($method['id'])) {
       $method['id'] = $method['rpcMethod'];
     }
 
     // Discovery v1.0 puts the canonical path under the 'path' field.
-    if (! isset($method['path'])) {
+    if (!isset($method['path'])) {
       $method['path'] = $method['restPath'];
     }
 
@@ -144,7 +144,7 @@ 
     if (isset($method['mediaUpload'])) {
       $media = Google_MediaFileUpload::process($postBody, $parameters);
       if ($media) {
-        $contentType = isset($media['content-type']) ? $media['content-type']: null;
+        $contentType = isset($media['content-type']) ? $media['content-type'] : null;
         $postBody = isset($media['postBody']) ? $media['postBody'] : null;
         $servicePath = $method['mediaUpload']['protocols']['simple']['path'];
         $method['path'] = '';

Braces +1 added lines, -2 removed lines

@@ -196,8 +196,7 @@
     foreach ($o as $k => $v) {
       if ($v === null || strstr($k, "\0*\0__")) {
         unset($o[$k]);
-      }
-      elseif (is_object($v) || is_array($v)) {
+      } elseif (is_object($v) || is_array($v)) {
         $this->stripNull($o[$k]);
       }
     }

geodirectory-admin/google-api-php-client/src/service/Google_Utils.php

Doc Comments +4 added lines

@@ -22,6 +22,10 @@
  * @author Chirag Shah <chirags@google.com>
  */
 class Google_Utils {
+
+  /**
+   * @param string $data
+   */
   public static function urlSafeB64Encode($data) {
     $b64 = base64_encode($data);
     $b64 = str_replace(array('+', '/', '\r', '\n', '='),

Indentation +56 added lines, -56 removed lines

@@ -23,18 +23,18 @@ 
  */
 class Google_Utils {
   public static function urlSafeB64Encode($data) {
-    $b64 = base64_encode($data);
-    $b64 = str_replace(array('+', '/', '\r', '\n', '='),
-                       array('-', '_'),
-                       $b64);
-    return $b64;
+	$b64 = base64_encode($data);
+	$b64 = str_replace(array('+', '/', '\r', '\n', '='),
+					   array('-', '_'),
+					   $b64);
+	return $b64;
   }
 
   public static function urlSafeB64Decode($b64) {
-    $b64 = str_replace(array('-', '_'),
-                       array('+', '/'),
-                       $b64);
-    return base64_decode($b64);
+	$b64 = str_replace(array('-', '_'),
+					   array('+', '/'),
+					   $b64);
+	return base64_decode($b64);
   }
 
   /**
@@ -52,50 +52,50 @@ 
    * @return int The number of bytes in a string.
    */
   static public function getStrLen($str) {
-    $strlenVar = strlen($str);
-    $d = $ret = 0;
-    for ($count = 0; $count < $strlenVar; ++ $count) {
-      $ordinalValue = ord($str{$ret});
-      switch (true) {
-        case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
-          // characters U-00000000 - U-0000007F (same as ASCII)
-          $ret ++;
-          break;
+	$strlenVar = strlen($str);
+	$d = $ret = 0;
+	for ($count = 0; $count < $strlenVar; ++ $count) {
+	  $ordinalValue = ord($str{$ret});
+	  switch (true) {
+		case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
+		  // characters U-00000000 - U-0000007F (same as ASCII)
+		  $ret ++;
+		  break;
 
-        case (($ordinalValue & 0xE0) == 0xC0):
-          // characters U-00000080 - U-000007FF, mask 110XXXXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 2;
-          break;
+		case (($ordinalValue & 0xE0) == 0xC0):
+		  // characters U-00000080 - U-000007FF, mask 110XXXXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 2;
+		  break;
 
-        case (($ordinalValue & 0xF0) == 0xE0):
-          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 3;
-          break;
+		case (($ordinalValue & 0xF0) == 0xE0):
+		  // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 3;
+		  break;
 
-        case (($ordinalValue & 0xF8) == 0xF0):
-          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 4;
-          break;
+		case (($ordinalValue & 0xF8) == 0xF0):
+		  // characters U-00010000 - U-001FFFFF, mask 11110XXX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 4;
+		  break;
 
-        case (($ordinalValue & 0xFC) == 0xF8):
-          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 5;
-          break;
+		case (($ordinalValue & 0xFC) == 0xF8):
+		  // characters U-00200000 - U-03FFFFFF, mask 111110XX
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 5;
+		  break;
 
-        case (($ordinalValue & 0xFE) == 0xFC):
-          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-          $ret += 6;
-          break;
-        default:
-          $ret ++;
-      }
-    }
-    return $ret;
+		case (($ordinalValue & 0xFE) == 0xFC):
+		  // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+		  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+		  $ret += 6;
+		  break;
+		default:
+		  $ret ++;
+	  }
+	}
+	return $ret;
   }
 
   /**
@@ -104,14 +104,14 @@ 
    * @return array Normalized array.
    */
   public static function normalize($arr) {
-    if (!is_array($arr)) {
-      return array();
-    }
+	if (!is_array($arr)) {
+	  return array();
+	}
 
-    $normalized = array();
-    foreach ($arr as $key => $val) {
-      $normalized[strtolower($key)] = $val;
-    }
-    return $normalized;
+	$normalized = array();
+	foreach ($arr as $key => $val) {
+	  $normalized[strtolower($key)] = $val;
+	}
+	return $normalized;
   }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
       switch (true) {
         case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
           // characters U-00000000 - U-0000007F (same as ASCII)
-          $ret ++;
+          $ret++;
           break;
 
         case (($ordinalValue & 0xE0) == 0xC0):
@@ -92,7 +92,7 @@ 
           $ret += 6;
           break;
         default:
-          $ret ++;
+          $ret++;
       }
     }
     return $ret;

geodirectory-functions/google_analytics.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
  * @param string $page Page url to use in analytics filters.

  * @param bool   $ga_start The start date of the data to include in YYYY-MM-DD format.

  * @param bool   $ga_end The end date of the data to include in YYYY-MM-DD format.

- * @return string Html text content.

+ * @return false|null Html text content.

  */

 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)

 {

Indentation +128 added lines, -128 removed lines

@@ -17,34 +17,34 @@ 
  */

 function geodir_sec2hms($sec, $padHours = false)

 {

-    // holds formatted string

-    $hms = "";

-    // there are 3600 seconds in an hour, so if we

-    // divide total seconds by 3600 and throw away

-    // the remainder, we've got the number of hours

-    $hours = intval(intval($sec) / 3600);

-

-    // add to $hms, with a leading 0 if asked for

-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

-

-    // dividing the total seconds by 60 will give us

-    // the number of minutes, but we're interested in

-    // minutes past the hour: to get that, we need to

-    // divide by 60 again and keep the remainder

-    $minutes = intval(($sec / 60) % 60);

-

-    // then add to $hms (with a leading 0 if needed)

-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

-

-    // seconds are simple - just divide the total

-    // seconds by 60 and keep the remainder

-    $seconds = intval($sec % 60);

-

-    // add to $hms, again with a leading 0 if needed

-    $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);

-

-    // done!

-    return $hms;

+	// holds formatted string

+	$hms = "";

+	// there are 3600 seconds in an hour, so if we

+	// divide total seconds by 3600 and throw away

+	// the remainder, we've got the number of hours

+	$hours = intval(intval($sec) / 3600);

+

+	// add to $hms, with a leading 0 if asked for

+	$hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

+

+	// dividing the total seconds by 60 will give us

+	// the number of minutes, but we're interested in

+	// minutes past the hour: to get that, we need to

+	// divide by 60 again and keep the remainder

+	$minutes = intval(($sec / 60) % 60);

+

+	// then add to $hms (with a leading 0 if needed)

+	$hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

+

+	// seconds are simple - just divide the total

+	// seconds by 60 and keep the remainder

+	$seconds = intval($sec % 60);

+

+	// add to $hms, again with a leading 0 if needed

+	$hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);

+

+	// done!

+	return $hms;

 }

 

 /**

@@ -60,122 +60,122 @@ 
 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)

 {

 

-    // NEW ANALYTICS

-

-    $start_date = '';

-    $end_date = '';

-    $dimensions = '';

-    $sort = '';

-    $filters = "ga:pagePath==".$page;

-    $metrics = "ga:pageviews";

-    $realtime = false;

-    $limit = false;

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

-        $start_date = date('Y-m-d', strtotime("-6 day"));

-        $end_date = date('Y-m-d');

-        $dimensions = "ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

-        $start_date = date('Y-m-d', strtotime("-13 day"));

-        $end_date = date('Y-m-d', strtotime("-7 day"));

-        $dimensions = "ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

-        $start_date = date('Y')."-01-01";

-        $end_date = date('Y-m-d');

-        $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

-        $start_date = date('Y', strtotime("-1 year"))."-01-01";

-        $end_date = date('Y', strtotime("-1 year"))."-12-31";

-        $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

-        $start_date = "14daysAgo";

-        $end_date = "yesterday";

-        $dimensions = "ga:country";

-        $sort = "ga:pageviews";

-        $limit  = 5;

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

-        $metrics = "rt:activeUsers";

-        $realtime = true;

-    }

-

-    # Create a new Gdata call

-    $gaApi = new GDGoogleAnalyticsStats();

-

-    # Check if Google sucessfully logged in

-    if (!$gaApi->checkLogin()){

-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

-        return false;

-    }

-

-    $account = $gaApi->getSingleProfile();

-

-    if(!isset($account[0]['id'])){

-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

-        return false;

-    }

-

-    $account = $account[0]['id'];

-

-    # Set the account to the one requested

-    $gaApi->setAccount($account);

-

-

-

-    # Get the metrics needed to build the visits graph;

-    try {

-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);

-    }

-    catch (Exception $e) {

-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();

-    }

-

-

-    //print_r($stats);

-    echo json_encode($stats);

-    exit;

+	// NEW ANALYTICS

+

+	$start_date = '';

+	$end_date = '';

+	$dimensions = '';

+	$sort = '';

+	$filters = "ga:pagePath==".$page;

+	$metrics = "ga:pageviews";

+	$realtime = false;

+	$limit = false;

+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

+		$start_date = date('Y-m-d', strtotime("-6 day"));

+		$end_date = date('Y-m-d');

+		$dimensions = "ga:date,ga:nthDay";

+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+		$start_date = date('Y-m-d', strtotime("-13 day"));

+		$end_date = date('Y-m-d', strtotime("-7 day"));

+		$dimensions = "ga:date,ga:nthDay";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+		$start_date = date('Y')."-01-01";

+		$end_date = date('Y-m-d');

+		$dimensions = "ga:month,ga:nthMonth";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+		$start_date = date('Y', strtotime("-1 year"))."-01-01";

+		$end_date = date('Y', strtotime("-1 year"))."-12-31";

+		$dimensions = "ga:month,ga:nthMonth";

+	}

+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+		$start_date = "14daysAgo";

+		$end_date = "yesterday";

+		$dimensions = "ga:country";

+		$sort = "ga:pageviews";

+		$limit  = 5;

+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+		$metrics = "rt:activeUsers";

+		$realtime = true;

+	}

+

+	# Create a new Gdata call

+	$gaApi = new GDGoogleAnalyticsStats();

+

+	# Check if Google sucessfully logged in

+	if (!$gaApi->checkLogin()){

+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

+		return false;

+	}

+

+	$account = $gaApi->getSingleProfile();

+

+	if(!isset($account[0]['id'])){

+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

+		return false;

+	}

+

+	$account = $account[0]['id'];

+

+	# Set the account to the one requested

+	$gaApi->setAccount($account);

+

+

+

+	# Get the metrics needed to build the visits graph;

+	try {

+		$stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);

+	}

+	catch (Exception $e) {

+		print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();

+	}

+

+

+	//print_r($stats);

+	echo json_encode($stats);

+	exit;

 

 

 }// end GA function

 

 

 function geodir_ga_get_token(){

-    $at = get_option('gd_ga_access_token');

-    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+	$at = get_option('gd_ga_access_token');

+	$use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

+	$response =  wp_remote_get($use_url,array('timeout' => 15));

 

-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

+	if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

-    return $at;

-    }else{//else get new access token

+	return $at;

+	}else{//else get new access token

 

-        $refresh_at = get_option('gd_ga_refresh_token');

-        if(!$refresh_at){

-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

-        }

+		$refresh_at = get_option('gd_ga_refresh_token');

+		if(!$refresh_at){

+			echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

+		}

 

-        $rat_url = "https://www.googleapis.com/oauth2/v3/token?";

-        $client_id = "client_id=".get_option('geodir_ga_client_id');

-        $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

-        $refresh_token = "&refresh_token=".$refresh_at;

-        $grant_type = "&grant_type=refresh_token";

+		$rat_url = "https://www.googleapis.com/oauth2/v3/token?";

+		$client_id = "client_id=".get_option('geodir_ga_client_id');

+		$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+		$refresh_token = "&refresh_token=".$refresh_at;

+		$grant_type = "&grant_type=refresh_token";

 

-        $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

+		$rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

 

-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

-            $parts = json_decode($rat_response['body']);

+		$rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

+		if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

+			$parts = json_decode($rat_response['body']);

 

 

-            update_option('gd_ga_access_token', $parts->access_token);

-            return $parts->access_token;

+			update_option('gd_ga_access_token', $parts->access_token);

+			return $parts->access_token;

 

-        }else{

-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

-        }

+		}else{

+			echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

+		}

 

 

-    }

+	}

 

 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -25,7 +25,7 @@ 
     $hours = intval(intval($sec) / 3600);

 

     // add to $hms, with a leading 0 if asked for

-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';

+    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':';

 

     // dividing the total seconds by 60 will give us

     // the number of minutes, but we're interested in

@@ -34,7 +34,7 @@ 
     $minutes = intval(($sec / 60) % 60);

 

     // then add to $hms (with a leading 0 if needed)

-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';

+    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':';

 

     // seconds are simple - just divide the total

     // seconds by 60 and keep the remainder

@@ -70,32 +70,32 @@ 
     $metrics = "ga:pageviews";

     $realtime = false;

     $limit = false;

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {

         $start_date = date('Y-m-d', strtotime("-6 day"));

         $end_date = date('Y-m-d');

         $dimensions = "ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {

         $start_date = date('Y-m-d', strtotime("-13 day"));

         $end_date = date('Y-m-d', strtotime("-7 day"));

         $dimensions = "ga:date,ga:nthDay";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {

         $start_date = date('Y')."-01-01";

         $end_date = date('Y-m-d');

         $dimensions = "ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {

         $start_date = date('Y', strtotime("-1 year"))."-01-01";

         $end_date = date('Y', strtotime("-1 year"))."-12-31";

         $dimensions = "ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {

         $start_date = "14daysAgo";

         $end_date = "yesterday";

         $dimensions = "ga:country";

         $sort = "ga:pageviews";

-        $limit  = 5;

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+        $limit = 5;

+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {

         $metrics = "rt:activeUsers";

         $realtime = true;

     }

@@ -104,15 +104,15 @@ 
     $gaApi = new GDGoogleAnalyticsStats();

 

     # Check if Google sucessfully logged in

-    if (!$gaApi->checkLogin()){

-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

+    if (!$gaApi->checkLogin()) {

+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));

         return false;

     }

 

     $account = $gaApi->getSingleProfile();

 

-    if(!isset($account[0]['id'])){

-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));

+    if (!isset($account[0]['id'])) {

+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));

         return false;

     }

 

@@ -125,10 +125,10 @@ 
 

     # Get the metrics needed to build the visits graph;

     try {

-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);

+        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit, $realtime);

     }

     catch (Exception $e) {

-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();

+        print 'GA Summary Widget - there was a service error '.$e->getCode().':'.$e->getMessage();

     }

 

 

@@ -140,19 +140,19 @@ 
 }// end GA function

 

 

-function geodir_ga_get_token(){

+function geodir_ga_get_token() {

     $at = get_option('gd_ga_access_token');

     $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+    $response = wp_remote_get($use_url, array('timeout' => 15));

 

-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else {//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

-        if(!$refresh_at){

-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

+        if (!$refresh_at) {

+            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;

         }

 

         $rat_url = "https://www.googleapis.com/oauth2/v3/token?";

@@ -163,16 +163,16 @@ 
 

         $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

 

-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

+        $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));

+        if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {

             $parts = json_decode($rat_response['body']);

 

 

             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

+        } else {

+            echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;

         }

 

 

Braces +8 added lines, -12 removed lines

@@ -74,28 +74,25 @@ 
         $start_date = date('Y-m-d', strtotime("-6 day"));

         $end_date = date('Y-m-d');

         $dimensions = "ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

         $start_date = date('Y-m-d', strtotime("-13 day"));

         $end_date = date('Y-m-d', strtotime("-7 day"));

         $dimensions = "ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

         $start_date = date('Y')."-01-01";

         $end_date = date('Y-m-d');

         $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

         $start_date = date('Y', strtotime("-1 year"))."-01-01";

         $end_date = date('Y', strtotime("-1 year"))."-12-31";

         $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

         $start_date = "14daysAgo";

         $end_date = "yesterday";

         $dimensions = "ga:country";

         $sort = "ga:pageviews";

         $limit  = 5;

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

         $metrics = "rt:activeUsers";

         $realtime = true;

     }

@@ -126,8 +123,7 @@ 
     # Get the metrics needed to build the visits graph;

     try {

         $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);

-    }

-    catch (Exception $e) {

+    } catch (Exception $e) {

         print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();

     }

 

@@ -148,7 +144,7 @@ 
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else{//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

         if(!$refresh_at){

@@ -171,7 +167,7 @@ 
             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

+        } else{

             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

         }

 

geodirectory.php

Indentation +90 added lines, -90 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -130,19 +130,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -181,72 +181,72 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/admin_dummy_data_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include Google Analytics Class.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/class.analytics.stats.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/admin_dummy_data_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include Google Analytics Class.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/class.analytics.stats.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

+	global $pagenow;

    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }

Spacing +25 added lines, -25 removed lines

@@ -34,7 +34,7 @@ 
     /**

      * Include WordPress core file so we can use core functions to check for active plugins.

      */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+    include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

@@ -68,8 +68,8 @@ 
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.

  */

 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;

-$plugin_prefix = $wpdb->prefix . 'geodir_';

-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);

+$plugin_prefix = $wpdb->prefix.'geodir_';

+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);

 

 /*

  * This will store the cached post custom fields per package for each page load so not to run for each listing.

@@ -84,24 +84,24 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');

 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');

 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');

 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');

 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');

 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');

 

 /*

  * Define our Google Analytic app settings

@@ -109,7 +109,7 @@ 
 if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

 if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

 if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly

 

 

 /*

@@ -118,7 +118,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'init', 'geodir_load_textdomain' );

+add_action('init', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -129,18 +129,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -179,7 +179,7 @@ 
 /*

  * Admin init + activation hooks

  */

-if (is_admin() || defined( 'GD_TESTING_MODE' )) {

+if (is_admin() || defined('GD_TESTING_MODE')) {

 

     /**

      * Include functions used in admin area only.

@@ -216,14 +216,14 @@ 
      *

      * @since 1.0.0

      */

-    require_once(geodir_plugin_path() . '/upgrade.php');

+    require_once(geodir_plugin_path().'/upgrade.php');

     if (get_option('geodir_installed') != 1) {

         /**

          * Define language constants, here as they are not loaded yet.

          *

          * @since 1.0.0

          */

-        require_once(geodir_plugin_path() . '/language.php');

+        require_once(geodir_plugin_path().'/language.php');

         /**

          * Include the plugin install file that sets up the databases and any options on first run.

          *

@@ -240,13 +240,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

-   if ( 'plugins.php' === $pagenow )

+   if ('plugins.php' === $pagenow)

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }

Braces +41 added lines, -13 removed lines

@@ -79,43 +79,71 @@
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+	define('WP_POST_REVISIONS', 0);
+}
 

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 /*

  * Define our Google Analytic app settings

  */

-if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

-if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

-if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_CLIENTID')) {
+	define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
+}
+if (!defined('GEODIR_GA_CLIENTSECRET')) {
+	define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C');
+}
+//don't worry - this don't need to be secret in our case

+if (!defined('GEODIR_GA_REDIRECT')) {
+	define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
+}
+if (!defined('GEODIR_GA_SCOPE')) {
+	define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');
+}
+//.readonly

 

 

 /*

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'init', 'geodir_load_textdomain' );

geodirectory_template_tags.php

Indentation +333 added lines, -333 removed lines

@@ -22,7 +22,7 @@ 
  */

 function geodir_core_dequeue_script()

 {

-    wp_dequeue_script('flexslider');

+	wp_dequeue_script('flexslider');

 }

 

 add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);

@@ -35,168 +35,168 @@ 
  */

 function geodir_templates_scripts()

 {

-    $is_detail_page = false;

-    $geodir_map_name = geodir_map_name();

+	$is_detail_page = false;

+	$geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

-        $is_detail_page = true;

-    }

-

-    wp_enqueue_script('jquery');

-

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-script');

+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+		$is_detail_page = true;

+	}

 

-    $geodir_vars_data = array(

-        'siteurl' => get_option('siteurl'),

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

-        'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

-    );

+	wp_enqueue_script('jquery');

+

+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-script');

+

+	$geodir_vars_data = array(

+		'siteurl' => get_option('siteurl'),

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+		'geodir_ajax_url' => geodir_get_ajax_url(),

+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

+	);

+

+	/**

+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

+	 *

+	 * This is used by addons to add JS translatable variables.

+	 *

+	 * @since 1.4.4

+	 * @param array $geodir_vars_data {

+	 *    geodir var data used by addons to add JS translatable variables.

+	 *

+	 *    @type string $siteurl Site url.

+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.

+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

+	 *    @type int $is_rtl Checks if current locale is RTL.

+	 *

+	 * }

+	 */

+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+

+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

+

+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+

+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+	wp_enqueue_script('geodirectory-lightbox-jquery');

+

+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+	if ($is_detail_page) {

+		wp_enqueue_script('geodirectory-jquery-simplemodal');

+	}

 

-    /**

-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

-     *

-     * This is used by addons to add JS translatable variables.

-     *

-     * @since 1.4.4

-     * @param array $geodir_vars_data {

-     *    geodir var data used by addons to add JS translatable variables.

-     *

-     *    @type string $siteurl Site url.

-     *    @type string $geodir_plugin_url Geodirectory core plugin url.

-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

-     *    @type int $is_rtl Checks if current locale is RTL.

-     *

-     * }

-     */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

-

-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

-

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

-

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

-    wp_enqueue_script('geodirectory-lightbox-jquery');

-

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

-    if ($is_detail_page) {

-        wp_enqueue_script('geodirectory-jquery-simplemodal');

-    }

-

-    if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

-        /**

-         * Filter the variables that are added to the end of the google maps script call.

-         *

-         * This i used to change things like google maps language etc.

-         *

-         * @since 1.0.0

-         * @param string $var The string to filter, default is empty string.

-         */

-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

-    }

+	if (in_array($geodir_map_name, array('auto', 'google'))) {

+		$map_lang = "&language=" . geodir_get_map_default_language();

+		$map_key = "&key=" . geodir_get_map_api_key();

+		/**

+		 * Filter the variables that are added to the end of the google maps script call.

+		 *

+		 * This i used to change things like google maps language etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to filter, default is empty string.

+		 */

+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+		wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+	}

     

-    if ($geodir_map_name == 'osm') {

-        // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-leaflet-style');

+	if ($geodir_map_name == 'osm') {

+		// Leaflet OpenStreetMap

+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-script');

+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-leaflet-geo-script');

+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-leaflet-geo-script');

         

-        if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-routing-style');

+		if ($is_detail_page) {

+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-routing-script');

-        }

-    }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-routing-script');

+		}

+	}

+	wp_enqueue_script( 'jquery-ui-autocomplete' );

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

-    wp_enqueue_script('geodirectory-goMap-script');

-

-

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('chosen');

-

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_script('geodirectory-choose-ajax');

-

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

-

-    if (is_page() && geodir_is_page('add-listing')) {

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-plupload-script');

-        // SCRIPT FOR UPLOAD END

-

-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-        } else {

-            $ajax_url = admin_url('admin-ajax.php');

-        }

+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+	wp_enqueue_script('geodirectory-goMap-script');

+

+

+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('chosen');

+

+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_script('geodirectory-choose-ajax');

+

+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+

+	if (is_page() && geodir_is_page('add-listing')) {

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-plupload-script');

+		// SCRIPT FOR UPLOAD END

+

+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+		} else {

+			$ajax_url = admin_url('admin-ajax.php');

+		}

 

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => $ajax_url,

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'upload_img_size' => geodir_max_upload_size());

-

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

-

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

-    } // End if for add place page

-

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    if ($is_detail_page) {

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => $ajax_url,

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'upload_img_size' => geodir_max_upload_size());

+

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+

+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+	} // End if for add place page

+

+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

-    // font awesome rating script

+	// font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

@@ -205,11 +205,11 @@ 
 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('geodir-on-document-load');

+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('google-geometa');

+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('google-geometa');

 }

 

 /**

@@ -223,8 +223,8 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

-    echo stripslashes(get_option('geodir_header_scripts'));

+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+	echo stripslashes(get_option('geodir_header_scripts'));

 }

 

 

@@ -240,7 +240,7 @@ 
 function geodir_footer_scripts()

 {	

 

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

 

         <script>

             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -254,20 +254,20 @@ 
         </script>

 

 <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

-        echo stripslashes(get_option('geodir_ga_tracking_code'));

-    }

+	}elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+		echo stripslashes(get_option('geodir_ga_tracking_code'));

+	}

 

-    echo stripslashes(get_option('geodir_footer_scripts'));

+	echo stripslashes(get_option('geodir_footer_scripts'));

 

-    /*

+	/*

      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041

      *

      * Flexbox wont wrap on ios for search form items

      */

-    if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

-    }

+	if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

+	}

 }

 

 

@@ -281,12 +281,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

+	if (strpos($url, '#asyncload')===false)

+		return $url;

+	else if (is_admin())

+		return str_replace('#asyncload', '', $url);

+	else

+		return str_replace('#asyncload', '', $url)."' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -299,17 +299,17 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodir-core-scss');

+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodirectory-frontend-rtl-style');

-    }

+	if(is_rtl()){

+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodirectory-frontend-rtl-style');

+	}

 

-    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('font-awesome');

+	wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('font-awesome');

 

 

 }

@@ -323,7 +323,7 @@ 
  */

 function geodir_get_sidebar()

 {

-    get_sidebar('geodirectory');

+	get_sidebar('geodirectory');

 }

 

 /**

@@ -342,122 +342,122 @@ 
  * @param bool $always_show Do you want to show the pagination always? Default: false.

  */

 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {

-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

 

-    if (empty($prelabel)) {

-        $prelabel = '<strong>&laquo;</strong>';

-    }

+	if (empty($prelabel)) {

+		$prelabel = '<strong>&laquo;</strong>';

+	}

 

-    if (empty($nxtlabel)) {

-        $nxtlabel = '<strong>&raquo;</strong>';

-    }

+	if (empty($nxtlabel)) {

+		$nxtlabel = '<strong>&raquo;</strong>';

+	}

 

-    $half_pages_to_show = round($pages_to_show / 2);

+	$half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

+		return;

 

-    if (!is_single()) {

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

-        $numposts = $wp_query->found_posts;

+	if (!is_single()) {

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

+		$numposts = $wp_query->found_posts;

 

-        $max_page = ceil($numposts / $posts_per_page);

+		$max_page = ceil($numposts / $posts_per_page);

 

-        if (empty($paged)) {

-            $paged = 1;

-        }

+		if (empty($paged)) {

+			$paged = 1;

+		}

         

-        $post_type = geodir_get_current_posttype();

-        $listing_type_name = get_post_type_plural_label($post_type);

-        if (geodir_is_page('listing') || geodir_is_page('search')) {            

-            $term = array();

+		$post_type = geodir_get_current_posttype();

+		$listing_type_name = get_post_type_plural_label($post_type);

+		if (geodir_is_page('listing') || geodir_is_page('search')) {            

+			$term = array();

             

-            if (is_tax()) {

-                $term_id = get_queried_object_id();

-                $taxonomy = get_query_var('taxonomy');

+			if (is_tax()) {

+				$term_id = get_queried_object_id();

+				$taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

-                }

-            }

+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

+					$term = get_term($term_id, $post_type . 'category');

+				}

+			}

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

                 

-                if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

-                }

-            }

+				if (!is_array($taxonomy_search)) {

+					$term = get_term((int)$taxonomy_search, $post_type . 'category');

+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+				}

+			}

             

-            if (!empty($term) && !is_wp_error($term)) {

-                $listing_type_name = $term->name;

-            }

-        }

+			if (!empty($term) && !is_wp_error($term)) {

+				$listing_type_name = $term->name;

+			}

+		}

 

-        if ($max_page > 1 || $always_show) {            

-            // Extra pagination info

-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

-            $end_no = min($paged * $posts_per_page, $numposts);

+		if ($max_page > 1 || $always_show) {            

+			// Extra pagination info

+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

+			$end_no = min($paged * $posts_per_page, $numposts);

 

-            if ($geodir_pagination_more_info != '') {

-                if ($listing_type_name) {

-                    $listing_type_name = __($listing_type_name, 'geodirectory');

-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

-                } else {

-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

-                }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

-                /**

-                 * Adds an extra pagination info above/under pagination.

-                 *

-                 * @since 1.5.9

-                 *

-                 * @param string $pagination_info Extra pagination info content.

-                 * @param string $listing_type_name Listing results type.

-                 * @param string $start_no First result number.

-                 * @param string $end_no Last result number.

-                 * @param string $numposts Total number of listings.

-                 * @param string $post_type The post type.

-                 */

-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

+			if ($geodir_pagination_more_info != '') {

+				if ($listing_type_name) {

+					$listing_type_name = __($listing_type_name, 'geodirectory');

+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

+				} else {

+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

+				}

+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+				/**

+				 * Adds an extra pagination info above/under pagination.

+				 *

+				 * @since 1.5.9

+				 *

+				 * @param string $pagination_info Extra pagination info content.

+				 * @param string $listing_type_name Listing results type.

+				 * @param string $start_no First result number.

+				 * @param string $end_no Last result number.

+				 * @param string $numposts Total number of listings.

+				 * @param string $post_type The post type.

+				 */

+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

-                if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

-                } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

-                }

-            }

+				if ($geodir_pagination_more_info == 'before') {

+					$before = $before . $pagination_info;

+				} else if ($geodir_pagination_more_info == 'after') {

+					$after = $pagination_info . $after;

+				}

+			}

             

-            echo "$before <div class='Navi gd-navi'>";

-            if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

-            }

-            previous_posts_link($prelabel);

-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

-                if ($i >= 1 && $i <= $max_page) {

-                    if ($i == $paged) {

-                        echo "<strong class='on'>$i</strong>";

-                    } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

-                    }

-                }

-            }

-            next_posts_link($nxtlabel, $max_page);

-            if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

-            }

-            echo "</div> $after";

-        }

+			echo "$before <div class='Navi gd-navi'>";

+			if ($paged >= ($pages_to_show - 1)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+			}

+			previous_posts_link($prelabel);

+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

+				if ($i >= 1 && $i <= $max_page) {

+					if ($i == $paged) {

+						echo "<strong class='on'>$i</strong>";

+					} else {

+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+					}

+				}

+			}

+			next_posts_link($nxtlabel, $max_page);

+			if (($paged + $half_pages_to_show) < ($max_page)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+			}

+			echo "</div> $after";

+		}

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-    }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

+	}

 }

 

 /**

@@ -468,20 +468,20 @@ 
  */

 function geodir_listingsearch_scripts()

 {

-    if (get_option('gd_search_dist') != '') {

-        $dist = get_option('gd_search_dist');

-    } else {

-        $dist = 500;

-    }

-    $dist_dif = 1000;

-

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

-

-    ?>

+	if (get_option('gd_search_dist') != '') {

+		$dist = get_option('gd_search_dist');

+	} else {

+		$dist = 500;

+	}

+	$dist_dif = 1000;

+

+	if ($dist <= 5000) $dist_dif = 500;

+	if ($dist <= 1000) $dist_dif = 100;

+	if ($dist <= 500) $dist_dif = 50;

+	if ($dist <= 100) $dist_dif = 10;

+	if ($dist <= 50) $dist_dif = 5;

+

+	?>

     <script type="text/javascript">

 

         jQuery(function ($) {

@@ -540,15 +540,15 @@ 
 function geodir_add_sharelocation_scripts()

 {

 

-    $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+	$default_search_for_text = SEARCH_FOR_TEXT;

+	if (get_option('geodir_search_field_default_text'))

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 

-    $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+	$default_near_text = NEAR_TEXT;

+	if (get_option('geodir_near_field_default_text'))

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 

-    ?>

+	?>

 

 

     <script type="text/javascript">

@@ -631,14 +631,14 @@ 
                     initialise2();

                 } else {

                     <?php

-                    $near_add = get_option('geodir_search_near_addition');

-                    /**

-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.

-                     *

-                     * @since 1.0.0

-                     */

-                    $near_add2 = apply_filters('geodir_search_near_addition', '');

-                    ?>

+					$near_add = get_option('geodir_search_near_addition');

+					/**

+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.

+					 *

+					 * @since 1.0.0

+					 */

+					$near_add2 = apply_filters('geodir_search_near_addition', '');

+					?>

                     if (window.gdMaps === 'google') {

                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

                             function (results, status) {

@@ -741,30 +741,30 @@ 
  */

 function geodir_show_badges_on_image($which, $post, $link)

 {

-    $return = '';

-    switch ($which) {

-        case 'featured':

-            /**

-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

-            break;

-        case 'new' :

-            /**

-             * Filter the new image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

-            break;

-

-    }

+	$return = '';

+	switch ($which) {

+		case 'featured':

+			/**

+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+			break;

+		case 'new' :

+			/**

+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+			break;

+

+	}

     

-    return $return;

+	return $return;

 }

Spacing +71 added lines, -71 removed lines

@@ -38,21 +38,21 @@ 
     $is_detail_page = false;

     $geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

     wp_enqueue_script('jquery');

 

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-script');

 

     $geodir_vars_data = array(

         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -73,24 +73,24 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

 

     if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

+        $map_lang = "&language=".geodir_get_map_default_language();

+        $map_key = "&key=".geodir_get_map_api_key();

         /**

          * Filter the variables that are added to the end of the google maps script call.

          *

@@ -100,48 +100,48 @@ 
          * @param string $var The string to filter, default is empty string.

          */

         $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

     }

     

     if ($geodir_map_name == 'osm') {

         // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-geo-script');

         

         if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-routing-script');

         }

     }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+    wp_enqueue_script('jquery-ui-autocomplete');

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-goMap-script');

 

 

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('chosen');

 

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-choose-ajax');

 

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

 

     if (is_page() && geodir_is_page('add-listing')) {

         // SCRIPT FOR UPLOAD

         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -188,27 +188,27 @@ 
 

         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');

     } // End if for add place page

 

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

     // font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

 	} else { // default rating script

-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('google-geometa');

 }

 

@@ -223,7 +223,7 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';

     echo stripslashes(get_option('geodir_header_scripts'));

 }

 

@@ -240,7 +240,7 @@ 
 function geodir_footer_scripts()

 {	

 

-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>

+    if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>

 

         <script>

             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -248,13 +248,13 @@ 
                 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

 

-            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');

+            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');

             ga('send', 'pageview');

 

         </script>

 

 <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 

@@ -265,7 +265,7 @@ 
      *

      * Flexbox wont wrap on ios for search form items

      */

-    if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+    if (preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {

         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";

     }

 }

@@ -281,7 +281,7 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

@@ -299,12 +299,12 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+    if (is_rtl()) {

+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

 

@@ -378,18 +378,18 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {

+                    $term = get_term($term_id, $post_type.'category');

                 }

             }

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {

+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type.'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');

                 }

             }

             

@@ -401,7 +401,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -411,7 +411,7 @@ 
                 } else {

                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

                 }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';

                 /**

                  * Adds an extra pagination info above/under pagination.

                  *

@@ -427,15 +427,15 @@ 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

                 if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

+                    $before = $before.$pagination_info;

                 } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

+                    $after = $pagination_info.$after;

                 }

             }

             

             echo "$before <div class='Navi gd-navi'>";

             if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';

             }

             previous_posts_link($prelabel);

             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -443,13 +443,13 @@ 
                     if ($i == $paged) {

                         echo "<strong class='on'>$i</strong>";

                     } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';

                     }

                 }

             }

             next_posts_link($nxtlabel, $max_page);

             if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';

             }

             echo "</div> $after";

         }

@@ -487,7 +487,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -552,7 +552,7 @@ 
 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';

         var latlng;

         var address;

         var dist = 0;

@@ -568,7 +568,7 @@ 
 				var $form = jQuery(this).closest('form');

 

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -582,7 +582,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -600,7 +600,7 @@ 
         });

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -619,15 +619,15 @@ 
             // Call the geocode function

             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

             } else {

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

                     <?php

@@ -640,12 +640,12 @@ 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');

                     ?>

                     if (window.gdMaps === 'google') {

-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},

                             function (results, status) {

                                 if (status == google.maps.GeocoderStatus.OK) {

                                     updateSearchPosition(results[0].geometry.location, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);

+                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);

                                 }

                             });

                     } else if (window.gdMaps === 'osm') {

@@ -654,7 +654,7 @@ 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {

                                     updateSearchPosition(geo, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");

+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");

                                 }

                             });

                     } else {

@@ -700,19 +700,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -751,7 +751,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -761,7 +761,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

Braces +38 added lines, -20 removed lines

@@ -254,7 +254,7 @@ 
         </script>

 

 <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 

@@ -281,13 +281,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

 /**

@@ -354,8 +355,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home')) {
+    	// dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

         if (function_exists('geodir_location_geo_home_link')) {

@@ -475,11 +478,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+    	$dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+    	$dist_dif = 100;
+    }
+    if ($dist <= 500) {
+    	$dist_dif = 50;
+    }
+    if ($dist <= 100) {
+    	$dist_dif = 10;
+    }
+    if ($dist <= 50) {
+    	$dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -541,18 +554,23 @@ 
 {

 

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
 

     ?>

 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if($search_location = geodir_get_default_location()) {
+	echo $search_location->city ;
+}
+?>';

         var latlng;

         var address;

         var dist = 0;

geodirectory-admin/admin_dummy_data_functions.php

Indentation +230 added lines, -230 removed lines

@@ -19,149 +19,149 @@ 
  * @global string $dummy_image_path The dummy image path.
  */
 function geodir_dummy_data_taxonomies($post_type,$category_array) {
-    global $wpdb, $dummy_image_path;
+	global $wpdb, $dummy_image_path;
 
 
 
-    $last_catid = '';
+	$last_catid = '';
 
-    $uploads = wp_upload_dir(); // Array of key => value pairs
+	$uploads = wp_upload_dir(); // Array of key => value pairs
 
-    for ($i = 0; $i < count($category_array); $i++) {
-        $parent_catid = 0;
-        if (is_array($category_array[$i])) {
-            $cat_name_arr = $category_array[$i];
-            for ($j = 0; $j < count($cat_name_arr); $j++) {
-                $catname = $cat_name_arr[$j];
+	for ($i = 0; $i < count($category_array); $i++) {
+		$parent_catid = 0;
+		if (is_array($category_array[$i])) {
+			$cat_name_arr = $category_array[$i];
+			for ($j = 0; $j < count($cat_name_arr); $j++) {
+				$catname = $cat_name_arr[$j];
 
-                if (!term_exists($catname, $post_type.'category')) {
-                    $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
+				if (!term_exists($catname, $post_type.'category')) {
+					$last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
 
-                    if ($j == 0) {
-                        $parent_catid = $last_catid;
-                    }
+					if ($j == 0) {
+						$parent_catid = $last_catid;
+					}
 
 
-                    if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                    else
-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+					if (geodir_dummy_folder_exists())
+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+					else
+						$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                    $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+					$catname = str_replace(' ', '_', $catname);
+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                    if (empty($uploaded['error'])) {
-                        $new_path = $uploaded['file'];
-                        $new_url = $uploaded['url'];
-                    }
+					if (empty($uploaded['error'])) {
+						$new_path = $uploaded['file'];
+						$new_url = $uploaded['url'];
+					}
 
-                    $wp_filetype = wp_check_filetype(basename($new_path), null);
-
-                    $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                        'post_mime_type' => $wp_filetype['type'],
-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                        'post_content' => '',
-                        'post_status' => 'inherit'
-                    );
-                    $attach_id = wp_insert_attachment($attachment, $new_path);
-
-                    // you must first include the image.php file
-                    // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                    wp_update_attachment_metadata($attach_id, $attach_data);
-
-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
-                    }
-                }
-            }
+					$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-        } else {
-            $catname = $category_array[$i];
+					$attachment = array(
+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+						'post_mime_type' => $wp_filetype['type'],
+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+						'post_content' => '',
+						'post_status' => 'inherit'
+					);
+					$attach_id = wp_insert_attachment($attachment, $new_path);
 
-            if (!term_exists($catname, $post_type.'category')) {
-                $last_catid = wp_insert_term($catname, $post_type.'category');
+					// you must first include the image.php file
+					// for the function wp_generate_attachment_metadata() to work
+					require_once(ABSPATH . 'wp-admin/includes/image.php');
+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+					wp_update_attachment_metadata($attach_id, $attach_data);
 
-                if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                else
-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
+					}
+				}
+			}
 
-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+		} else {
+			$catname = $category_array[$i];
 
-                $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+			if (!term_exists($catname, $post_type.'category')) {
+				$last_catid = wp_insert_term($catname, $post_type.'category');
 
-                if (empty($uploaded['error'])) {
-                    $new_path = $uploaded['file'];
-                    $new_url = $uploaded['url'];
-                }
+				if (geodir_dummy_folder_exists())
+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+				else
+					$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
-                $wp_filetype = wp_check_filetype(basename($new_path), null);
+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                    'post_mime_type' => $wp_filetype['type'],
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                    'post_content' => '',
-                    'post_status' => 'inherit'
-                );
+				$catname = str_replace(' ', '_', $catname);
+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                $attach_id = wp_insert_attachment($attachment, $new_path);
+				if (empty($uploaded['error'])) {
+					$new_path = $uploaded['file'];
+					$new_url = $uploaded['url'];
+				}
 
+				$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-                // you must first include the image.php file
-                // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                wp_update_attachment_metadata($attach_id, $attach_data);
+				$attachment = array(
+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+					'post_mime_type' => $wp_filetype['type'],
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+					'post_content' => '',
+					'post_status' => 'inherit'
+				);
+
+				$attach_id = wp_insert_attachment($attachment, $new_path);
 
-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
-                }
-            }
-        }
 
-    }
+				// you must first include the image.php file
+				// for the function wp_generate_attachment_metadata() to work
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+				wp_update_attachment_metadata($attach_id, $attach_data);
+
+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
+				}
+			}
+		}
+
+	}
 }
 
 
 function geodir_dummy_data_types(){
-    return array(
-        'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
-            'count'=> 30
-        ),
-        'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
-            'count'=> 10
-        ),
-        'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
-            'count'=> 10
-        )
-    );
+	return array(
+		'standard_places' => array(
+			'name'=>__('Default','geodirectory'),
+			'count'=> 30
+		),
+		'property_sale' => array(
+			'name'=>__('Property for sale','geodirectory'),
+			'count'=> 10
+		),
+		'property_rent' => array(
+			'name'=>__('Property for rent','geodirectory'),
+			'count'=> 10
+		)
+	);
 }
 
 
 function geodir_create_dummy_fields($fields)
 {
     
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.0.0
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
-    foreach ($fields as $field_index => $field) {
-        geodir_custom_field_save($field);
-
-    }
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.0.0
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
+	foreach ($fields as $field_index => $field) {
+		geodir_custom_field_save($field);
+
+	}
 }
 
 /**
@@ -174,20 +174,20 @@ 
  */
 function geodir_delete_dummy_posts($post_type,$data_type)
 {
-    global $wpdb, $plugin_prefix;
+	global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
 
 
-    foreach ($post_ids as $post_ids_obj) {
-        wp_delete_post($post_ids_obj->post_id);
-    }
+	foreach ($post_ids as $post_ids_obj) {
+		wp_delete_post($post_ids_obj->post_id);
+	}
 
-    //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+	//double check posts are deleted
+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+	update_option($post_type.'_dummy_data_type','');
 }
 
 /**
@@ -201,78 +201,78 @@ 
 function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
 {
 
-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
-    $data_types = geodir_dummy_data_types();
-
-    $total_count = 0;
-    global $dummy_post_index;
-    $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
-            $total_count = $val['count'];
-            if($key=='standard_places'){
-                /**
-                 * Contains dummy post content.
-                 *
-                 * @since 1.0.0
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_rent.php' );
-            }
-
-        }
-
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
-    }
-
-
-
-    // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
-        flush_rewrite_rules();
-    }
+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
+	$data_types = geodir_dummy_data_types();
+
+	$total_count = 0;
+	global $dummy_post_index;
+	$dummy_post_index = $item_index;
+	foreach( $data_types as $key=>$val){
+		if($key==$data_type){
+			$total_count = $val['count'];
+			if($key=='standard_places'){
+				/**
+				 * Contains dummy post content.
+				 *
+				 * @since 1.0.0
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/standard_places.php' );
+			}elseif($key=='property_sale'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_sale.php' );
+			}elseif($key=='property_rent'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_rent.php' );
+			}
+
+		}
+
+		do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+	}
+
+
+
+	// delete image cache on last entry
+	if($total_count == $item_index){
+		delete_transient( 'cached_dummy_images' );
+		flush_rewrite_rules();
+	}
 
 
 }
 
 
 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
-    /**
-     * GeoDirectory dummy data installation.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param string $post_type The post type.
-     */
-    function geodir_autoinstall_admin_header($post_type = 'gd_place')
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
-        } else {
-
-            ?>
+	/**
+	 * GeoDirectory dummy data installation.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param string $post_type The post type.
+	 */
+	function geodir_autoinstall_admin_header($post_type = 'gd_place')
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		if (!geodir_is_default_location_set()) {
+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+		} else {
+
+			?>
             <table class="form-table gd-dummy-table">
                 <tbody>
                 <tr>
@@ -283,77 +283,77 @@ 
 
                 <?php
 
-                $cpts = geodir_get_posttypes('array');
+				$cpts = geodir_get_posttypes('array');
 
-                $data_types = geodir_dummy_data_types();
+				$data_types = geodir_dummy_data_types();
 
-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+				foreach($cpts as $post_type=>$cpt){
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+					$data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
 
 
-                    $set_dt = get_option($post_type.'_dummy_data_type');
+					$set_dt = get_option($post_type.'_dummy_data_type');
 
-                    $count = 30;
+					$count = 30;
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+					geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+					$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
 
-                    echo "<tr>";
-                    echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
+					echo "<tr>";
+					echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
 
 
-                    $select_disabled = $post_counts > 0 ? 'disabled' : '';
-                    echo "<td>";
-                    echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
-                        if($selected){$count = $val['count'];}
-                        echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
-                    }
-                    echo "</select>";
-
-                    $select_display = $post_counts > 0 ? 'display:none;' : '';
-                    echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
-                    $x = 1;
-                    while($x <= $count){
-                        $selected = ($x==$count) ? "selected='selected'" : '';
-                        echo "<option $selected value='$x'>".$x."</option>";
-                        $x++;
-                    }
-                    echo "</select>";
-                    echo "</td>";
+					$select_disabled = $post_counts > 0 ? 'disabled' : '';
+					echo "<td>";
+					echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
+					foreach($data_types_for as $key=>$val){
+						$selected = ($key==$set_dt) ? "selected='selected'" : '';
+						if($selected){$count = $val['count'];}
+						echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
+					}
+					echo "</select>";
 
+					$select_display = $post_counts > 0 ? 'display:none;' : '';
+					echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
+					$x = 1;
+					while($x <= $count){
+						$selected = ($x==$count) ? "selected='selected'" : '';
+						echo "<option $selected value='$x'>".$x."</option>";
+						$x++;
+					}
+					echo "</select>";
+					echo "</td>";
 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }
 
-                    echo "</tr>";
-                    //print_r($cpt);
-                }
+					if($post_counts > 0){
+						echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}else{
+						echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}
+
+					echo "</tr>";
+					//print_r($cpt);
+				}
 
-                ?>
+				?>
                 </tbody>
             </table>
             <?php
 
 
-            $default_location = geodir_get_default_location();
-            $city = isset($default_location->city) ? $default_location->city : '';
-            $region = isset($default_location->region) ? $default_location->region : '';
-            $country = isset($default_location->country) ? $default_location->country : '';
-            $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            ?>
+			$default_location = geodir_get_default_location();
+			$city = isset($default_location->city) ? $default_location->city : '';
+			$region = isset($default_location->region) ? $default_location->region : '';
+			$country = isset($default_location->country) ? $default_location->country : '';
+			$city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			?>
             <script type="text/javascript">
 
                 function geodir_dummy_set_count(data,cpt){
@@ -563,7 +563,7 @@ 
                 }
             </script>
             <?php
-        }
-    }
+		}
+	}
 }
 

Spacing +59 added lines, -59 removed lines

@@ -18,7 +18,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $dummy_image_path The dummy image path.
  */
-function geodir_dummy_data_taxonomies($post_type,$category_array) {
+function geodir_dummy_data_taxonomies($post_type, $category_array) {
     global $wpdb, $dummy_image_path;
 
 
@@ -43,14 +43,14 @@ 
 
 
                     if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                     else
                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                     $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                     if (empty($uploaded['error'])) {
                         $new_path = $uploaded['file'];
@@ -60,7 +60,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                     $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),
                         'post_mime_type' => $wp_filetype['type'],
                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                         'post_content' => '',
@@ -70,7 +70,7 @@ 
 
                     // you must first include the image.php file
                     // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
+                    require_once(ABSPATH.'wp-admin/includes/image.php');
                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                     wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -87,14 +87,14 @@ 
                 $last_catid = wp_insert_term($catname, $post_type.'category');
 
                 if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                 else
                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                 $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                 if (empty($uploaded['error'])) {
                     $new_path = $uploaded['file'];
@@ -104,7 +104,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                 $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),
                     'post_mime_type' => $wp_filetype['type'],
                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                     'post_content' => '',
@@ -116,7 +116,7 @@ 
 
                 // you must first include the image.php file
                 // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
+                require_once(ABSPATH.'wp-admin/includes/image.php');
                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                 wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -130,18 +130,18 @@ 
 }
 
 
-function geodir_dummy_data_types(){
+function geodir_dummy_data_types() {
     return array(
         'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
+            'name'=>__('Default', 'geodirectory'),
             'count'=> 30
         ),
         'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
+            'name'=>__('Property for sale', 'geodirectory'),
             'count'=> 10
         ),
         'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
+            'name'=>__('Property for rent', 'geodirectory'),
             'count'=> 10
         )
     );
@@ -172,12 +172,12 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  */
-function geodir_delete_dummy_posts($post_type,$data_type)
+function geodir_delete_dummy_posts($post_type, $data_type)
 {
     global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
 
     foreach ($post_ids as $post_ids_obj) {
@@ -185,9 +185,9 @@ 
     }
 
     //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+    $wpdb->get_results("DELETE FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+    update_option($post_type.'_dummy_data_type', '');
 }
 
 /**
@@ -198,7 +198,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global object $current_user Current user object.
  */
-function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
+function geodir_insert_dummy_posts($post_type, $data_type, $item_index)
 {
 
     ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
@@ -207,45 +207,45 @@ 
     $total_count = 0;
     global $dummy_post_index;
     $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
+    foreach ($data_types as $key=>$val) {
+        if ($key == $data_type) {
             $total_count = $val['count'];
-            if($key=='standard_places'){
+            if ($key == 'standard_places') {
                 /**
                  * Contains dummy post content.
                  *
                  * @since 1.0.0
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
+                include_once('dummy-data/standard_places.php');
+            }elseif ($key == 'property_sale') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
+                include_once('dummy-data/property_sale.php');
+            }elseif ($key == 'property_rent') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_rent.php' );
+                include_once('dummy-data/property_rent.php');
             }
 
         }
 
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+        do_action('geodir_insert_dummy_data_loop', $post_type, $data_type, $item_index);
     }
 
 
 
     // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
+    if ($total_count == $item_index) {
+        delete_transient('cached_dummy_images');
         flush_rewrite_rules();
     }
 
@@ -253,7 +253,7 @@ 
 }
 
 
-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {
     /**
      * GeoDirectory dummy data installation.
      *
@@ -269,16 +269,16 @@ 
         global $wpdb, $plugin_prefix;
 
         if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
         } else {
 
             ?>
             <table class="form-table gd-dummy-table">
                 <tbody>
                 <tr>
-                    <td><strong><?php _e('CPT','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Data Type','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Action','geodirectory');?></strong></td>
+                    <td><strong><?php _e('CPT', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Data Type', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>
                 </tr>
 
                 <?php
@@ -289,18 +289,18 @@ 
 
                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+                foreach ($cpts as $post_type=>$cpt) {
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+                    $data_types_for = apply_filters('geodir_dummy_date_types_for', $data_types, $post_type);
 
 
                     $set_dt = get_option($post_type.'_dummy_data_type');
 
                     $count = 30;
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+                    geodir_add_column_if_not_exist($plugin_prefix.$post_type."_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
                     echo "<tr>";
                     echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
@@ -309,9 +309,9 @@ 
                     $select_disabled = $post_counts > 0 ? 'disabled' : '';
                     echo "<td>";
                     echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
-                        if($selected){$count = $val['count'];}
+                    foreach ($data_types_for as $key=>$val) {
+                        $selected = ($key == $set_dt) ? "selected='selected'" : '';
+                        if ($selected) {$count = $val['count']; }
                         echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
                     }
                     echo "</select>";
@@ -319,8 +319,8 @@ 
                     $select_display = $post_counts > 0 ? 'display:none;' : '';
                     echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
                     $x = 1;
-                    while($x <= $count){
-                        $selected = ($x==$count) ? "selected='selected'" : '';
+                    while ($x <= $count) {
+                        $selected = ($x == $count) ? "selected='selected'" : '';
                         echo "<option $selected value='$x'>".$x."</option>";
                         $x++;
                     }
@@ -331,10 +331,10 @@ 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+                    if ($post_counts > 0) {
+                        echo '<td><input type="button" value="'.__('Remove data', 'geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
+                    } else {
+                        echo '<td><input type="button" value="'.__('Insert data', 'geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
                     }
 
                     echo "</tr>";
@@ -370,7 +370,7 @@ 
 
                 }
                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;
-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';
+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';
                 var bound_lat_lng;
                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];
                 var lat = <?php echo $city_latitude; ?>;
@@ -400,7 +400,7 @@ 
                                     return x.replace(" ", '');
                                 }); // remove spaces from lat/lon
                             } 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);
                             }
                         });
                 } else if (window.gdMaps == 'osm') {
@@ -425,7 +425,7 @@ 
                     var total_dummy_post_count = jQuery('#sub_' + active_tab).find('.selected_sample_data').val();
 
                     if (id == 'geodir_dummy_delete') {
-                        if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
+                        if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
                             jQuery('#sub_' + active_tab).find('.geodir_auto_install').hide();
                             jQuery('#sub_' + active_tab).find('.geodir_show_progress').show();
                             jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&_wpnonce=' + nonce,
@@ -446,7 +446,7 @@ 
                         var post_url = '<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce;
 
                         jQuery.post( post_url, function (data) {
-                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');
+                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');
 
                             dummy_post_index++;
 
@@ -461,7 +461,7 @@ 
 
 
                 function gdRemoveDummyData(obj, nonce, posttype){
-                    if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
+                    if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
                         jQuery(obj).prop('disabled', true);
                         jQuery('.gd-dummy-data-results-' + posttype).remove();
                         jQuery('<tr class="gd-dummy-data-results gd-dummy-data-results-' + posttype + '" >'+
@@ -476,14 +476,14 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation')); ?>');
 
 
                         jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=geodir_dummy_delete&posttype=' + posttype + '&_wpnonce=' + nonce,
                             function (data) {
-                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                                 jQuery(obj).removeClass('gd-remove-data');
-                                jQuery(obj).val('<?php _e('Insert data','geodirectory');?>');
+                                jQuery(obj).val('<?php _e('Insert data', 'geodirectory'); ?>');
                                 jQuery(obj).prop('disabled', false);
                                 jQuery('#'+posttype+'_data_type_count').show();
                                 jQuery('#'+posttype+'_data_type').prop('disabled', false);
@@ -526,7 +526,7 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation')); ?>');
                     }
 
                     if (!(typeof bound_lat_lng == 'object' && bound_lat_lng.length == 4)) {
@@ -546,15 +546,15 @@ 
                             percentage = percentage > 100 ? 100 : percentage;
 
 
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation')); ?>');
 
                             gdInstallDummyData(obj, nonce, posttype,insertedCount);
                         }
                         else {
                             percentage = 100;
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                             jQuery(obj).addClass('gd-remove-data');
-                            jQuery(obj).val('<?php _e('Remove data','geodirectory');?>');
+                            jQuery(obj).val('<?php _e('Remove data', 'geodirectory'); ?>');
                             jQuery(obj).prop('disabled', false);
 
                         }

geodirectory-admin/admin_functions.php

Indentation +2816 added lines, -2816 removed lines

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

  */

 function geodir_deactivation() {

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles() {

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-admin-css');

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles() {

+		wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-frontend-style');

+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-chosen-style');

+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-css');

+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-custom-fields-css');

+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-pluplodar-css');

+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rating-style');

+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rtl-style');

-    }

+		wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rtl-style');

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

 

-        wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('font-awesome');

+		wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin');

+		wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-        $geodir_map_name = geodir_map_name();

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+		$geodir_map_name = geodir_map_name();

         

-        wp_enqueue_script('jquery');

+		wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+		wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('chosen');

+		wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-choose-ajax');

+		wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

-        }

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

+			wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+		}

 

-        wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+		wp_enqueue_script('geodirectory-custom-fields-script');

+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

 

-        if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

-            /** This filter is documented in geodirectory_template_tags.php */

-            $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

-        }

+		if (in_array($geodir_map_name, array('auto', 'google'))) {

+			$map_lang = "&language=" . geodir_get_map_default_language();

+			$map_key = "&key=" . geodir_get_map_api_key();

+			/** This filter is documented in geodirectory_template_tags.php */

+			$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+			wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+		}

         

-        if ($geodir_map_name == 'osm') {

-            // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-style');

+		if ($geodir_map_name == 'osm') {

+			// Leaflet OpenStreetMap

+			wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-script');

+			wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-geo-script');

-        }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+			wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-geo-script');

+		}

+		wp_enqueue_script( 'jquery-ui-autocomplete' );

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -142,167 +142,167 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodir-on-document-load');

-

-

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => admin_url('admin-ajax.php'),

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-

-        $thumb_img_arr = array();

-

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            $totImg = count($thumb_img_arr);

-        }

+		wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodir-on-document-load');

+

+

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => admin_url('admin-ajax.php'),

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+

+		$thumb_img_arr = array();

+

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

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			$totImg = count($thumb_img_arr);

+		}

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin-script');

+		wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

-        }

+		$screen = get_current_screen();

+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+		}

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+		if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

-

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

-                    }

-                }

-                $geodir_menu_order[] = $item;

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-        endforeach;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-        // Return order

-        return $geodir_menu_order;

-    }

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

+

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

-        if (!current_user_can('manage_options')) return false;

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

+		if (!current_user_can('manage_options')) return false;

+		return true;

+	}

 }

 

 /**

@@ -313,51 +313,51 @@ 
  */

 function geodir_before_admin_panel()

 {

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

-        echo '<div id="message" class="updated fade">

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

+		echo '<div id="message" class="updated fade">

                         <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

                 </div>';

 

-    }

+	}

 

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

-        switch ($_REQUEST['msg']) {

-            case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

-                flush_rewrite_rules(false);

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

+		switch ($_REQUEST['msg']) {

+			case 'success':

+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

 				else

 					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    $geodir_load_map = get_option('geodir_load_map');

-    $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

-        $need_map_key = true;

-    }

+	$geodir_load_map = get_option('geodir_load_map');

+	$need_map_key = false;

+	if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+		$need_map_key = true;

+	}

 

-    if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

-    }

+	if (!geodir_get_map_api_key() && $need_map_key) {

+		echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+	}

 

-    if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+	if (!geodir_is_default_location_set()) {

+		echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

 

-    }

+	}

 

-    if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+	if (!function_exists('curl_init')) {

+		echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

 

-    }

+	}

 

 

 

@@ -374,19 +374,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $current_tab . '_array.php');

-    }

-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+	global $geodir_settings;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $current_tab . '_array.php');

+	}

+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,38 +398,38 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+		if (!empty($geodir_settings[$current_tab]))

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

-         */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

+		 */

+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

@@ -447,144 +447,144 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+	if ((!isset($_POST) || !$_POST) && !$dummy) return false;

 

-    foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+	foreach ($options as $value) {

+		if ($dummy && isset($value['std']))

+			$_POST[$value['id']] = $value['std'];

 

 

-        if (isset($value['type']) && $value['type'] == 'checkbox') :

+		if (isset($value['type']) && $value['type'] == 'checkbox') :

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                update_option($value['id'], 0);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				update_option($value['id'], 0);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+		elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

-                endif;

-            } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

+				if (isset($_POST[$value['id'] . '_crop'])) :

+					update_option($value['id'] . '_crop', 1);

+				else :

+					update_option($value['id'] . '_crop', 0);

+				endif;

+			} else {

+				update_option($value['id'] . '_width', $value['std']);

+				update_option($value['id'] . '_height', $value['std']);

+				update_option($value['id'] . '_crop', 1);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'map') :

-            $post_types = array();

-            $categories = array();

+		elseif (isset($value['type']) && $value['type'] == 'map') :

+			$post_types = array();

+			$categories = array();

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

-        elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

+		elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

 

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

 

-        elseif (isset($value['type']) && $value['type'] == 'file') :

+		elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                update_option($value['id'], '');

-            }

+				update_option($value['id'], '');

+			}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                $upload_overrides = array('test_form' => false);

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

+				$upload_overrides = array('test_form' => false);

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

-            if (!get_option($value['id']) && isset($value['value'])):

-                update_option($value['id'], $value['value']);

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

+				update_option($value['id'], $value['value']);

+			endif;

 

 

-        else :

-            // same menu setting per theme.

-            if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

-            }

+		else :

+			// same menu setting per theme.

+			if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

+				$theme = wp_get_theme();

+				update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+			}

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                delete_option($value['id']);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        $_POST = array();

-    return true;

+		endif;

+	}

+	if ($dummy)

+		$_POST = array();

+	return true;

 

 }

 

@@ -633,33 +633,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = $geodir_posttype_info['labels']['singular_name'];

+			$listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

+			$tabs[$geodir_post_type . '_fields_settings'] = array(

+				'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -675,9 +675,9 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

-    return $tabs;

+	wp_enqueue_script( 'jquery-ui-progressbar' );

+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

+	return $tabs;

 }

 

 /**

@@ -692,8 +692,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -709,144 +709,144 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

-    return $tabs;

+	$tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

-            'categorys' => __('Categories', 'geodirectory'));

-

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

-        {

-            $offset = 0; // should we prepend $array with $data?

-            $offset = count($columns); // or should we append $array with $data? lets pick this one...

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

+

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

+			'categorys' => __('Categories', 'geodirectory'));

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+		if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+		{

+			$offset = 0; // should we prepend $array with $data?

+			$offset = count($columns); // or should we append $array with $data? lets pick this one...

+		}

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

 

-        return $columns;

-    }

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

-                /* If no city is found, output a default message. */

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

-                    /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

-                $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

-                }

-                /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

-                /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

-            /* If displaying the 'categorys' column. */

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

+				/* If no city is found, output a default message. */

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

+					/* If there is a city id, append 'city name' to the text string. */

+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

+				$expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+				}

+				/* If no expire_date is found, output a default message. */

+				if (empty($expire_date))

+					echo __('Unknown', 'geodirectory');

+				/* If there is a expire_date, append 'days left' to the text string. */

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

+			/* If displaying the 'categorys' column. */

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -860,32 +860,32 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

-        return;

-    }

+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

-    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

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

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+	if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

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

+			geodir_change_post_status($post_id, $_REQUEST['_status']);

 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+		if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

+			return;

 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 /**

@@ -901,102 +901,102 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

-                    echo '<div class="inner_content_tab_main">';

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

+		if (!isset($value['name'])) $value['name'] = '';

+		if (!isset($value['class'])) $value['class'] = '';

+		if (!isset($value['css'])) $value['css'] = '';

+		if (!isset($value['std'])) $value['std'] = '';

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

+					echo '<div class="inner_content_tab_main">';

+				}

 

-                $i++;

+				$i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+				if (isset($value['id']) && $value['id'])

+					$tab_id = $value['id'];

 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

 

-                if (isset($value['name']) && $value['name']) {

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+				if (isset($value['name']) && $value['name']) {

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-                }

+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+				}

 

-                /**

-                 * Called after a GeoDirectory settings title is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

-                break;

-

-            case 'no_tabs':

-

-                echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-

-                break;

-

-            case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

-                /**

-                 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

-

-                break;

-            case 'sectionend':

-                /**

-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

-                echo '</table>';

-                /**

-                 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

-                break;

-            case 'text':

-                ?>

+				/**

+				 * Called after a GeoDirectory settings title is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_settings_' . sanitize_title($value['id']));

+				break;

+

+			case 'no_tabs':

+

+				echo '<div class="inner_content_tab_main">';

+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+

+				break;

+

+			case 'sectionstart':

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+				if (isset($value['name']) && $value['name'])

+					echo '<h3>' . $value['name'] . $desc . '</h3>';

+				/**

+				 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+				echo '<table class="form-table">' . "\n\n";

+

+				break;

+			case 'sectionend':

+				/**

+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+				echo '</table>';

+				/**

+				 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1005,15 +1005,15 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1022,42 +1022,42 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>" class="colorpick"/> <span

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>" class="colorpick"/> <span

                         class="description"><?php echo $value['desc']; ?></span>

 

                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1079,11 +1079,11 @@ 
 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

-                break;

-            case 'select':

-                $option_value = get_option($value['id']);

-                $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

-                ?>

+				break;

+			case 'select':

+				$option_value = get_option($value['id']);

+				$option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1092,33 +1092,33 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            $geodir_select_value = '';

-                            if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            }

-                            ?>

+						foreach ($value['options'] as $key => $val) {

+							$geodir_select_value = '';

+							if ($option_value != '') {

+								if ($option_value != '' && $option_value == $key)

+									$geodir_select_value = ' selected="selected" ';

+							} else {

+								if ($value['std'] == $key)

+									$geodir_select_value = ' selected="selected" ';

+							}

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

-                $option_values = get_option($value['id']);

-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

-                   $option_values = $value['std'];

-                }

-                $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

-                ?>

+			case 'multiselect':

+				$option_values = get_option($value['id']);

+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

+				   $option_values = $value['std'];

+				}

+				$option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -1128,25 +1128,25 @@ 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

+						foreach ($value['options'] as $key => $val) {

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option

                                     value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp">

@@ -1166,87 +1166,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

                     <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

+								if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

+									$geodir_default_language_selected = "selected='selected'";

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -1257,46 +1257,46 @@ 
                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $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 (is_array($post_types)) {

-                                foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$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 (is_array($post_types)) {

+								foreach ($post_types as $key => $post_types_obj) {

+									if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

+										$geodir_search_pt_selected = "selected='selected'";

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

-                        $cat_display = 'checkbox';

-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');

-                        $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

+						$cat_display = 'checkbox';

+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');

+						$gd_cats = get_option('geodir_exclude_cat_on_map');

+						$gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+						$count = 1;

+						?>

                         <table width="70%" class="widefat">

                             <thead>

                             <tr>

@@ -1305,18 +1305,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1337,19 +1337,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'] ?>">

@@ -1359,49 +1359,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'];?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

-                            echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+							echo 'checked="checked"';

+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1414,30 +1414,30 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+					if (get_option($value['id']))

+						$content = stripslashes(get_option($value['id']));

+					else

+						$content = $value['std'];

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

-                    ?> <span class="description"><?php echo $value['desc'] ?></span>

+					?> <span class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -1455,18 +1455,18 @@ 
 				//

 				$page_setting = (int)get_option($value['id']);

 

-                $args = array('name' => $value['id'],

-                    'id' => $value['id'],

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

+				$args = array('name' => $value['id'],

+					'id' => $value['id'],

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+				if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

 

-                ?>

+				?>

                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1477,17 +1477,17 @@ 
 				if ($switch_lang) {

 					$sitepress->switch_lang($switch_lang, true);

 				}

-                break;

-            case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

-                if (strstr($country_setting, ':')) :

-                    $country = current(explode(':', $country_setting));

-                    $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

+				$country_setting = (string)get_option($value['id']);

+				if (strstr($country_setting, ':')) :

+					$country = current(explode(':', $country_setting));

+					$state = end(explode(':', $country_setting));

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1498,12 +1498,12 @@ 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

-                $countries = $geodirectory->countries->countries;

-                asort($countries);

-                $selections = (array)get_option($value['id']);

-                ?>

+				break;

+			case 'multi_select_countries' :

+				$countries = $geodirectory->countries->countries;

+				asort($countries);

+				$selections = (array)get_option($value['id']);

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1511,21 +1511,21 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

-                        endforeach;

-                        ?>

+						if ($countries) foreach ($countries as $key => $val) :

+							echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                    ?>

+			case 'google_analytics' :

+				$selections = (array)get_option($value['id']);

+					?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                         <td class="forminp">

@@ -1533,59 +1533,59 @@ 
 

                             <?php

 

-                            $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

-                            $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-                            $response_type = "&response_type=code";

-                            $client_id = "&client_id=".get_option('geodir_ga_client_id');

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

+							$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

+							$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

+							$state = "&state=123";//any string

+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+							$response_type = "&response_type=code";

+							$client_id = "&client_id=".get_option('geodir_ga_client_id');

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

 

 

-                            if (get_option('geodir_ga_auth_token')) {

-                                ?>

+							if (get_option('geodir_ga_auth_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

                                     style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

-                            } else {

-                                ?>

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

 

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -1645,33 +1645,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

-    $package_info = geodir_post_package_info($package_info, $post, $post_type);

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

+	$package_info = geodir_post_package_info($package_info, $post, $post_type);

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -1684,18 +1684,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

-    $package_info = geodir_post_package_info($package_info, $post, $post_type);

+	$package_info = geodir_post_package_info($package_info, $post, $post_type);

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -1709,60 +1709,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

-    if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

+	if (geodir_get_featured_image($post_id, 'thumbnail')) {

+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+	if (!empty($place_img_array))

+		$curImages = implode(',', $place_img_array);

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -1804,13 +1804,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -1825,39 +1825,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

-                $geodir_bcc_listing_published_yes = array(

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

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

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

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

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

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

+				$geodir_bcc_listing_published_yes = array(

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

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

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

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

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

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -1872,19 +1872,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

+

+	}

 

-    die();

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -1898,20 +1898,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

-        if (!empty($json) && is_array($json)) {

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

+		if (!empty($json) && is_array($json)) {

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -1924,39 +1924,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

 

-    if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

-        return;

-    }// if already running correct compat then bail

+	if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

+		return;

+	}// if already running correct compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -1971,9 +1971,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -1986,22 +1986,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

-    $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

-    echo "<p>$message</p>";

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

+	$message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

+	echo '<div id="' . $timestamp . '"  class="error">';

+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+	echo "<p>$message</p>";

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -2069,10 +2069,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -2094,9 +2094,9 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

+	if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

 		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

+	elseif ($post && isset($post->post_type))

 		$post_type = $post->post_type;

 	elseif ($typenow)

 		$post_type = $typenow;

@@ -2131,7 +2131,7 @@ 
 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -2161,10 +2161,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

+	global $post_type;

+	$post_types = geodir_get_posttypes();

+	if(in_array($post_type, $post_types))

+		echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -2179,7 +2179,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

 	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -2194,26 +2194,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_cats_sample_csv Sample category data csv file url.

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_cats_sample_csv Sample category data csv file url.

+	 */

 	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_posts_sample_csv Sample post data csv file url.

-     */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_posts_sample_csv Sample post data csv file url.

+	 */

+	$gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

 	$gd_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -2236,14 +2236,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

@@ -2259,12 +2259,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

+	$ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+	ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

-        ?>

+	if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+		?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

@@ -2437,7 +2437,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -2522,11 +2522,11 @@ 
 	 *

 	 * Called after the last setting on the GD > Import & Export page.

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

+	 * @param array $gd_chunksize_options File chunk size options.

+	 * @param string $nonce Wordpress security token for GD import & export.

 	 */

 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

 	?>

@@ -3213,44 +3213,44 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

-        require_once(ABSPATH."/wp-admin/includes/file.php");

-    }

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

+	if(!function_exists('get_filesystem_method')){

+		require_once(ABSPATH."/wp-admin/includes/file.php");

+	}

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

-

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -3268,10 +3268,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -3297,1251 +3297,1251 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

     

-    error_reporting(0);

+	error_reporting(0);

 

-    // try to set higher limits for import

-    $max_input_time = ini_get('max_input_time');

-    $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+	// try to set higher limits for import

+	$max_input_time = ini_get('max_input_time');

+	$max_execution_time = ini_get('max_execution_time');

+	$memory_limit= ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

-        ini_set('max_input_time', 3000);

-    }

+	if(!$max_input_time || $max_input_time<3000){

+		ini_set('max_input_time', 3000);

+	}

 

-    if(!$max_execution_time || $max_execution_time<3000){

-        ini_set('max_execution_time', 3000);

-    }

+	if(!$max_execution_time || $max_execution_time<3000){

+		ini_set('max_execution_time', 3000);

+	}

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

     

-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-    $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

-

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+	$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-            }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			if ( $post_type == 'gd_event' ) {

+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+			}

+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

-            }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+			$file_name = $post_type . '_' . date( 'dmyHi' );

+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+			}

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $json['total'] = $posts_count;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$json['total'] = $posts_count;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else if ( isset( $_REQUEST['_st'] ) ) {

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else {

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        if ($j > 1) {

-                            $json['total'] = $posts_count;

-                            $json['files'] = array();

-                        } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                        }

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						if ($j > 1) {

+							$json['total'] = $posts_count;

+							$json['files'] = array();

+						} else {

+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+						}

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			$file_name = $post_type . 'category_' . date( 'dmyHi' );

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_hoods': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+			$items_count = (int)geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc':

-        case 'import_hood': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc':

+		case 'import_hood': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

-            $file = array();

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-                    $json['rows'] = 0;

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+					$json['rows'] = 0;

                     

-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

-                    setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

-                    setlocale(LC_ALL, $lc_all);

+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

+					setlocale(LC_ALL, 'en_US.UTF-8');

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

+					setlocale(LC_ALL, $lc_all);

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

+			$count = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $gd_post_info = array();

-            $countpost = 0;

+			$gd_post_info = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

-                            $cat_id_original = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

+							$cat_id_original = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

-                                    $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

-                                    $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

-                                    $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

-                                    $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-                                    $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

-                                    $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

-                                    $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

-                                    $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

+								} else if ( $column == 'cat_name' ) {

+									$cat_name = $row[$c];

+								} else if ( $column == 'cat_slug' ) {

+									$cat_slug = $row[$c];

+								} else if ( $column == 'cat_posttype' ) {

+									$cat_posttype = $row[$c];

+								} else if ( $column == 'cat_parent' ) {

+									$cat_parent = trim($row[$c]);

+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+									$cat_schema = $row[$c];

+								} else if ( $column == 'cat_description' ) {

+									$cat_description = $row[$c];

+								} else if ( $column == 'cat_top_description' ) {

+									$cat_top_description = $row[$c];

+								} else if ( $column == 'cat_image' ) {

+									$cat_image = $row[$c];

+								} else if ( $column == 'cat_icon' ) {

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ( $is_wpml ) {

+									if ( $column == 'cat_language' ) {

+										$cat_language = geodir_strtolower( trim( $row[$c] ) );

+									} else if ( $column == 'cat_id_original' ) {

+										$cat_id_original = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

                                 

-                                $invalid++;

-                                continue;

-                            }

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($cat_language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($cat_language, true);

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+									//

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                            }

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+							}

                             

-                            if ( $term_id ) {

-                                // WPML

-                                if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+							if ( $term_id ) {

+								// WPML

+								if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

+									$wpml_element_type = 'tax_' . $taxonomy;

+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

-                                }

-                                // WPML

+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+								}

+								// WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-                                }

+								if ( isset( $term_data['top_description'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+								}

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

-

-                //remove_all_actions('publish_post');

-                //remove_all_actions('transition_post_status');

-                //remove_all_actions('publish_future_post');

-

-                if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_post' ) {

+				//run some stuff to make the import quicker

+				wp_defer_term_counting( true );

+				wp_defer_comment_counting( true );

+				$wpdb->query( 'SET autocommit = 0;' );

+

+				//remove_all_actions('publish_post');

+				//remove_all_actions('transition_post_status');

+				//remove_all_actions('publish_future_post');

+

+				if (!empty($file)) {

+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

 

-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

-                    $processed_actual = 0;

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

-                        $gd_post = array();

+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+					$processed_actual = 0;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {

-                            $processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {

+							$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $post_neighbourhood = '';

-                            $neighbourhood_latitude = '';

-                            $neighbourhood_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$post_neighbourhood = '';

+							$neighbourhood_latitude = '';

+							$neighbourhood_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

-                                    $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

-                                    $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

-                                    $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

-                                    $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

-                                    $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

-                                    $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

-                                    $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

-                                    $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

-                                    $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

-                                    $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

-                                    $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

-                                    $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

-                                    $post_neighbourhood = sanitize_text_field($row[$c]);

-                                    unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

-                                    $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

-                                    $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

-                                    $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

-                                    $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

-                                    $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

-                                    } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

-                            // listing claimed or not

-                            if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

+								} else if ( $column == 'post_title' ) {

+									$post_title = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_author' ) {

+									$post_author = $row[$c];

+								} else if ( $column == 'post_content' ) {

+									$post_content = $row[$c];

+								} else if ( $column == 'post_category' && $row[$c] != '' ) {

+									$post_category_arr = explode( ',', $row[$c] );

+								} else if ( $column == 'default_category' ) {

+									$default_category = wp_kses_normalize_entities($row[$c]);

+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );

+								} else if ( $column == 'post_type' ) {

+									$post_type = $row[$c];

+								} else if ( $column == 'post_status' ) {

+									$post_status = sanitize_key( $row[$c] );

+								} else if ( $column == 'is_featured' ) {

+									$is_featured = (int)$row[$c];

+								} else if ( $column == 'geodir_video' ) {

+									$geodir_video = $row[$c];

+								} else if ( $column == 'post_address' ) {

+									$post_address = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_city' ) {

+									$post_city = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_region' ) {

+									$post_region = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_country' ) {

+									$post_country = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_zip' ) {

+									$post_zip = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_latitude' ) {

+									$post_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_longitude' ) {

+									$post_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_neighbourhood' ) {

+									$post_neighbourhood = sanitize_text_field($row[$c]);

+									unset($gd_post[$column]);

+								} else if ( $column == 'neighbourhood_latitude' ) {

+									$neighbourhood_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'neighbourhood_longitude' ) {

+									$neighbourhood_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_timing' ) {

+									$geodir_timing = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_contact' ) {

+									$geodir_contact = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_email' ) {

+									$geodir_email = sanitize_email($row[$c]);

+								} else if ( $column == 'geodir_website' ) {

+									$geodir_website = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_facebook' ) {

+									$geodir_facebook = sanitize_text_field($row[$c]);

+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

+									} else if ($column == 'original_post_id') {

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

+							// listing claimed or not

+							if ($is_claim_active && isset($gd_post['claimed'])) {

+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($language, true);

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							}

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                    } else {

-                                        if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+									} else {

+										if (!$location_manager) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

                             

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

-                                            $post_category[] = intval($term_category->term_id);

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+											$post_category[] = intval($term_category->term_id);

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

 

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

+							if ( $import_choice == 'update' ) {

+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $save_post['ID'] = $post_id;

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $saved_post_id = $post_id;

-                                            $updated++;

-                                        }

-                                    }

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    }

-                                }

+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$saved_post_id = $post_id;

+											$updated++;

+										}

+									}

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $skipped++;	

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $invalid++;

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$skipped++;	

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    } else {

-                                        $invalid++;

+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									} else {

+										$invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+									}

+								}

+							} else {

+								$invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                            }

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+							}

 

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $gd_post['post_neighbourhood'] = '';

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$gd_post['post_neighbourhood'] = '';

                                     

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-                                        $post_location_id = $location_id;

-                                    }

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

                                     

-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

 

-                                        $hood_data = array();

-                                        $hood_data['hood_location_id'] = $post_location_id;

-                                        $hood_data['hood_name'] = $post_neighbourhood;

+										$hood_data = array();

+										$hood_data['hood_location_id'] = $post_location_id;

+										$hood_data['hood_name'] = $post_neighbourhood;

                                         

-                                        if (!empty($neighbourhood_info)) {

-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;

-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

+										if (!empty($neighbourhood_info)) {

+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;

+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

                                             

-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                            }

-                                        }

+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+											}

+										}

                                         

-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                        }

+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+										}

                                         

-                                        $hood_data['hood_latitude'] = $post_latitude;

-                                        $hood_data['hood_longitude'] = $post_longitude;

-

-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

-                                        }

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+										$hood_data['hood_latitude'] = $post_latitude;

+										$hood_data['hood_longitude'] = $post_longitude;

+

+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

+										}

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+								$table = $plugin_prefix . $post_type . '_detail';

                                 

-                                if ($post_type == 'gd_event') {

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

+								if ($post_type == 'gd_event') {

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

-                                        $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+										$gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

-                                        }

+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+											$gd_franchise_lock = trim( $gd_franchise_lock );

+											$gd_franchise_lock = explode( ",", $gd_franchise_lock );

+										}

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

                                 

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

 

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+										$arr_file_type = wp_check_filetype( $image_name );

                                         

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

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

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

-                                                }

-                                            }

-                                            $attachment_set = trim( $attachment_set, ", " );

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

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

+												if ( $val != '' ) {

+													$attachment_set .= $key . " = '" . $val . "', ";

+												}

+											}

+											$attachment_set = trim( $attachment_set, ", " );

                                                                                         

-                                            // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											// Add new attachment

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

                                                                                         

-                                            $order++;

-                                        }

-                                    }

+											$order++;

+										}

+									}

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        geodir_set_wp_featured_image($saved_post_id);

-                                        /*

+									if ( !empty( $saved_post_images_arr ) ) {

+										geodir_set_wp_featured_image($saved_post_id);

+										/*

                                         $menu_order = 1;

                                         

                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4554,281 +4554,281 @@ 
                                             }

                                             $menu_order++;

                                         }*/

-                                    }

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

 

-                                /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+								/** This action is documented in geodirectory-functions/post-functions.php */

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

                                 

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                            }

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

+				//undo some stuff to make the import quicker

+				wp_defer_term_counting( false );

+				wp_defer_comment_counting( false );

+				$wpdb->query( 'COMMIT;' );

+				$wpdb->query( 'SET autocommit = 1;' );

+

+				$json = array();

+				$json['processed'] = $processed_actual;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['invalid_addr'] = $invalid_addr;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+							if ( $import_choice == 'update' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				wp_send_json( $json );

+			} else if ( $task == 'import_hood' ) {               

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

+					$gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column) {

-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

-                                    $data[$column] = sanitize_text_field($row[$c]);

-                                }

-                            }

+							foreach ($columns as $c => $column) {

+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

+									$data[$column] = sanitize_text_field($row[$c]);

+								}

+							}

 

-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

-                            }

+							$location_info = array();

+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

+							}

 

-                            if (empty($location_info)) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($location_info)) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_id = $location_info->location_id;

+							$location_id = $location_info->location_id;

 

-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

                             

-                            $hood_data = array();

-                            $hood_data['hood_name'] = $data['neighbourhood_name'];

-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];

-                            $hood_data['hood_latitude'] = $data['latitude'];

-                            $hood_data['hood_longitude'] = $data['longitude'];

-                            $hood_data['hood_location_id'] = $location_id;

+							$hood_data = array();

+							$hood_data['hood_name'] = $data['neighbourhood_name'];

+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];

+							$hood_data['hood_latitude'] = $data['latitude'];

+							$hood_data['hood_longitude'] = $data['longitude'];

+							$hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+							if ( $import_choice == 'update' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else {

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $skipped++;

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $skipped++;

-                                } else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$skipped++;

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$skipped++;

+								} else {

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                            }

-                        }

-                    }

-                }

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    gd_die();

+	}

+	echo '0';

+	gd_die();

 }

 

 /**

@@ -4872,12 +4872,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

 		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

-    }

+		if( !is_wp_error( $result ) ) {

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

+	}

 	

 	return false;

 }

@@ -4923,16 +4923,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -4954,47 +4954,47 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

-        return 0;

-    }

+	if ( !post_type_exists( $post_type ) ) {

+		return 0;

+	}

         

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts count in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

-

-    $posts_count = (int)$wpdb->get_var( $query );

+	/**

+	 * Filter the SQL where clause part to filter posts count in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+

+	$posts_count = (int)$wpdb->get_var( $query );

     

-    /**

-     * Modify returned post counts for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $posts_count Post counts.

-     * @param string $post_type Post type.

-     */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

-

-    return $posts_count;

+	/**

+	 * Modify returned post counts for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $posts_count Post counts.

+	 * @param string $post_type Post type.

+	 */

+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+

+	return $posts_count;

 }

 

 /**

@@ -5022,10 +5022,10 @@ 
 	

 	if ( !empty( $posts ) ) {

 		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

-        $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-        $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+		$neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

+		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5057,7 +5057,7 @@ 
 		}

 		$csv_row[] = 'post_status';

 		$csv_row[] = 'is_featured';

-        // Export claim listing field

+		// Export claim listing field

 		if ($is_claim_active) {

 			$csv_row[] = 'claimed';

 		}

@@ -5065,7 +5065,7 @@ 
 			$csv_row[] = 'package_id';

 			$csv_row[] = 'expire_date';

 		}

-        $csv_row[] = 'post_date';

+		$csv_row[] = 'post_date';

 		$csv_row[] = 'post_address';

 		$csv_row[] = 'post_city';

 		$csv_row[] = 'post_region';

@@ -5073,11 +5073,11 @@ 
 		$csv_row[] = 'post_zip';

 		$csv_row[] = 'post_latitude';

 		$csv_row[] = 'post_longitude';

-        if ($neighbourhood_active) {

-            $csv_row[] = 'post_neighbourhood';

-            $csv_row[] = 'neighbourhood_latitude';

-            $csv_row[] = 'neighbourhood_longitude';

-        }

+		if ($neighbourhood_active) {

+			$csv_row[] = 'post_neighbourhood';

+			$csv_row[] = 'neighbourhood_latitude';

+			$csv_row[] = 'neighbourhood_longitude';

+		}

 		$csv_row[] = 'geodir_timing';

 		$csv_row[] = 'geodir_contact';

 		$csv_row[] = 'geodir_email';

@@ -5109,21 +5109,21 @@ 
 			$csv_row[] = 'franchise';

 		}

         

-        /**

-         * Filter columns field names of gd export listings csv.

-         *

-         * @since 1.6.5

-         * @package GeoDirectory

-         *

-         * @param array $csv_row Column names being exported in csv.

-         * @param string $post_type The post type.

-         */

-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

+		/**

+		 * Filter columns field names of gd export listings csv.

+		 *

+		 * @since 1.6.5

+		 * @package GeoDirectory

+		 *

+		 * @param array $csv_row Column names being exported in csv.

+		 * @param string $post_type The post type.

+		 */

+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

 		

 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -5254,14 +5254,14 @@ 
 			}

 			$csv_row[] = $post_info['post_status']; // post_status

 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-            if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

-            }

+			if ($is_claim_active) {

+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+			}

 			if ($is_payment_plugin) {

 				$csv_row[] = (int)$post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

-            $csv_row[] = $post_info['post_date']; // post_date

+			$csv_row[] = $post_info['post_date']; // post_date

 			$csv_row[] = $post_info['post_address']; // post_address

 			$csv_row[] = $post_info['post_city']; // post_city

 			$csv_row[] = $post_info['post_region']; // post_region

@@ -5269,21 +5269,21 @@ 
 			$csv_row[] = $post_info['post_zip']; // post_zip

 			$csv_row[] = $post_info['post_latitude']; // post_latitude

 			$csv_row[] = $post_info['post_longitude']; // post_longitude

-            if ($neighbourhood_active) {

-                $post_neighbourhood = '';

-                $neighbourhood_latitude = '';

-                $neighbourhood_longitude = '';

-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

-                    if (!empty($hood_info)) {

-                        $post_neighbourhood = $hood_info->hood_name;

-                        $neighbourhood_latitude = $hood_info->hood_latitude;

-                        $neighbourhood_longitude = $hood_info->hood_longitude;

-                    }

-                }

-                $csv_row[] = $post_neighbourhood; // post_neighbourhood

-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

-            }

+			if ($neighbourhood_active) {

+				$post_neighbourhood = '';

+				$neighbourhood_latitude = '';

+				$neighbourhood_longitude = '';

+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

+					if (!empty($hood_info)) {

+						$post_neighbourhood = $hood_info->hood_name;

+						$neighbourhood_latitude = $hood_info->hood_latitude;

+						$neighbourhood_longitude = $hood_info->hood_longitude;

+					}

+				}

+				$csv_row[] = $post_neighbourhood; // post_neighbourhood

+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

+			}

 			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

 			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

 			$csv_row[] = $post_info['geodir_email']; // geodir_email

@@ -5323,16 +5323,16 @@ 
 				$csv_row[] = (int)$franchise; // franchise id

 			}

             

-            /**

-             * Filter columns values of gd export listings csv file

-             *

-             * @since 1.6.5

-             * @package GeoDirectory

-             *

-             * @param array $csv_row Field values being exported in csv.

-             * @param array $post_info The post info.

-             */

-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

+			/**

+			 * Filter columns values of gd export listings csv file

+			 *

+			 * @since 1.6.5

+			 * @package GeoDirectory

+			 *

+			 * @param array $csv_row Field values being exported in csv.

+			 * @param array $post_info The post info.

+			 */

+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

 			for ( $c = 0; $c < $images_count; $c++ ) {

 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5365,64 +5365,64 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+	if ( ! post_type_exists( $post_type ) )

+		return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+	$limit = '';

+	if ( $per_page > 0 && $page_no > 0 ) {

+		$offset = ( $page_no - 1 ) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

-        } else {

-            $limit = " LIMIT " . $per_page;

-        }

-    }

+		if ( $offset > 0 ) {

+			$limit = " LIMIT " . $offset . "," . $per_page;

+		} else {

+			$limit = " LIMIT " . $per_page;

+		}

+	}

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

-    /**

-     * Modify returned posts SQL query for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $query The SQL query.

-     * @param string $post_type Post type.

-     */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

-

-    /**

-     * Modify returned post results for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param object $results An object containing all post ids.

-     * @param string $post_type Post type.

-     */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+	/**

+	 * Filter the SQL where clause part to filter posts in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+	/**

+	 * Modify returned posts SQL query for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $query The SQL query.

+	 * @param string $post_type Post type.

+	 */

+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+	$results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+

+	/**

+	 * Modify returned post results for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param object $results An object containing all post ids.

+	 * @param string $post_type Post type.

+	 */

+	return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -5441,26 +5441,26 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

-        global $wpdb, $plugin_prefix;

+	if ( $post_type == 'gd_event' ) {

+		global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

-        $schedule_table = EVENT_SCHEDULE;

+		$table = $plugin_prefix . $post_type . '_detail';

+		$schedule_table = EVENT_SCHEDULE;

         

-        // Skip listing with statuses trash, auto-draft etc...

-        $skip_statuses = geodir_imex_export_skip_statuses();

-        $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-        }

+		// Skip listing with statuses trash, auto-draft etc...

+		$skip_statuses = geodir_imex_export_skip_statuses();

+		$where_statuses = '';

+		if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+		}

         

-        /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+		/** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

-    }

+		$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -5482,36 +5482,36 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+	$args = array( 'hide_empty' => 0 );

 

-    remove_all_filters( 'get_terms' );

+	remove_all_filters( 'get_terms' );

 

-    $taxonomy = $post_type . 'category';

+	$taxonomy = $post_type . 'category';

 

-    // WPML

-    $is_wpml = geodir_is_wpml();

-    $active_lang = 'all';

-    if ( $is_wpml ) {

-        global $sitepress;

-        $active_lang = $sitepress->get_current_language();

+	// WPML

+	$is_wpml = geodir_is_wpml();

+	$active_lang = 'all';

+	if ( $is_wpml ) {

+		global $sitepress;

+		$active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

-        }

-    }

-    // WPML

+		if ( $active_lang != 'all' ) {

+			$sitepress->switch_lang( 'all', true );

+		}

+	}

+	// WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+	$count_terms = wp_count_terms( $taxonomy, $args );

 

-    // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

-        global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

-    }

-    // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+	// WPML

+	if ( $is_wpml && $active_lang !== 'all' ) {

+		global $sitepress;

+		$sitepress->switch_lang( $active_lang, true );

+	}

+	// WPML

+	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

      

-    return $count_terms;

+	return $count_terms;

 }

 

 /**

@@ -5550,11 +5550,11 @@ 
 		$csv_row[] = 'cat_posttype';

 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

-        // WPML

+		// WPML

 		$is_wpml = geodir_is_wpml();

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

-            $csv_row[] = 'cat_id_original';

+			$csv_row[] = 'cat_id_original';

 		}

 		// WPML

 		$csv_row[] = 'cat_description';

@@ -5584,10 +5584,10 @@ 
 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

 			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-            // WPML

+			// WPML

 			if ($is_wpml) {

 				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

 			}

 			// WPML

 			$csv_row[] = $term->description;

@@ -6183,43 +6183,43 @@ 
  * @param string $status Post status.

  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

-        if (!$option_value) update_option($option, $page_found);

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

+		if (!$option_value) update_option($option, $page_found);

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

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

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 /**

@@ -6265,18 +6265,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -6284,28 +6284,28 @@ 
 * @param string $content http response body

 */

 function geodir_in_plugin_update_message($content) {

-    // Output Upgrade Notice

-    $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

-            $upgrade_notice .= '</div> ';

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+	$upgrade_notice = '';

+	if ( preg_match( $regexp, $content, $matches ) ) {

+		if(empty($matches)){return;}

+

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

+			$upgrade_notice .= '</div> ';

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

@@ -6338,19 +6338,19 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+	$statuses = array( 'trash', 'auto-draft' );

     

-    /**

-     * Filter the statuses to skip during GD export listings.

-     *

-     * @since 1.6.0

-     * @package GeoDirectory

-     *

-     * @param array $statuses Listing statuses to be skipped.

-     */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+	/**

+	 * Filter the statuses to skip during GD export listings.

+	 *

+	 * @since 1.6.0

+	 * @package GeoDirectory

+	 *

+	 * @param array $statuses Listing statuses to be skipped.

+	 */

+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

      

-    return $statuses;

+	return $statuses;

 }

 

 /**

@@ -6362,15 +6362,15 @@ 
  * @since 1.6.3

  */

 function geodir_admin_dequeue_scripts() {

-    // EDD

-    if (wp_script_is('jquery-chosen', 'enqueued')) {

-        wp_dequeue_script('jquery-chosen');

-    }

+	// EDD

+	if (wp_script_is('jquery-chosen', 'enqueued')) {

+		wp_dequeue_script('jquery-chosen');

+	}

     

-    // Ultimate Addons for Visual Composer

-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-vc-backend-script');

-    }

+	// Ultimate Addons for Visual Composer

+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-vc-backend-script');

+	}

 }

 

 /**

@@ -6386,48 +6386,48 @@ 
  * @return string SQL where clause part.

  */

 function geodir_imex_get_filter_where($where = '', $post_type = '') {

-    global $wpdb;

+	global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

-            switch ($field) {

-                case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

-                break;

-                case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

-                break;

-            }

-        }

-    }

+	if ( !empty( $filters ) ) {

+		foreach ( $filters as $field => $value ) {

+			switch ($field) {

+				case 'start_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+				break;

+				case 'end_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+				break;

+			}

+		}

+	}

     

-    return $where;

+	return $where;

 }

 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);

 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

 function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

-    global $pagenow;

+	if(!defined( 'PRIMER_VERSION' )){return;}

+	global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+	if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+		$post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

 

-        $post_types = geodir_get_posttypes();

-        if ($post_type && in_array($post_type, $post_types) ) {

-            global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

-        }

-    }

+		$post_types = geodir_get_posttypes();

+		if ($post_type && in_array($post_type, $post_types) ) {

+			global $primer_customizer_layouts;

+			remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+		}

+	}

 

 }

 

 if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+	add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

 }

 

 

@@ -6560,65 +6560,65 @@ 
 

 function geodir_ga_activation_url() {

 

-    return add_query_arg( array(

-        'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

-        'scope'         => GEODIR_GA_SCOPE,

-        'response_type' => 'code',

-        'redirect_uri'  => GEODIR_GA_REDIRECT,

-        'client_id'     => GEODIR_GA_CLIENTID,

-    ), 'https://accounts.google.com/o/oauth2/auth' );

+	return add_query_arg( array(

+		'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

+		'scope'         => GEODIR_GA_SCOPE,

+		'response_type' => 'code',

+		'redirect_uri'  => GEODIR_GA_REDIRECT,

+		'client_id'     => GEODIR_GA_CLIENTID,

+	), 'https://accounts.google.com/o/oauth2/auth' );

 

-    return $url;

+	return $url;

 }

 

 function geodir_gd_accounts(){

-    $accounts = array();

-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

-    if($useAuth){

-        $accounts = geodir_ga_get_analytics_accounts();

-        if(is_array($accounts)){

-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

-            $accounts = array();

-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

-        }

-    }

-    return $accounts;

+	$accounts = array();

+	$useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

+	if($useAuth){

+		$accounts = geodir_ga_get_analytics_accounts();

+		if(is_array($accounts)){

+			$accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

+		}elseif(get_option('geodir_ga_account_id')){

+			$accounts = array();

+			$accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

+		}

+	}

+	return $accounts;

 }

 

 function geodir_ga_get_analytics_accounts()

 {

-    $accounts = array();

+	$accounts = array();

 

-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

+	if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

 

 

-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

-        return get_option('geodir_gd_uids');

-    }

+	if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

+		return get_option('geodir_gd_uids');

+	}

 

     

-    # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

-        $stats = new GDGoogleAnalyticsStats();

-    else

-        return false;

+	# Create a new Gdata call

+	if ( trim(get_option('geodir_ga_auth_code')) != '' )

+		$stats = new GDGoogleAnalyticsStats();

+	else

+		return false;

 

-    # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

-        return false;

+	# Check if Google sucessfully logged in

+	if ( ! $stats->checkLogin() )

+		return false;

 

-    # Get a list of accounts

-    $accounts = $stats->getAllProfiles();

+	# Get a list of accounts

+	$accounts = $stats->getAllProfiles();

 

-    natcasesort ($accounts);

+	natcasesort ($accounts);

 

-    # Return the account array if there are accounts

-    if ( count($accounts) > 0 ){

-        update_option('geodir_gd_uids',$accounts);

-        return $accounts;

-    }

-    else

-        return false;

+	# Return the account array if there are accounts

+	if ( count($accounts) > 0 ){

+		update_option('geodir_gd_uids',$accounts);

+		return $accounts;

+	}

+	else

+		return false;

 }

 

Spacing +916 added lines, -916 removed lines

@@ -28,31 +28,31 @@ 
      * @package GeoDirectory

      */

     function geodir_admin_styles() {

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rtl-style');

     }

 }

@@ -70,7 +70,7 @@ 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -89,60 +89,60 @@ 
         

         wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

         }

 

         wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);

 

         if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

+            $map_lang = "&language=".geodir_get_map_default_language();

+            $map_key = "&key=".geodir_get_map_api_key();

             /** This filter is documented in geodirectory_template_tags.php */

             $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         }

         

         if ($geodir_map_name == 'osm') {

             // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-geo-script');

         }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+        wp_enqueue_script('jquery-ui-autocomplete');

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodir-on-document-load');

 

 

@@ -150,7 +150,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -204,7 +204,7 @@ 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -212,10 +212,10 @@ 
 

         $screen = get_current_screen();

         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');

         }

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));

         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

     }

@@ -238,7 +238,7 @@ 
 

         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

     }

@@ -272,7 +272,7 @@ 
                 $geodir_menu_order[] = 'separator-geodirectory';

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -315,8 +315,8 @@ 
 {

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

         echo '<div id="message" class="updated fade">

-                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

+                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>

+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>

                 </div>';

 

     }

@@ -324,7 +324,7 @@ 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

         switch ($_REQUEST['msg']) {

             case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';

                 flush_rewrite_rules(false);

 

                 break;

@@ -332,30 +332,30 @@ 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+			    	echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';

 				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {

         $need_map_key = true;

     }

 

     if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';

     }

 

     if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

 

     }

 

     if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';

 

     }

 

@@ -375,18 +375,18 @@ 
 function geodir_handle_option_form_submit($current_tab)

 {

     global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $current_tab . '_array.php');

+        include_once('option-pages/'.$current_tab.'_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -419,13 +419,13 @@ 
          * @param string $current_tab The current settings tab name.

          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

          */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);

 

         flush_rewrite_rules(false);

 

         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');

 

         wp_redirect($redirect_url);

         exit();

@@ -464,18 +464,18 @@ 
 

         elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {

+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);

+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);

+                if (isset($_POST[$value['id'].'_crop'])) :

+                    update_option($value['id'].'_crop', 1);

                 else :

-                    update_option($value['id'] . '_crop', 0);

+                    update_option($value['id'].'_crop', 0);

                 endif;

             } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

+                update_option($value['id'].'_width', $value['std']);

+                update_option($value['id'].'_height', $value['std']);

+                update_option($value['id'].'_crop', 1);

             }

 

         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -517,12 +517,12 @@ 
         elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file

 

                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -550,7 +550,7 @@ 
                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -571,7 +571,7 @@ 
             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

                 $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);

             }

 

             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -641,8 +641,8 @@ 
 

             $listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+            $tabs[$geodir_post_type.'_fields_settings'] = array(

+                'label' => __(ucfirst($listing_slug).' Settings', 'geodirectory'),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

                         'label' => __('Custom Fields', 'geodirectory'),

@@ -675,7 +675,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

+    wp_enqueue_script('jquery-ui-progressbar');

     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

     return $tabs;

 }

@@ -709,7 +709,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

     return $tabs;

 }

 

@@ -769,8 +769,8 @@ 
                     _e('Unknown', 'geodirectory');

                 } else {

                     /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';

+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);

                 }

                 break;

 

@@ -788,14 +788,14 @@ 
                         $expire_class = 'expire_over';

                     }

                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

                 if (empty($expire_date))

                     echo __('Unknown', 'geodirectory');

                 /* If there is a expire_date, append 'days left' to the text string. */

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

             /* If displaying the 'categorys' column. */

@@ -862,7 +862,7 @@ 
 function geodir_post_information_save($post_id, $post) {

     global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

 

@@ -930,7 +930,7 @@ 
                     $tab_id = $value['id'];

 

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';

 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -938,9 +938,9 @@ 
                     } else {

                         echo '</div>';

                     }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

                 }

 

                 /**

@@ -950,21 +950,21 @@ 
                  *

                  * @since 1.0.0

                  */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

+                do_action('geodir_settings_'.sanitize_title($value['id']));

                 break;

 

             case 'no_tabs':

 

                 echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

 

                 break;

 

             case 'sectionstart':

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';

                 if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                    echo '<h3>'.$value['name'].$desc.'</h3>';

                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -972,8 +972,8 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');

+                echo '<table class="form-table">'."\n\n";

 

                 break;

             case 'sectionend':

@@ -984,7 +984,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');

                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +993,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');

                 break;

             case 'text':

                 ?>

@@ -1002,7 +1002,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1019,7 +1019,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1065,17 +1065,17 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1125,7 +1125,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1136,7 +1136,7 @@ 
                             } else {

                                 ?>

                                 <option

-                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

+                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>

                             <?php

                             }

                         }

@@ -1171,7 +1171,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -1253,7 +1253,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -1294,7 +1294,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -1323,7 +1323,7 @@ 
                                                                                            name="home_map_post_types[]"

                                                                                            id="<?php echo esc_attr($value['id']); ?>"

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo $post_types_obj->labels->singular_name; ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1381,12 +1381,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1406,9 +1406,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1453,7 +1453,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1470,7 +1470,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1479,7 +1479,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1502,7 +1502,7 @@ 
             case 'multi_select_countries' :

                 $countries = $geodirectory->countries->countries;

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1512,7 +1512,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1524,7 +1524,7 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                     ?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1535,27 +1535,27 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             if (get_option('geodir_ga_auth_token')) {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Re-authorize', 'geodirectory'); ?></span>

+                                      onclick="window.open('<?php echo  geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

                                     style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

                             } else {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="window.open('<?php echo  geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -1626,9 +1626,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -1714,7 +1714,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -1725,13 +1725,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -1770,10 +1770,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -1785,7 +1785,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -1995,9 +1995,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2130,7 +2130,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2142,7 +2142,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2163,11 +2163,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

+    if (in_array($post_type, $post_types))

         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');

+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -2177,8 +2177,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+function geodir_import_export_tab($tabs) {

+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));

     return $tabs;

 }

 

@@ -2192,8 +2192,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2202,9 +2202,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2213,15 +2213,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';

 	}

-	wp_enqueue_script( 'jquery-ui-progressbar' );

+	wp_enqueue_script('jquery-ui-progressbar');

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -2243,49 +2243,49 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2297,21 +2297,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -2320,7 +2320,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2338,7 +2338,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2350,10 +2350,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2367,30 +2367,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2398,13 +2398,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

@@ -2417,21 +2417,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -2441,7 +2441,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2458,7 +2458,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2470,10 +2470,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2487,26 +2487,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2528,7 +2528,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -2547,7 +2547,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

             dataType: 'json',

             cache: false,

             success: function(data) {

@@ -2599,7 +2599,7 @@ 
 

         jQuery(cont).find('.filelist .file').remove();

         

-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

         jQuery('#gd-import-msg', cont).show();

         

         return false;

@@ -2658,7 +2658,7 @@ 
     jQuery.ajax({

         url: ajaxurl,

         type: "POST",

-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

         dataType : 'json',

         cache: false,

         success: function (data) {

@@ -2847,27 +2847,27 @@ 
 

     var gdMsg = '<p></p>';

     if ( processed > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

         msgParse = msgParse.replace("%s", processed);

         gdMsg += msgParse;

     }

 

     if ( updated > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", updated);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( created > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", created);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( skipped > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", skipped);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

@@ -2877,17 +2877,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -2895,7 +2895,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+        gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3059,9 +3059,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3070,7 +3070,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3095,11 +3095,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3130,7 +3130,7 @@ 
 

     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

         if (page < 2) {

-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

         }

@@ -3138,7 +3138,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,

+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3152,11 +3152,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3213,13 +3213,13 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

+    if (!function_exists('get_filesystem_method')) {

         require_once(ABSPATH."/wp-admin/includes/file.php");

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3232,7 +3232,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3267,7 +3267,7 @@ 
  * @package GeoDirectory

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

     } elseif (!defined('FTP_USER')) {

@@ -3304,64 +3304,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3372,36 +3372,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

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

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

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3409,45 +3409,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3455,7 +3455,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3464,7 +3464,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3478,20 +3478,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3499,48 +3499,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3548,127 +3548,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3685,25 +3685,25 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

@@ -3711,9 +3711,9 @@ 
                     

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -3727,19 +3727,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             

@@ -3764,13 +3764,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

+            if ($task == 'import_cat') {

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -3781,7 +3781,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

@@ -3798,42 +3798,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -3851,24 +3851,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -3876,104 +3876,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -3995,34 +3995,34 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

                 //remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4031,9 +4031,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4070,78 +4070,78 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4149,7 +4149,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4160,43 +4160,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4204,29 +4204,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4247,15 +4247,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4263,9 +4263,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4273,19 +4273,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4293,28 +4293,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4326,7 +4326,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4336,7 +4336,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4374,14 +4374,14 @@ 
                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4389,18 +4389,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));

                                         } else {

                                             $gd_post['expire_date'] = 'Never';

                                         }

@@ -4409,7 +4409,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+                                $table = $plugin_prefix.$post_type.'_detail';

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4420,28 +4420,28 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {

                                         $gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

+                                        if (isset($gd_post['gd_franchise_lock'])) {

+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                            $gd_franchise_lock = trim($gd_franchise_lock);

+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);

                                         }

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

@@ -4450,34 +4450,34 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4485,61 +4485,61 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

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

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

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

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

                                         /*

                                         $menu_order = 1;

@@ -4556,13 +4556,13 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

                                 /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -4582,10 +4582,10 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

 

                 $json = array();

                 $json['processed'] = $processed_actual;

@@ -4596,9 +4596,9 @@ 
                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -4607,82 +4607,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -4696,24 +4696,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -4724,20 +4724,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -4752,35 +4752,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -4790,12 +4790,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -4809,7 +4809,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4853,29 +4853,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -4905,36 +4905,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -4953,20 +4953,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -4977,11 +4977,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -4992,7 +4992,7 @@ 
      * @param int $posts_count Post counts.

      * @param string $post_type Post type.

      */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);

 

     return $posts_count;

 }

@@ -5013,19 +5013,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5036,7 +5036,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

+		if ($post_type == 'gd_event') {

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5094,15 +5094,15 @@ 
 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -5123,28 +5123,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5152,7 +5152,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5160,47 +5160,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -5209,18 +5209,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -5232,7 +5232,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5253,12 +5253,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

             $csv_row[] = $post_info['post_date']; // post_date

@@ -5294,14 +5294,14 @@ 
 			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -5312,15 +5312,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5334,15 +5334,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5364,30 +5364,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5398,9 +5398,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5410,8 +5410,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5422,7 +5422,7 @@ 
      * @param object $results An object containing all post ids.

      * @param string $post_type Post type.

      */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+    return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

@@ -5440,24 +5440,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+        if (!empty($skip_statuses) && is_array($skip_statuses)) {

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

         /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5481,35 +5481,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5526,23 +5526,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5564,16 +5564,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {

+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -5583,15 +5583,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5610,10 +5610,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5629,8 +5629,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -5638,17 +5638,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -5666,14 +5666,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

+		if (!empty($contents) && is_array($contents)) {

+			return count($contents) - 1;

 		}

 	}

 	

@@ -5690,11 +5690,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -5773,14 +5773,14 @@ 
 	global $wpdb, $plugin_prefix;

 	

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

 		return true;

@@ -5806,7 +5806,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -5815,9 +5815,9 @@ 
 		

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -5826,14 +5826,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -5854,15 +5854,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -5888,10 +5888,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -5908,15 +5908,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -5926,13 +5926,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -5948,7 +5948,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -5958,7 +5958,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -5970,8 +5970,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -5987,11 +5987,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -6055,9 +6055,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6104,17 +6104,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6132,7 +6132,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6196,7 +6196,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6251,7 +6251,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -6263,7 +6263,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -6271,7 +6271,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -6286,20 +6286,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6323,7 +6323,7 @@ 
 		$default_language = $sitepress->get_default_language();

 		if ($current_language != 'all' && $current_language != $default_language) {

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

@@ -6338,7 +6338,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6348,7 +6348,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6388,16 +6388,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }

@@ -6409,25 +6409,25 @@ 
 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

-function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

+function geodir_fix_for_primer_theme() {

+    if (!defined('PRIMER_VERSION')) {return; }

     global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+    if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']);

 

         $post_types = geodir_get_posttypes();

-        if ($post_type && in_array($post_type, $post_types) ) {

+        if ($post_type && in_array($post_type, $post_types)) {

             global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+            remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);

         }

     }

 

 }

 

-if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+if (is_admin()) {

+    add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);  

 }

 

 

@@ -6560,27 +6560,27 @@ 
 

 function geodir_ga_activation_url() {

 

-    return add_query_arg( array(

+    return add_query_arg(array(

         'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

         'scope'         => GEODIR_GA_SCOPE,

         'response_type' => 'code',

         'redirect_uri'  => GEODIR_GA_REDIRECT,

         'client_id'     => GEODIR_GA_CLIENTID,

-    ), 'https://accounts.google.com/o/oauth2/auth' );

+    ), 'https://accounts.google.com/o/oauth2/auth');

 

     return $url;

 }

 

-function geodir_gd_accounts(){

+function geodir_gd_accounts() {

     $accounts = array();

-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

-    if($useAuth){

+    $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);

+    if ($useAuth) {

         $accounts = geodir_ga_get_analytics_accounts();

-        if(is_array($accounts)){

-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

+        if (is_array($accounts)) {

+            $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);

+        }elseif (get_option('geodir_ga_account_id')) {

             $accounts = array();

-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

+            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';

         }

     }

     return $accounts;

@@ -6590,32 +6590,32 @@ 
 {

     $accounts = array();

 

-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

+    if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }

 

 

-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

+    if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {

         return get_option('geodir_gd_uids');

     }

 

     

     # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

+    if (trim(get_option('geodir_ga_auth_code')) != '')

         $stats = new GDGoogleAnalyticsStats();

     else

         return false;

 

     # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

+    if (!$stats->checkLogin())

         return false;

 

     # Get a list of accounts

     $accounts = $stats->getAllProfiles();

 

-    natcasesort ($accounts);

+    natcasesort($accounts);

 

     # Return the account array if there are accounts

-    if ( count($accounts) > 0 ){

-        update_option('geodir_gd_uids',$accounts);

+    if (count($accounts) > 0) {

+        update_option('geodir_gd_uids', $accounts);

         return $accounts;

     }

     else

Braces +230 added lines, -127 removed lines

@@ -184,8 +184,9 @@ 
 

         $thumb_img_arr = array();

 

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
+        }
 

         $totImg = '';

         $image_limit = '';

@@ -236,7 +237,9 @@ 
     {

         global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+        if (current_user_can('manage_options')) {
+        	$menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
+        }
 

         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

@@ -300,7 +303,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

-        if (!current_user_can('manage_options')) return false;

+        if (!current_user_can('manage_options')) {
+        	return false;
+        }
         return true;

     }

 }

@@ -331,10 +336,11 @@ 
 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

-				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+				if ($gderr == 21) {
+							    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -385,8 +391,12 @@ 
         include_once('option-pages/' . $current_tab . '_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,8 +408,9 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+        if (!empty($geodir_settings[$current_tab])) {
+                    geodir_update_options($geodir_settings[$current_tab]);
+        }
 

         /**

          * Called after GeoDirectory options settings are updated.

@@ -447,11 +458,14 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+    if ((!isset($_POST) || !$_POST) && !$dummy) {
+    	return false;
+    }
 

     foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+        if ($dummy && isset($value['std'])) {
+                    $_POST[$value['id']] = $value['std'];
+        }
 

 

         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -460,25 +474,23 @@ 
                 update_option($value['id'], $_POST[$value['id']]);

             } else {

                 update_option($value['id'], 0);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+            } elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

                 if (isset($_POST[$value['id'] . '_crop'])) :

                     update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

+                else {
+                	:

+                    update_option($value['id'] . '_crop', 0);
+                }
                 endif;

             } else {

                 update_option($value['id'] . '_width', $value['std']);

                 update_option($value['id'] . '_height', $value['std']);

                 update_option($value['id'] . '_crop', 1);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'map') :

+            } elseif (isset($value['type']) && $value['type'] == 'map') :

             $post_types = array();

             $categories = array();

 

@@ -523,8 +535,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 update_option($value['id'], '');

@@ -540,8 +553,10 @@ 
                 foreach ($uploadedfile as $key => $uplaod):

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                    	:

+                        $uplaods[$key] = $uplaod;
+                    }
                     endif;

                 endforeach;

 

@@ -551,8 +566,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 $upload_overrides = array('test_form' => false);

@@ -567,10 +583,12 @@ 
             endif;

 

 

-        else :

+        else {
+        	:

             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

+                $theme = wp_get_theme();
+        }
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

             }

 

@@ -582,8 +600,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        $_POST = array();

+    if ($dummy) {
+            $_POST = array();
+    }
     return true;

 

 }

@@ -729,9 +748,12 @@ 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

             'categorys' => __('Categories', 'geodirectory'));

 

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+        if (($offset = array_search('author', array_keys($columns))) === false) {
+        	// if the key doesn't exist

         {

-            $offset = 0; // should we prepend $array with $data?

+            $offset = 0;
+        }
+        // should we prepend $array with $data?

             $offset = count($columns); // or should we append $array with $data? lets pick this one...

         }

 

@@ -791,11 +813,13 @@ 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

+                if (empty($expire_date)) {
+                                    echo __('Unknown', 'geodirectory');
+                }
                 /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

+                else {
+                                    echo $expire_date . $date_diff_text;
+                }
                 break;

 

             /* If displaying the 'categorys' column. */

@@ -868,21 +892,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+            return;
+    }
 

     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

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

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+        if (isset($_REQUEST['_status'])) {
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
+        }
 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

         geodir_save_listing($_REQUEST);

     }

@@ -907,10 +936,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

+        if (!isset($value['name'])) {
+        	$value['name'] = '';
+        }
+        if (!isset($value['class'])) {
+        	$value['class'] = '';
+        }
+        if (!isset($value['css'])) {
+        	$value['css'] = '';
+        }
+        if (!isset($value['std'])) {
+        	$value['std'] = '';
+        }
         $desc = '';

         switch ($value['type']) :

             case 'dummy_installer':

@@ -926,11 +963,13 @@ 
 

                 $i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+                if (isset($value['id']) && $value['id']) {
+                                    $tab_id = $value['id'];
+                }
 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
+                }
 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -961,10 +1000,12 @@ 
                 break;

 

             case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
+                }
+                if (isset($value['name']) && $value['name']) {
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
+                }
                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -972,7 +1013,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
+                }
                 echo '<table class="form-table">' . "\n\n";

 

                 break;

@@ -984,7 +1027,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
+                }
                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +1038,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
+                }
                 break;

             case 'text':

                 ?>

@@ -1065,17 +1112,32 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
+	checked(get_option($value['id'] . '_crop'), 1);
+} else {
+	checked(1);
+}
+?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1089,17 +1151,22 @@ 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

                             $geodir_select_value = '';

                             if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($option_value != '' && $option_value == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($value['std'] == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             }

                             ?>

                             <option

@@ -1124,8 +1191,14 @@ 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
+	echo $value['placeholder_text'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1152,7 +1225,10 @@ 
                 <td class="forminp">

                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"

                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"

-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>

+                           class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"/>

                     <?php if (get_option($value['id'])) { ?>

                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"

                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -1233,13 +1309,15 @@ 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

+                            if (empty($geodir_default_map_language)) {
+                                                            $geodir_default_map_language = 'en';
+                            }
                             foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
+                                                                    $geodir_default_language_selected = "selected='selected'";
+                                } else {
+                                                                    $geodir_default_language_selected = '';
+                                }
 

                                 ?>

                                 <option

@@ -1259,14 +1337,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $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';
+                            }
                             if (is_array($post_types)) {

                                 foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
+                                                                            $geodir_search_pt_selected = "selected='selected'";
+                                    } else {
+                                                                            $geodir_search_pt_selected = '';
+                                    }
 

                                     ?>

                                     <option

@@ -1386,7 +1466,7 @@ 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1406,10 +1486,18 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) {
+	echo $value['args'] . ' ';
+}
+?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

                         <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

-                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
+	echo esc_textarea(stripslashes(get_option($value['id'])));
+} else {
+	echo esc_textarea($value['std']);
+}
+?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

@@ -1421,10 +1509,11 @@ 
                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+                    if (get_option($value['id'])) {
+                                            $content = stripslashes(get_option($value['id']));
+                    } else {
+                                            $content = $value['std'];
+                    }
 

                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

@@ -1464,7 +1553,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+                if (isset($value['args'])) {
+                	$args = wp_parse_args($value['args'], $args);
+                }
 

                 ?>

                 <tr valign="top" class="single_select_page">

@@ -1483,8 +1574,10 @@ 
                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

+                else {
+                	:

+                    $country = $country_setting;
+                }
                     $state = '*';

                 endif;

                 ?>

@@ -1511,8 +1604,10 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                        if ($countries) {
+                        	foreach ($countries as $key => $val) :

+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
+                        }
                         endforeach;

                         ?>

                     </select>

@@ -1747,8 +1842,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+    if (!empty($place_img_array)) {
+            $curImages = implode(',', $place_img_array);
+    }
 

 

     // adjust values here

@@ -2094,16 +2190,17 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

+    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
+    		$post_type = get_post_type($_REQUEST['post']);
+    } elseif ($post && isset($post->post_type)) {
+    		$post_type = $post->post_type;
+    } elseif ($typenow) {
+			$post_type = $typenow;
+	} elseif ($current_screen && isset($current_screen->post_type)) {
+			$post_type = $current_screen->post_type;
+	} elseif (isset($_REQUEST['post_type'])) {
+			$post_type = sanitize_key($_REQUEST['post_type']);
+	}
 

 

 	return $post_type;

@@ -2163,9 +2260,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

-}

+    if(in_array($post_type, $post_types)) {
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
+    }
+    }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

 

@@ -5367,8 +5465,9 @@ 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+    if ( ! post_type_exists( $post_type ) ) {
+            return new stdClass;
+    }
         

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -6203,7 +6302,9 @@ 
 

     if ($page_found) :

         // Page exists

-        if (!$option_value) update_option($option, $page_found);

+        if (!$option_value) {
+        	update_option($option, $page_found);
+        }
         return;

     endif;

 

@@ -6578,7 +6679,7 @@ 
         $accounts = geodir_ga_get_analytics_accounts();

         if(is_array($accounts)){

             $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

+        } elseif(get_option('geodir_ga_account_id')){

             $accounts = array();

             $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

         }

@@ -6599,14 +6700,16 @@ 
 

     

     # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

-        $stats = new GDGoogleAnalyticsStats();

-    else

-        return false;

+    if ( trim(get_option('geodir_ga_auth_code')) != '' ) {
+            $stats = new GDGoogleAnalyticsStats();
+    } else {
+            return false;
+    }
 

     # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

-        return false;

+    if ( ! $stats->checkLogin() ) {
+            return false;
+    }
 

     # Get a list of accounts

     $accounts = $stats->getAllProfiles();

@@ -6617,8 +6720,8 @@ 
     if ( count($accounts) > 0 ){

         update_option('geodir_gd_uids',$accounts);

         return $accounts;

+    } else {
+            return false;
+    }
     }

-    else

-        return false;

-}

 

geodirectory-admin/google-api-php-client/src/contrib/Google_AnalyticsService.php

Indentation +1799 added lines, -1799 removed lines

@@ -36,33 +36,33 @@ 
    */
   class Google_DataGaServiceResource extends Google_ServiceResource {
 
-    /**
-     * Returns Analytics data for a view (profile). (ga.get)
-     *
-     * @param string $ids Unique table ID for retrieving Analytics data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-     * @param string $start_date Start date for fetching Analytics data. All requests should specify a start date formatted as YYYY-MM-DD.
-     * @param string $end_date End date for fetching Analytics data. All requests should specify an end date formatted as YYYY-MM-DD.
-     * @param string $metrics A comma-separated list of Analytics metrics. E.g., 'ga:visits,ga:pageviews'. At least one metric must be specified.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string dimensions A comma-separated list of Analytics dimensions. E.g., 'ga:browser,ga:city'.
-     * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to Analytics data.
-     * @opt_param int max-results The maximum number of entries to include in this feed.
-     * @opt_param string segment An Analytics advanced segment to be applied to data.
-     * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for Analytics data.
-     * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_GaData
-     */
-    public function get($ids, $start_date, $end_date, $metrics, $optParams = array()) {
-      $params = array('ids' => $ids, 'start-date' => $start_date, 'end-date' => $end_date, 'metrics' => $metrics);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_GaData($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Returns Analytics data for a view (profile). (ga.get)
+	 *
+	 * @param string $ids Unique table ID for retrieving Analytics data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
+	 * @param string $start_date Start date for fetching Analytics data. All requests should specify a start date formatted as YYYY-MM-DD.
+	 * @param string $end_date End date for fetching Analytics data. All requests should specify an end date formatted as YYYY-MM-DD.
+	 * @param string $metrics A comma-separated list of Analytics metrics. E.g., 'ga:visits,ga:pageviews'. At least one metric must be specified.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param string dimensions A comma-separated list of Analytics dimensions. E.g., 'ga:browser,ga:city'.
+	 * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to Analytics data.
+	 * @opt_param int max-results The maximum number of entries to include in this feed.
+	 * @opt_param string segment An Analytics advanced segment to be applied to data.
+	 * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for Analytics data.
+	 * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_GaData
+	 */
+	public function get($ids, $start_date, $end_date, $metrics, $optParams = array()) {
+	  $params = array('ids' => $ids, 'start-date' => $start_date, 'end-date' => $end_date, 'metrics' => $metrics);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_GaData($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "mcf" collection of methods.
@@ -74,32 +74,32 @@ 
    */
   class Google_DataMcfServiceResource extends Google_ServiceResource {
 
-    /**
-     * Returns Analytics Multi-Channel Funnels data for a view (profile). (mcf.get)
-     *
-     * @param string $ids Unique table ID for retrieving Analytics data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-     * @param string $start_date Start date for fetching Analytics data. All requests should specify a start date formatted as YYYY-MM-DD.
-     * @param string $end_date End date for fetching Analytics data. All requests should specify an end date formatted as YYYY-MM-DD.
-     * @param string $metrics A comma-separated list of Multi-Channel Funnels metrics. E.g., 'mcf:totalConversions,mcf:totalConversionValue'. At least one metric must be specified.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string dimensions A comma-separated list of Multi-Channel Funnels dimensions. E.g., 'mcf:source,mcf:medium'.
-     * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to the Analytics data.
-     * @opt_param int max-results The maximum number of entries to include in this feed.
-     * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for the Analytics data.
-     * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_McfData
-     */
-    public function get($ids, $start_date, $end_date, $metrics, $optParams = array()) {
-      $params = array('ids' => $ids, 'start-date' => $start_date, 'end-date' => $end_date, 'metrics' => $metrics);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_McfData($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Returns Analytics Multi-Channel Funnels data for a view (profile). (mcf.get)
+	 *
+	 * @param string $ids Unique table ID for retrieving Analytics data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
+	 * @param string $start_date Start date for fetching Analytics data. All requests should specify a start date formatted as YYYY-MM-DD.
+	 * @param string $end_date End date for fetching Analytics data. All requests should specify an end date formatted as YYYY-MM-DD.
+	 * @param string $metrics A comma-separated list of Multi-Channel Funnels metrics. E.g., 'mcf:totalConversions,mcf:totalConversionValue'. At least one metric must be specified.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param string dimensions A comma-separated list of Multi-Channel Funnels dimensions. E.g., 'mcf:source,mcf:medium'.
+	 * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to the Analytics data.
+	 * @opt_param int max-results The maximum number of entries to include in this feed.
+	 * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for the Analytics data.
+	 * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_McfData
+	 */
+	public function get($ids, $start_date, $end_date, $metrics, $optParams = array()) {
+	  $params = array('ids' => $ids, 'start-date' => $start_date, 'end-date' => $end_date, 'metrics' => $metrics);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_McfData($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "realtime" collection of methods.
@@ -111,29 +111,29 @@ 
    */
   class Google_DataRealtimeServiceResource extends Google_ServiceResource {
 
-    /**
-     * Returns real time data for a view (profile). (realtime.get)
-     *
-     * @param string $ids Unique table ID for retrieving real time data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-     * @param string $metrics A comma-separated list of real time metrics. E.g., 'ga:activeVisitors'. At least one metric must be specified.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string dimensions A comma-separated list of real time dimensions. E.g., 'ga:medium,ga:city'.
-     * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to real time data.
-     * @opt_param int max-results The maximum number of entries to include in this feed.
-     * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for real time data.
-     * @return Google_RealtimeData
-     */
-    public function get($ids, $metrics, $optParams = array()) {
-      $params = array('ids' => $ids, 'metrics' => $metrics);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_RealtimeData($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Returns real time data for a view (profile). (realtime.get)
+	 *
+	 * @param string $ids Unique table ID for retrieving real time data. Table ID is of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
+	 * @param string $metrics A comma-separated list of real time metrics. E.g., 'ga:activeVisitors'. At least one metric must be specified.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param string dimensions A comma-separated list of real time dimensions. E.g., 'ga:medium,ga:city'.
+	 * @opt_param string filters A comma-separated list of dimension or metric filters to be applied to real time data.
+	 * @opt_param int max-results The maximum number of entries to include in this feed.
+	 * @opt_param string sort A comma-separated list of dimensions or metrics that determine the sort order for real time data.
+	 * @return Google_RealtimeData
+	 */
+	public function get($ids, $metrics, $optParams = array()) {
+	  $params = array('ids' => $ids, 'metrics' => $metrics);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_RealtimeData($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
 
   /**
@@ -158,77 +158,77 @@ 
    */
   class Google_ManagementAccountUserLinksServiceResource extends Google_ServiceResource {
 
-    /**
-     * Removes a user from the given account. (accountUserLinks.delete)
-     *
-     * @param string $accountId Account ID to delete the user link for.
-     * @param string $linkId Link ID to delete the user link for.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $linkId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'linkId' => $linkId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Adds a new user to the given account. (accountUserLinks.insert)
-     *
-     * @param string $accountId Account ID to create the user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function insert($accountId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists account-user links for a given account. (accountUserLinks.list)
-     *
-     * @param string $accountId Account ID to retrieve the user links for.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of account-user links to include in this response.
-     * @opt_param int start-index An index of the first account-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_EntityUserLinks
-     */
-    public function listManagementAccountUserLinks($accountId, $optParams = array()) {
-      $params = array('accountId' => $accountId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLinks($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates permissions for an existing user on the given account.
-     * (accountUserLinks.update)
-     *
-     * @param string $accountId Account ID to update the account-user link for.
-     * @param string $linkId Link ID to update the account-user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function update($accountId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'linkId' => $linkId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Removes a user from the given account. (accountUserLinks.delete)
+	 *
+	 * @param string $accountId Account ID to delete the user link for.
+	 * @param string $linkId Link ID to delete the user link for.
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $linkId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'linkId' => $linkId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * Adds a new user to the given account. (accountUserLinks.insert)
+	 *
+	 * @param string $accountId Account ID to create the user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function insert($accountId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists account-user links for a given account. (accountUserLinks.list)
+	 *
+	 * @param string $accountId Account ID to retrieve the user links for.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of account-user links to include in this response.
+	 * @opt_param int start-index An index of the first account-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_EntityUserLinks
+	 */
+	public function listManagementAccountUserLinks($accountId, $optParams = array()) {
+	  $params = array('accountId' => $accountId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLinks($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates permissions for an existing user on the given account.
+	 * (accountUserLinks.update)
+	 *
+	 * @param string $accountId Account ID to update the account-user link for.
+	 * @param string $linkId Link ID to update the account-user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function update($accountId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'linkId' => $linkId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "accounts" collection of methods.
@@ -240,25 +240,25 @@ 
    */
   class Google_ManagementAccountsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Lists all accounts to which the user has access. (accounts.list)
-     *
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of accounts to include in this response.
-     * @opt_param int start-index An index of the first account to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Accounts
-     */
-    public function listManagementAccounts($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Accounts($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Lists all accounts to which the user has access. (accounts.list)
+	 *
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of accounts to include in this response.
+	 * @opt_param int start-index An index of the first account to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Accounts
+	 */
+	public function listManagementAccounts($optParams = array()) {
+	  $params = array();
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Accounts($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "customDataSources" collection of methods.
@@ -270,28 +270,28 @@ 
    */
   class Google_ManagementCustomDataSourcesServiceResource extends Google_ServiceResource {
 
-    /**
-     * List custom data sources to which the user has access.
-     * (customDataSources.list)
-     *
-     * @param string $accountId Account Id for the custom data sources to retrieve.
-     * @param string $webPropertyId Web property Id for the custom data sources to retrieve.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of custom data sources to include in this response.
-     * @opt_param int start-index A 1-based index of the first custom data source to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_CustomDataSources
-     */
-    public function listManagementCustomDataSources($accountId, $webPropertyId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_CustomDataSources($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * List custom data sources to which the user has access.
+	 * (customDataSources.list)
+	 *
+	 * @param string $accountId Account Id for the custom data sources to retrieve.
+	 * @param string $webPropertyId Web property Id for the custom data sources to retrieve.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of custom data sources to include in this response.
+	 * @opt_param int start-index A 1-based index of the first custom data source to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_CustomDataSources
+	 */
+	public function listManagementCustomDataSources($accountId, $webPropertyId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_CustomDataSources($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "dailyUploads" collection of methods.
@@ -303,70 +303,70 @@ 
    */
   class Google_ManagementDailyUploadsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Delete uploaded data for the given date. (dailyUploads.delete)
-     *
-     * @param string $accountId Account Id associated with daily upload delete.
-     * @param string $webPropertyId Web property Id associated with daily upload delete.
-     * @param string $customDataSourceId Custom data source Id associated with daily upload delete.
-     * @param string $date Date for which data is to be deleted. Date should be formatted as YYYY-MM-DD.
-     * @param string $type Type of data for this delete.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $webPropertyId, $customDataSourceId, $date, $type, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'date' => $date, 'type' => $type);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * List daily uploads to which the user has access. (dailyUploads.list)
-     *
-     * @param string $accountId Account Id for the daily uploads to retrieve.
-     * @param string $webPropertyId Web property Id for the daily uploads to retrieve.
-     * @param string $customDataSourceId Custom data source Id for daily uploads to retrieve.
-     * @param string $start_date Start date of the form YYYY-MM-DD.
-     * @param string $end_date End date of the form YYYY-MM-DD.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of custom data sources to include in this response.
-     * @opt_param int start-index A 1-based index of the first daily upload to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_DailyUploads
-     */
-    public function listManagementDailyUploads($accountId, $webPropertyId, $customDataSourceId, $start_date, $end_date, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'start-date' => $start_date, 'end-date' => $end_date);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_DailyUploads($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Update/Overwrite data for a custom data source. (dailyUploads.upload)
-     *
-     * @param string $accountId Account Id associated with daily upload.
-     * @param string $webPropertyId Web property Id associated with daily upload.
-     * @param string $customDataSourceId Custom data source Id to which the data being uploaded belongs.
-     * @param string $date Date for which data is uploaded. Date should be formatted as YYYY-MM-DD.
-     * @param int $appendNumber Append number for this upload indexed from 1.
-     * @param string $type Type of data for this upload.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool reset Reset/Overwrite all previous appends for this date and start over with this file as the first upload.
-     * @return Google_DailyUploadAppend
-     */
-    public function upload($accountId, $webPropertyId, $customDataSourceId, $date, $appendNumber, $type, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'date' => $date, 'appendNumber' => $appendNumber, 'type' => $type);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('upload', array($params));
-      if ($this->useObjects()) {
-        return new Google_DailyUploadAppend($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Delete uploaded data for the given date. (dailyUploads.delete)
+	 *
+	 * @param string $accountId Account Id associated with daily upload delete.
+	 * @param string $webPropertyId Web property Id associated with daily upload delete.
+	 * @param string $customDataSourceId Custom data source Id associated with daily upload delete.
+	 * @param string $date Date for which data is to be deleted. Date should be formatted as YYYY-MM-DD.
+	 * @param string $type Type of data for this delete.
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $webPropertyId, $customDataSourceId, $date, $type, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'date' => $date, 'type' => $type);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * List daily uploads to which the user has access. (dailyUploads.list)
+	 *
+	 * @param string $accountId Account Id for the daily uploads to retrieve.
+	 * @param string $webPropertyId Web property Id for the daily uploads to retrieve.
+	 * @param string $customDataSourceId Custom data source Id for daily uploads to retrieve.
+	 * @param string $start_date Start date of the form YYYY-MM-DD.
+	 * @param string $end_date End date of the form YYYY-MM-DD.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of custom data sources to include in this response.
+	 * @opt_param int start-index A 1-based index of the first daily upload to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_DailyUploads
+	 */
+	public function listManagementDailyUploads($accountId, $webPropertyId, $customDataSourceId, $start_date, $end_date, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'start-date' => $start_date, 'end-date' => $end_date);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_DailyUploads($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Update/Overwrite data for a custom data source. (dailyUploads.upload)
+	 *
+	 * @param string $accountId Account Id associated with daily upload.
+	 * @param string $webPropertyId Web property Id associated with daily upload.
+	 * @param string $customDataSourceId Custom data source Id to which the data being uploaded belongs.
+	 * @param string $date Date for which data is uploaded. Date should be formatted as YYYY-MM-DD.
+	 * @param int $appendNumber Append number for this upload indexed from 1.
+	 * @param string $type Type of data for this upload.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param bool reset Reset/Overwrite all previous appends for this date and start over with this file as the first upload.
+	 * @return Google_DailyUploadAppend
+	 */
+	public function upload($accountId, $webPropertyId, $customDataSourceId, $date, $appendNumber, $type, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'date' => $date, 'appendNumber' => $appendNumber, 'type' => $type);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('upload', array($params));
+	  if ($this->useObjects()) {
+		return new Google_DailyUploadAppend($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "experiments" collection of methods.
@@ -378,126 +378,126 @@ 
    */
   class Google_ManagementExperimentsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Delete an experiment. (experiments.delete)
-     *
-     * @param string $accountId Account ID to which the experiment belongs
-     * @param string $webPropertyId Web property ID to which the experiment belongs
-     * @param string $profileId View (Profile) ID to which the experiment belongs
-     * @param string $experimentId ID of the experiment to delete
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Returns an experiment to which the user has access. (experiments.get)
-     *
-     * @param string $accountId Account ID to retrieve the experiment for.
-     * @param string $webPropertyId Web property ID to retrieve the experiment for.
-     * @param string $profileId View (Profile) ID to retrieve the experiment for.
-     * @param string $experimentId Experiment ID to retrieve the experiment for.
-     * @param array $optParams Optional parameters.
-     * @return Google_Experiment
-     */
-    public function get($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Experiment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Create a new experiment. (experiments.insert)
-     *
-     * @param string $accountId Account ID to create the experiment for.
-     * @param string $webPropertyId Web property ID to create the experiment for.
-     * @param string $profileId View (Profile) ID to create the experiment for.
-     * @param Google_Experiment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Experiment
-     */
-    public function insert($accountId, $webPropertyId, $profileId, Google_Experiment $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Experiment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists experiments to which the user has access. (experiments.list)
-     *
-     * @param string $accountId Account ID to retrieve experiments for.
-     * @param string $webPropertyId Web property ID to retrieve experiments for.
-     * @param string $profileId View (Profile) ID to retrieve experiments for.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of experiments to include in this response.
-     * @opt_param int start-index An index of the first experiment to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Experiments
-     */
-    public function listManagementExperiments($accountId, $webPropertyId, $profileId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Experiments($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Update an existing experiment. This method supports patch semantics.
-     * (experiments.patch)
-     *
-     * @param string $accountId Account ID of the experiment to update.
-     * @param string $webPropertyId Web property ID of the experiment to update.
-     * @param string $profileId View (Profile) ID of the experiment to update.
-     * @param string $experimentId Experiment ID of the experiment to update.
-     * @param Google_Experiment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Experiment
-     */
-    public function patch($accountId, $webPropertyId, $profileId, $experimentId, Google_Experiment $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Experiment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Update an existing experiment. (experiments.update)
-     *
-     * @param string $accountId Account ID of the experiment to update.
-     * @param string $webPropertyId Web property ID of the experiment to update.
-     * @param string $profileId View (Profile) ID of the experiment to update.
-     * @param string $experimentId Experiment ID of the experiment to update.
-     * @param Google_Experiment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Experiment
-     */
-    public function update($accountId, $webPropertyId, $profileId, $experimentId, Google_Experiment $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Experiment($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Delete an experiment. (experiments.delete)
+	 *
+	 * @param string $accountId Account ID to which the experiment belongs
+	 * @param string $webPropertyId Web property ID to which the experiment belongs
+	 * @param string $profileId View (Profile) ID to which the experiment belongs
+	 * @param string $experimentId ID of the experiment to delete
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * Returns an experiment to which the user has access. (experiments.get)
+	 *
+	 * @param string $accountId Account ID to retrieve the experiment for.
+	 * @param string $webPropertyId Web property ID to retrieve the experiment for.
+	 * @param string $profileId View (Profile) ID to retrieve the experiment for.
+	 * @param string $experimentId Experiment ID to retrieve the experiment for.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Experiment
+	 */
+	public function get($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Experiment($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Create a new experiment. (experiments.insert)
+	 *
+	 * @param string $accountId Account ID to create the experiment for.
+	 * @param string $webPropertyId Web property ID to create the experiment for.
+	 * @param string $profileId View (Profile) ID to create the experiment for.
+	 * @param Google_Experiment $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Experiment
+	 */
+	public function insert($accountId, $webPropertyId, $profileId, Google_Experiment $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Experiment($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists experiments to which the user has access. (experiments.list)
+	 *
+	 * @param string $accountId Account ID to retrieve experiments for.
+	 * @param string $webPropertyId Web property ID to retrieve experiments for.
+	 * @param string $profileId View (Profile) ID to retrieve experiments for.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of experiments to include in this response.
+	 * @opt_param int start-index An index of the first experiment to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Experiments
+	 */
+	public function listManagementExperiments($accountId, $webPropertyId, $profileId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Experiments($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Update an existing experiment. This method supports patch semantics.
+	 * (experiments.patch)
+	 *
+	 * @param string $accountId Account ID of the experiment to update.
+	 * @param string $webPropertyId Web property ID of the experiment to update.
+	 * @param string $profileId View (Profile) ID of the experiment to update.
+	 * @param string $experimentId Experiment ID of the experiment to update.
+	 * @param Google_Experiment $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Experiment
+	 */
+	public function patch($accountId, $webPropertyId, $profileId, $experimentId, Google_Experiment $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('patch', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Experiment($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Update an existing experiment. (experiments.update)
+	 *
+	 * @param string $accountId Account ID of the experiment to update.
+	 * @param string $webPropertyId Web property ID of the experiment to update.
+	 * @param string $profileId View (Profile) ID of the experiment to update.
+	 * @param string $experimentId Experiment ID of the experiment to update.
+	 * @param Google_Experiment $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Experiment
+	 */
+	public function update($accountId, $webPropertyId, $profileId, $experimentId, Google_Experiment $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Experiment($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "goals" collection of methods.
@@ -509,111 +509,111 @@ 
    */
   class Google_ManagementGoalsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Gets a goal to which the user has access. (goals.get)
-     *
-     * @param string $accountId Account ID to retrieve the goal for.
-     * @param string $webPropertyId Web property ID to retrieve the goal for.
-     * @param string $profileId View (Profile) ID to retrieve the goal for.
-     * @param string $goalId Goal ID to retrieve the goal for.
-     * @param array $optParams Optional parameters.
-     * @return Google_Goal
-     */
-    public function get($accountId, $webPropertyId, $profileId, $goalId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Goal($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Create a new goal. (goals.insert)
-     *
-     * @param string $accountId Account ID to create the goal for.
-     * @param string $webPropertyId Web property ID to create the goal for.
-     * @param string $profileId View (Profile) ID to create the goal for.
-     * @param Google_Goal $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Goal
-     */
-    public function insert($accountId, $webPropertyId, $profileId, Google_Goal $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Goal($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists goals to which the user has access. (goals.list)
-     *
-     * @param string $accountId Account ID to retrieve goals for. Can either be a specific account ID or '~all', which refers to all the accounts that user has access to.
-     * @param string $webPropertyId Web property ID to retrieve goals for. Can either be a specific web property ID or '~all', which refers to all the web properties that user has access to.
-     * @param string $profileId View (Profile) ID to retrieve goals for. Can either be a specific view (profile) ID or '~all', which refers to all the views (profiles) that user has access to.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of goals to include in this response.
-     * @opt_param int start-index An index of the first goal to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Goals
-     */
-    public function listManagementGoals($accountId, $webPropertyId, $profileId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Goals($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing view (profile). This method supports patch semantics.
-     * (goals.patch)
-     *
-     * @param string $accountId Account ID to update the goal.
-     * @param string $webPropertyId Web property ID to update the goal.
-     * @param string $profileId View (Profile) ID to update the goal.
-     * @param string $goalId Index of the goal to be updated.
-     * @param Google_Goal $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Goal
-     */
-    public function patch($accountId, $webPropertyId, $profileId, $goalId, Google_Goal $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Goal($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing view (profile). (goals.update)
-     *
-     * @param string $accountId Account ID to update the goal.
-     * @param string $webPropertyId Web property ID to update the goal.
-     * @param string $profileId View (Profile) ID to update the goal.
-     * @param string $goalId Index of the goal to be updated.
-     * @param Google_Goal $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Goal
-     */
-    public function update($accountId, $webPropertyId, $profileId, $goalId, Google_Goal $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Goal($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Gets a goal to which the user has access. (goals.get)
+	 *
+	 * @param string $accountId Account ID to retrieve the goal for.
+	 * @param string $webPropertyId Web property ID to retrieve the goal for.
+	 * @param string $profileId View (Profile) ID to retrieve the goal for.
+	 * @param string $goalId Goal ID to retrieve the goal for.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Goal
+	 */
+	public function get($accountId, $webPropertyId, $profileId, $goalId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Goal($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Create a new goal. (goals.insert)
+	 *
+	 * @param string $accountId Account ID to create the goal for.
+	 * @param string $webPropertyId Web property ID to create the goal for.
+	 * @param string $profileId View (Profile) ID to create the goal for.
+	 * @param Google_Goal $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Goal
+	 */
+	public function insert($accountId, $webPropertyId, $profileId, Google_Goal $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Goal($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists goals to which the user has access. (goals.list)
+	 *
+	 * @param string $accountId Account ID to retrieve goals for. Can either be a specific account ID or '~all', which refers to all the accounts that user has access to.
+	 * @param string $webPropertyId Web property ID to retrieve goals for. Can either be a specific web property ID or '~all', which refers to all the web properties that user has access to.
+	 * @param string $profileId View (Profile) ID to retrieve goals for. Can either be a specific view (profile) ID or '~all', which refers to all the views (profiles) that user has access to.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of goals to include in this response.
+	 * @opt_param int start-index An index of the first goal to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Goals
+	 */
+	public function listManagementGoals($accountId, $webPropertyId, $profileId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Goals($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing view (profile). This method supports patch semantics.
+	 * (goals.patch)
+	 *
+	 * @param string $accountId Account ID to update the goal.
+	 * @param string $webPropertyId Web property ID to update the goal.
+	 * @param string $profileId View (Profile) ID to update the goal.
+	 * @param string $goalId Index of the goal to be updated.
+	 * @param Google_Goal $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Goal
+	 */
+	public function patch($accountId, $webPropertyId, $profileId, $goalId, Google_Goal $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('patch', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Goal($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing view (profile). (goals.update)
+	 *
+	 * @param string $accountId Account ID to update the goal.
+	 * @param string $webPropertyId Web property ID to update the goal.
+	 * @param string $profileId View (Profile) ID to update the goal.
+	 * @param string $goalId Index of the goal to be updated.
+	 * @param Google_Goal $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Goal
+	 */
+	public function update($accountId, $webPropertyId, $profileId, $goalId, Google_Goal $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Goal($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "profileUserLinks" collection of methods.
@@ -625,85 +625,85 @@ 
    */
   class Google_ManagementProfileUserLinksServiceResource extends Google_ServiceResource {
 
-    /**
-     * Removes a user from the given view (profile). (profileUserLinks.delete)
-     *
-     * @param string $accountId Account ID to delete the user link for.
-     * @param string $webPropertyId Web Property ID to delete the user link for.
-     * @param string $profileId View (Profile) ID to delete the user link for.
-     * @param string $linkId Link ID to delete the user link for.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $webPropertyId, $profileId, $linkId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Adds a new user to the given view (profile). (profileUserLinks.insert)
-     *
-     * @param string $accountId Account ID to create the user link for.
-     * @param string $webPropertyId Web Property ID to create the user link for.
-     * @param string $profileId View (Profile) ID to create the user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function insert($accountId, $webPropertyId, $profileId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists profile-user links for a given view (profile). (profileUserLinks.list)
-     *
-     * @param string $accountId Account ID which the given view (profile) belongs to.
-     * @param string $webPropertyId Web Property ID which the given view (profile) belongs to.
-     * @param string $profileId View (Profile) ID to retrieve the profile-user links for
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of profile-user links to include in this response.
-     * @opt_param int start-index An index of the first profile-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_EntityUserLinks
-     */
-    public function listManagementProfileUserLinks($accountId, $webPropertyId, $profileId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLinks($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates permissions for an existing user on the given view (profile).
-     * (profileUserLinks.update)
-     *
-     * @param string $accountId Account ID to update the user link for.
-     * @param string $webPropertyId Web Property ID to update the user link for.
-     * @param string $profileId View (Profile ID) to update the user link for.
-     * @param string $linkId Link ID to update the user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function update($accountId, $webPropertyId, $profileId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Removes a user from the given view (profile). (profileUserLinks.delete)
+	 *
+	 * @param string $accountId Account ID to delete the user link for.
+	 * @param string $webPropertyId Web Property ID to delete the user link for.
+	 * @param string $profileId View (Profile) ID to delete the user link for.
+	 * @param string $linkId Link ID to delete the user link for.
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $webPropertyId, $profileId, $linkId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * Adds a new user to the given view (profile). (profileUserLinks.insert)
+	 *
+	 * @param string $accountId Account ID to create the user link for.
+	 * @param string $webPropertyId Web Property ID to create the user link for.
+	 * @param string $profileId View (Profile) ID to create the user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function insert($accountId, $webPropertyId, $profileId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists profile-user links for a given view (profile). (profileUserLinks.list)
+	 *
+	 * @param string $accountId Account ID which the given view (profile) belongs to.
+	 * @param string $webPropertyId Web Property ID which the given view (profile) belongs to.
+	 * @param string $profileId View (Profile) ID to retrieve the profile-user links for
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of profile-user links to include in this response.
+	 * @opt_param int start-index An index of the first profile-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_EntityUserLinks
+	 */
+	public function listManagementProfileUserLinks($accountId, $webPropertyId, $profileId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLinks($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates permissions for an existing user on the given view (profile).
+	 * (profileUserLinks.update)
+	 *
+	 * @param string $accountId Account ID to update the user link for.
+	 * @param string $webPropertyId Web Property ID to update the user link for.
+	 * @param string $profileId View (Profile ID) to update the user link for.
+	 * @param string $linkId Link ID to update the user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function update($accountId, $webPropertyId, $profileId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "profiles" collection of methods.
@@ -715,120 +715,120 @@ 
    */
   class Google_ManagementProfilesServiceResource extends Google_ServiceResource {
 
-    /**
-     * Deletes a view (profile). (profiles.delete)
-     *
-     * @param string $accountId Account ID to delete the view (profile) for.
-     * @param string $webPropertyId Web property ID to delete the view (profile) for.
-     * @param string $profileId ID of the view (profile) to be deleted.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $webPropertyId, $profileId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a view (profile) to which the user has access. (profiles.get)
-     *
-     * @param string $accountId Account ID to retrieve the goal for.
-     * @param string $webPropertyId Web property ID to retrieve the goal for.
-     * @param string $profileId View (Profile) ID to retrieve the goal for.
-     * @param array $optParams Optional parameters.
-     * @return Google_Profile
-     */
-    public function get($accountId, $webPropertyId, $profileId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Profile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Create a new view (profile). (profiles.insert)
-     *
-     * @param string $accountId Account ID to create the view (profile) for.
-     * @param string $webPropertyId Web property ID to create the view (profile) for.
-     * @param Google_Profile $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Profile
-     */
-    public function insert($accountId, $webPropertyId, Google_Profile $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Profile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists views (profiles) to which the user has access. (profiles.list)
-     *
-     * @param string $accountId Account ID for the view (profiles) to retrieve. Can either be a specific account ID or '~all', which refers to all the accounts to which the user has access.
-     * @param string $webPropertyId Web property ID for the views (profiles) to retrieve. Can either be a specific web property ID or '~all', which refers to all the web properties to which the user has access.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of views (profiles) to include in this response.
-     * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Profiles
-     */
-    public function listManagementProfiles($accountId, $webPropertyId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Profiles($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing view (profile). This method supports patch semantics.
-     * (profiles.patch)
-     *
-     * @param string $accountId Account ID to which the view (profile) belongs
-     * @param string $webPropertyId Web property ID to which the view (profile) belongs
-     * @param string $profileId ID of the view (profile) to be updated.
-     * @param Google_Profile $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Profile
-     */
-    public function patch($accountId, $webPropertyId, $profileId, Google_Profile $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Profile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing view (profile). (profiles.update)
-     *
-     * @param string $accountId Account ID to which the view (profile) belongs
-     * @param string $webPropertyId Web property ID to which the view (profile) belongs
-     * @param string $profileId ID of the view (profile) to be updated.
-     * @param Google_Profile $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Profile
-     */
-    public function update($accountId, $webPropertyId, $profileId, Google_Profile $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Profile($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Deletes a view (profile). (profiles.delete)
+	 *
+	 * @param string $accountId Account ID to delete the view (profile) for.
+	 * @param string $webPropertyId Web property ID to delete the view (profile) for.
+	 * @param string $profileId ID of the view (profile) to be deleted.
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $webPropertyId, $profileId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * Gets a view (profile) to which the user has access. (profiles.get)
+	 *
+	 * @param string $accountId Account ID to retrieve the goal for.
+	 * @param string $webPropertyId Web property ID to retrieve the goal for.
+	 * @param string $profileId View (Profile) ID to retrieve the goal for.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Profile
+	 */
+	public function get($accountId, $webPropertyId, $profileId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Profile($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Create a new view (profile). (profiles.insert)
+	 *
+	 * @param string $accountId Account ID to create the view (profile) for.
+	 * @param string $webPropertyId Web property ID to create the view (profile) for.
+	 * @param Google_Profile $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Profile
+	 */
+	public function insert($accountId, $webPropertyId, Google_Profile $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Profile($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists views (profiles) to which the user has access. (profiles.list)
+	 *
+	 * @param string $accountId Account ID for the view (profiles) to retrieve. Can either be a specific account ID or '~all', which refers to all the accounts to which the user has access.
+	 * @param string $webPropertyId Web property ID for the views (profiles) to retrieve. Can either be a specific web property ID or '~all', which refers to all the web properties to which the user has access.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of views (profiles) to include in this response.
+	 * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Profiles
+	 */
+	public function listManagementProfiles($accountId, $webPropertyId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Profiles($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing view (profile). This method supports patch semantics.
+	 * (profiles.patch)
+	 *
+	 * @param string $accountId Account ID to which the view (profile) belongs
+	 * @param string $webPropertyId Web property ID to which the view (profile) belongs
+	 * @param string $profileId ID of the view (profile) to be updated.
+	 * @param Google_Profile $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Profile
+	 */
+	public function patch($accountId, $webPropertyId, $profileId, Google_Profile $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('patch', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Profile($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing view (profile). (profiles.update)
+	 *
+	 * @param string $accountId Account ID to which the view (profile) belongs
+	 * @param string $webPropertyId Web property ID to which the view (profile) belongs
+	 * @param string $profileId ID of the view (profile) to be updated.
+	 * @param Google_Profile $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Profile
+	 */
+	public function update($accountId, $webPropertyId, $profileId, Google_Profile $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Profile($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "segments" collection of methods.
@@ -840,25 +840,25 @@ 
    */
   class Google_ManagementSegmentsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Lists advanced segments to which the user has access. (segments.list)
-     *
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of advanced segments to include in this response.
-     * @opt_param int start-index An index of the first advanced segment to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Segments
-     */
-    public function listManagementSegments($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Segments($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Lists advanced segments to which the user has access. (segments.list)
+	 *
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of advanced segments to include in this response.
+	 * @opt_param int start-index An index of the first advanced segment to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Segments
+	 */
+	public function listManagementSegments($optParams = array()) {
+	  $params = array();
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Segments($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "uploads" collection of methods.
@@ -870,82 +870,82 @@ 
    */
   class Google_ManagementUploadsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Delete data associated with a previous upload. (uploads.deleteUploadData)
-     *
-     * @param string $accountId Account Id for the uploads to be deleted.
-     * @param string $webPropertyId Web property Id for the uploads to be deleted.
-     * @param string $customDataSourceId Custom data source Id for the uploads to be deleted.
-     * @param Google_AnalyticsDataimportDeleteUploadDataRequest $postBody
-     * @param array $optParams Optional parameters.
-     */
-    public function deleteUploadData($accountId, $webPropertyId, $customDataSourceId, Google_AnalyticsDataimportDeleteUploadDataRequest $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('deleteUploadData', array($params));
-      return $data;
-    }
-    /**
-     * List uploads to which the user has access. (uploads.get)
-     *
-     * @param string $accountId Account Id for the upload to retrieve.
-     * @param string $webPropertyId Web property Id for the upload to retrieve.
-     * @param string $customDataSourceId Custom data source Id for upload to retrieve.
-     * @param string $uploadId Upload Id to retrieve.
-     * @param array $optParams Optional parameters.
-     * @return Google_Upload
-     */
-    public function get($accountId, $webPropertyId, $customDataSourceId, $uploadId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'uploadId' => $uploadId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Upload($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * List uploads to which the user has access. (uploads.list)
-     *
-     * @param string $accountId Account Id for the uploads to retrieve.
-     * @param string $webPropertyId Web property Id for the uploads to retrieve.
-     * @param string $customDataSourceId Custom data source Id for uploads to retrieve.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of uploads to include in this response.
-     * @opt_param int start-index A 1-based index of the first upload to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Uploads
-     */
-    public function listManagementUploads($accountId, $webPropertyId, $customDataSourceId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Uploads($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Upload/Overwrite data for a custom data source. (uploads.uploadData)
-     *
-     * @param string $accountId Account Id associated with the upload.
-     * @param string $webPropertyId Web property UA-string associated with the upload.
-     * @param string $customDataSourceId Custom data source Id to which the data being uploaded belongs.
-     * @param array $optParams Optional parameters.
-     * @return Google_Upload
-     */
-    public function uploadData($accountId, $webPropertyId, $customDataSourceId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('uploadData', array($params));
-      if ($this->useObjects()) {
-        return new Google_Upload($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Delete data associated with a previous upload. (uploads.deleteUploadData)
+	 *
+	 * @param string $accountId Account Id for the uploads to be deleted.
+	 * @param string $webPropertyId Web property Id for the uploads to be deleted.
+	 * @param string $customDataSourceId Custom data source Id for the uploads to be deleted.
+	 * @param Google_AnalyticsDataimportDeleteUploadDataRequest $postBody
+	 * @param array $optParams Optional parameters.
+	 */
+	public function deleteUploadData($accountId, $webPropertyId, $customDataSourceId, Google_AnalyticsDataimportDeleteUploadDataRequest $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('deleteUploadData', array($params));
+	  return $data;
+	}
+	/**
+	 * List uploads to which the user has access. (uploads.get)
+	 *
+	 * @param string $accountId Account Id for the upload to retrieve.
+	 * @param string $webPropertyId Web property Id for the upload to retrieve.
+	 * @param string $customDataSourceId Custom data source Id for upload to retrieve.
+	 * @param string $uploadId Upload Id to retrieve.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Upload
+	 */
+	public function get($accountId, $webPropertyId, $customDataSourceId, $uploadId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'uploadId' => $uploadId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Upload($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * List uploads to which the user has access. (uploads.list)
+	 *
+	 * @param string $accountId Account Id for the uploads to retrieve.
+	 * @param string $webPropertyId Web property Id for the uploads to retrieve.
+	 * @param string $customDataSourceId Custom data source Id for uploads to retrieve.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of uploads to include in this response.
+	 * @opt_param int start-index A 1-based index of the first upload to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Uploads
+	 */
+	public function listManagementUploads($accountId, $webPropertyId, $customDataSourceId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Uploads($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Upload/Overwrite data for a custom data source. (uploads.uploadData)
+	 *
+	 * @param string $accountId Account Id associated with the upload.
+	 * @param string $webPropertyId Web property UA-string associated with the upload.
+	 * @param string $customDataSourceId Custom data source Id to which the data being uploaded belongs.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Upload
+	 */
+	public function uploadData($accountId, $webPropertyId, $customDataSourceId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('uploadData', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Upload($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "webproperties" collection of methods.
@@ -957,102 +957,102 @@ 
    */
   class Google_ManagementWebpropertiesServiceResource extends Google_ServiceResource {
 
-    /**
-     * Gets a web property to which the user has access. (webproperties.get)
-     *
-     * @param string $accountId Account ID to retrieve the web property for.
-     * @param string $webPropertyId ID to retrieve the web property for.
-     * @param array $optParams Optional parameters.
-     * @return Google_Webproperty
-     */
-    public function get($accountId, $webPropertyId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Webproperty($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Create a new property if the account has fewer than 20 properties.
-     * (webproperties.insert)
-     *
-     * @param string $accountId Account ID to create the web property for.
-     * @param Google_Webproperty $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Webproperty
-     */
-    public function insert($accountId, Google_Webproperty $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Webproperty($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists web properties to which the user has access. (webproperties.list)
-     *
-     * @param string $accountId Account ID to retrieve web properties for. Can either be a specific account ID or '~all', which refers to all the accounts that user has access to.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of web properties to include in this response.
-     * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_Webproperties
-     */
-    public function listManagementWebproperties($accountId, $optParams = array()) {
-      $params = array('accountId' => $accountId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Webproperties($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing web property. This method supports patch semantics.
-     * (webproperties.patch)
-     *
-     * @param string $accountId Account ID to which the web property belongs
-     * @param string $webPropertyId Web property ID
-     * @param Google_Webproperty $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Webproperty
-     */
-    public function patch($accountId, $webPropertyId, Google_Webproperty $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Webproperty($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing web property. (webproperties.update)
-     *
-     * @param string $accountId Account ID to which the web property belongs
-     * @param string $webPropertyId Web property ID
-     * @param Google_Webproperty $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Webproperty
-     */
-    public function update($accountId, $webPropertyId, Google_Webproperty $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Webproperty($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Gets a web property to which the user has access. (webproperties.get)
+	 *
+	 * @param string $accountId Account ID to retrieve the web property for.
+	 * @param string $webPropertyId ID to retrieve the web property for.
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Webproperty
+	 */
+	public function get($accountId, $webPropertyId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('get', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Webproperty($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Create a new property if the account has fewer than 20 properties.
+	 * (webproperties.insert)
+	 *
+	 * @param string $accountId Account ID to create the web property for.
+	 * @param Google_Webproperty $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Webproperty
+	 */
+	public function insert($accountId, Google_Webproperty $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Webproperty($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists web properties to which the user has access. (webproperties.list)
+	 *
+	 * @param string $accountId Account ID to retrieve web properties for. Can either be a specific account ID or '~all', which refers to all the accounts that user has access to.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of web properties to include in this response.
+	 * @opt_param int start-index An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_Webproperties
+	 */
+	public function listManagementWebproperties($accountId, $optParams = array()) {
+	  $params = array('accountId' => $accountId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Webproperties($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing web property. This method supports patch semantics.
+	 * (webproperties.patch)
+	 *
+	 * @param string $accountId Account ID to which the web property belongs
+	 * @param string $webPropertyId Web property ID
+	 * @param Google_Webproperty $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Webproperty
+	 */
+	public function patch($accountId, $webPropertyId, Google_Webproperty $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('patch', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Webproperty($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates an existing web property. (webproperties.update)
+	 *
+	 * @param string $accountId Account ID to which the web property belongs
+	 * @param string $webPropertyId Web property ID
+	 * @param Google_Webproperty $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Webproperty
+	 */
+	public function update($accountId, $webPropertyId, Google_Webproperty $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Webproperty($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
   /**
    * The "webpropertyUserLinks" collection of methods.
@@ -1064,82 +1064,82 @@ 
    */
   class Google_ManagementWebpropertyUserLinksServiceResource extends Google_ServiceResource {
 
-    /**
-     * Removes a user from the given web property. (webpropertyUserLinks.delete)
-     *
-     * @param string $accountId Account ID to delete the user link for.
-     * @param string $webPropertyId Web Property ID to delete the user link for.
-     * @param string $linkId Link ID to delete the user link for.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($accountId, $webPropertyId, $linkId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Adds a new user to the given web property. (webpropertyUserLinks.insert)
-     *
-     * @param string $accountId Account ID to create the user link for.
-     * @param string $webPropertyId Web Property ID to create the user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function insert($accountId, $webPropertyId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists webProperty-user links for a given web property.
-     * (webpropertyUserLinks.list)
-     *
-     * @param string $accountId Account ID which the given web property belongs to.
-     * @param string $webPropertyId Web Property ID for the webProperty-user links to retrieve.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int max-results The maximum number of webProperty-user Links to include in this response.
-     * @opt_param int start-index An index of the first webProperty-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
-     * @return Google_EntityUserLinks
-     */
-    public function listManagementWebpropertyUserLinks($accountId, $webPropertyId, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLinks($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates permissions for an existing user on the given web property.
-     * (webpropertyUserLinks.update)
-     *
-     * @param string $accountId Account ID to update the account-user link for.
-     * @param string $webPropertyId Web property ID to update the account-user link for.
-     * @param string $linkId Link ID to update the account-user link for.
-     * @param Google_EntityUserLink $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_EntityUserLink
-     */
-    public function update($accountId, $webPropertyId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
-      $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_EntityUserLink($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Removes a user from the given web property. (webpropertyUserLinks.delete)
+	 *
+	 * @param string $accountId Account ID to delete the user link for.
+	 * @param string $webPropertyId Web Property ID to delete the user link for.
+	 * @param string $linkId Link ID to delete the user link for.
+	 * @param array $optParams Optional parameters.
+	 */
+	public function delete($accountId, $webPropertyId, $linkId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('delete', array($params));
+	  return $data;
+	}
+	/**
+	 * Adds a new user to the given web property. (webpropertyUserLinks.insert)
+	 *
+	 * @param string $accountId Account ID to create the user link for.
+	 * @param string $webPropertyId Web Property ID to create the user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function insert($accountId, $webPropertyId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('insert', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Lists webProperty-user links for a given web property.
+	 * (webpropertyUserLinks.list)
+	 *
+	 * @param string $accountId Account ID which the given web property belongs to.
+	 * @param string $webPropertyId Web Property ID for the webProperty-user links to retrieve.
+	 * @param array $optParams Optional parameters.
+	 *
+	 * @opt_param int max-results The maximum number of webProperty-user Links to include in this response.
+	 * @opt_param int start-index An index of the first webProperty-user link to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.
+	 * @return Google_EntityUserLinks
+	 */
+	public function listManagementWebpropertyUserLinks($accountId, $webPropertyId, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLinks($data);
+	  } else {
+		return $data;
+	  }
+	}
+	/**
+	 * Updates permissions for an existing user on the given web property.
+	 * (webpropertyUserLinks.update)
+	 *
+	 * @param string $accountId Account ID to update the account-user link for.
+	 * @param string $webPropertyId Web property ID to update the account-user link for.
+	 * @param string $linkId Link ID to update the account-user link for.
+	 * @param Google_EntityUserLink $postBody
+	 * @param array $optParams Optional parameters.
+	 * @return Google_EntityUserLink
+	 */
+	public function update($accountId, $webPropertyId, $linkId, Google_EntityUserLink $postBody, $optParams = array()) {
+	  $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId, 'postBody' => $postBody);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('update', array($params));
+	  if ($this->useObjects()) {
+		return new Google_EntityUserLink($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
 
   /**
@@ -1164,23 +1164,23 @@ 
    */
   class Google_MetadataColumnsServiceResource extends Google_ServiceResource {
 
-    /**
-     * Lists all columns for a report type (columns.list)
-     *
-     * @param string $reportType Report type. Allowed Values: 'ga'. Where 'ga' corresponds to the Core Reporting API
-     * @param array $optParams Optional parameters.
-     * @return Google_Columns
-     */
-    public function listMetadataColumns($reportType, $optParams = array()) {
-      $params = array('reportType' => $reportType);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_Columns($data);
-      } else {
-        return $data;
-      }
-    }
+	/**
+	 * Lists all columns for a report type (columns.list)
+	 *
+	 * @param string $reportType Report type. Allowed Values: 'ga'. Where 'ga' corresponds to the Core Reporting API
+	 * @param array $optParams Optional parameters.
+	 * @return Google_Columns
+	 */
+	public function listMetadataColumns($reportType, $optParams = array()) {
+	  $params = array('reportType' => $reportType);
+	  $params = array_merge($params, $optParams);
+	  $data = $this->__call('list', array($params));
+	  if ($this->useObjects()) {
+		return new Google_Columns($data);
+	  } else {
+		return $data;
+	  }
+	}
   }
 
 /**
@@ -1220,27 +1220,27 @@ 
    * @param Google_Client $client
    */
   public function __construct(Google_Client $client) {
-    $this->servicePath = 'analytics/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'analytics';
+	$this->servicePath = 'analytics/v3/';
+	$this->version = 'v3';
+	$this->serviceName = 'analytics';
 
-    $client->addService($this->serviceName, $this->version);
-    $this->data_ga = new Google_DataGaServiceResource($this, $this->serviceName, 'ga', json_decode('{"methods": {"get": {"id": "analytics.data.ga.get", "path": "data/ga", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "end-date": {"type": "string", "required": true, "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "segment": {"type": "string", "location": "query"}, "sort": {"type": "string", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "GaData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->data_mcf = new Google_DataMcfServiceResource($this, $this->serviceName, 'mcf', json_decode('{"methods": {"get": {"id": "analytics.data.mcf.get", "path": "data/mcf", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "end-date": {"type": "string", "required": true, "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "sort": {"type": "string", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "McfData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->data_realtime = new Google_DataRealtimeServiceResource($this, $this->serviceName, 'realtime', json_decode('{"methods": {"get": {"id": "analytics.data.realtime.get", "path": "data/realtime", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "sort": {"type": "string", "location": "query"}}, "response": {"$ref": "RealtimeData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->management_accountUserLinks = new Google_ManagementAccountUserLinksServiceResource($this, $this->serviceName, 'accountUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.accountUserLinks.delete", "path": "management/accounts/{accountId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.accountUserLinks.insert", "path": "management/accounts/{accountId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.accountUserLinks.list", "path": "management/accounts/{accountId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.accountUserLinks.update", "path": "management/accounts/{accountId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
-    $this->management_accounts = new Google_ManagementAccountsServiceResource($this, $this->serviceName, 'accounts', json_decode('{"methods": {"list": {"id": "analytics.management.accounts.list", "path": "management/accounts", "httpMethod": "GET", "parameters": {"max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Accounts"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->management_customDataSources = new Google_ManagementCustomDataSourcesServiceResource($this, $this->serviceName, 'customDataSources', json_decode('{"methods": {"list": {"id": "analytics.management.customDataSources.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "CustomDataSources"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->management_dailyUploads = new Google_ManagementDailyUploadsServiceResource($this, $this->serviceName, 'dailyUploads', json_decode('{"methods": {"delete": {"id": "analytics.management.dailyUploads.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "date": {"type": "string", "required": true, "location": "path"}, "type": {"type": "string", "required": true, "enum": ["cost"], "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.dailyUploads.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "end-date": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "DailyUploads"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "upload": {"id": "analytics.management.dailyUploads.upload", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "appendNumber": {"type": "integer", "required": true, "format": "int32", "minimum": "1", "maximum": "20", "location": "query"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "date": {"type": "string", "required": true, "location": "path"}, "reset": {"type": "boolean", "default": "false", "location": "query"}, "type": {"type": "string", "required": true, "enum": ["cost"], "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "DailyUploadAppend"}, "scopes": ["https://www.googleapis.com/auth/analytics"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["application/octet-stream"], "maxSize": "5MB", "protocols": {"simple": {"multipart": true, "path": "/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads"}, "resumable": {"multipart": true, "path": "/resumable/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads"}}}}}}', true));
-    $this->management_experiments = new Google_ManagementExperimentsServiceResource($this, $this->serviceName, 'experiments', json_decode('{"methods": {"delete": {"id": "analytics.management.experiments.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.experiments.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.experiments.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.experiments.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Experiments"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.experiments.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.experiments.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
-    $this->management_goals = new Google_ManagementGoalsServiceResource($this, $this->serviceName, 'goals', json_decode('{"methods": {"get": {"id": "analytics.management.goals.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.goals.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.goals.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Goals"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.goals.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.goals.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
-    $this->management_profileUserLinks = new Google_ManagementProfileUserLinksServiceResource($this, $this->serviceName, 'profileUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.profileUserLinks.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.profileUserLinks.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.profileUserLinks.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.profileUserLinks.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
-    $this->management_profiles = new Google_ManagementProfilesServiceResource($this, $this->serviceName, 'profiles', json_decode('{"methods": {"delete": {"id": "analytics.management.profiles.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.profiles.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.profiles.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.profiles.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Profiles"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.profiles.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.profiles.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
-    $this->management_segments = new Google_ManagementSegmentsServiceResource($this, $this->serviceName, 'segments', json_decode('{"methods": {"list": {"id": "analytics.management.segments.list", "path": "management/segments", "httpMethod": "GET", "parameters": {"max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Segments"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
-    $this->management_uploads = new Google_ManagementUploadsServiceResource($this, $this->serviceName, 'uploads', json_decode('{"methods": {"deleteUploadData": {"id": "analytics.management.uploads.deleteUploadData", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/deleteUploadData", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "AnalyticsDataimportDeleteUploadDataRequest"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.uploads.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads/{uploadId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "uploadId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Upload"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "list": {"id": "analytics.management.uploads.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Uploads"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "uploadData": {"id": "analytics.management.uploads.uploadData", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Upload"}, "scopes": ["https://www.googleapis.com/auth/analytics"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["application/octet-stream"], "maxSize": "1GB", "protocols": {"simple": {"multipart": true, "path": "/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads"}, "resumable": {"multipart": true, "path": "/resumable/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads"}}}}}}', true));
-    $this->management_webproperties = new Google_ManagementWebpropertiesServiceResource($this, $this->serviceName, 'webproperties', json_decode('{"methods": {"get": {"id": "analytics.management.webproperties.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.webproperties.insert", "path": "management/accounts/{accountId}/webproperties", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.webproperties.list", "path": "management/accounts/{accountId}/webproperties", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Webproperties"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.webproperties.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.webproperties.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
-    $this->management_webpropertyUserLinks = new Google_ManagementWebpropertyUserLinksServiceResource($this, $this->serviceName, 'webpropertyUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.webpropertyUserLinks.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.webpropertyUserLinks.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.webpropertyUserLinks.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.webpropertyUserLinks.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
-    $this->metadata_columns = new Google_MetadataColumnsServiceResource($this, $this->serviceName, 'columns', json_decode('{"methods": {"list": {"id": "analytics.metadata.columns.list", "path": "metadata/{reportType}/columns", "httpMethod": "GET", "parameters": {"reportType": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Columns"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$client->addService($this->serviceName, $this->version);
+	$this->data_ga = new Google_DataGaServiceResource($this, $this->serviceName, 'ga', json_decode('{"methods": {"get": {"id": "analytics.data.ga.get", "path": "data/ga", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "end-date": {"type": "string", "required": true, "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "segment": {"type": "string", "location": "query"}, "sort": {"type": "string", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "GaData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->data_mcf = new Google_DataMcfServiceResource($this, $this->serviceName, 'mcf', json_decode('{"methods": {"get": {"id": "analytics.data.mcf.get", "path": "data/mcf", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "end-date": {"type": "string", "required": true, "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "sort": {"type": "string", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "McfData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->data_realtime = new Google_DataRealtimeServiceResource($this, $this->serviceName, 'realtime', json_decode('{"methods": {"get": {"id": "analytics.data.realtime.get", "path": "data/realtime", "httpMethod": "GET", "parameters": {"dimensions": {"type": "string", "location": "query"}, "filters": {"type": "string", "location": "query"}, "ids": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "metrics": {"type": "string", "required": true, "location": "query"}, "sort": {"type": "string", "location": "query"}}, "response": {"$ref": "RealtimeData"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->management_accountUserLinks = new Google_ManagementAccountUserLinksServiceResource($this, $this->serviceName, 'accountUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.accountUserLinks.delete", "path": "management/accounts/{accountId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.accountUserLinks.insert", "path": "management/accounts/{accountId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.accountUserLinks.list", "path": "management/accounts/{accountId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.accountUserLinks.update", "path": "management/accounts/{accountId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
+	$this->management_accounts = new Google_ManagementAccountsServiceResource($this, $this->serviceName, 'accounts', json_decode('{"methods": {"list": {"id": "analytics.management.accounts.list", "path": "management/accounts", "httpMethod": "GET", "parameters": {"max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Accounts"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->management_customDataSources = new Google_ManagementCustomDataSourcesServiceResource($this, $this->serviceName, 'customDataSources', json_decode('{"methods": {"list": {"id": "analytics.management.customDataSources.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "CustomDataSources"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->management_dailyUploads = new Google_ManagementDailyUploadsServiceResource($this, $this->serviceName, 'dailyUploads', json_decode('{"methods": {"delete": {"id": "analytics.management.dailyUploads.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "date": {"type": "string", "required": true, "location": "path"}, "type": {"type": "string", "required": true, "enum": ["cost"], "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.dailyUploads.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "end-date": {"type": "string", "required": true, "location": "query"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-date": {"type": "string", "required": true, "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "DailyUploads"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "upload": {"id": "analytics.management.dailyUploads.upload", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "appendNumber": {"type": "integer", "required": true, "format": "int32", "minimum": "1", "maximum": "20", "location": "query"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "date": {"type": "string", "required": true, "location": "path"}, "reset": {"type": "boolean", "default": "false", "location": "query"}, "type": {"type": "string", "required": true, "enum": ["cost"], "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "DailyUploadAppend"}, "scopes": ["https://www.googleapis.com/auth/analytics"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["application/octet-stream"], "maxSize": "5MB", "protocols": {"simple": {"multipart": true, "path": "/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads"}, "resumable": {"multipart": true, "path": "/resumable/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/dailyUploads/{date}/uploads"}}}}}}', true));
+	$this->management_experiments = new Google_ManagementExperimentsServiceResource($this, $this->serviceName, 'experiments', json_decode('{"methods": {"delete": {"id": "analytics.management.experiments.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.experiments.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.experiments.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.experiments.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Experiments"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.experiments.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.experiments.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "experimentId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Experiment"}, "response": {"$ref": "Experiment"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
+	$this->management_goals = new Google_ManagementGoalsServiceResource($this, $this->serviceName, 'goals', json_decode('{"methods": {"get": {"id": "analytics.management.goals.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.goals.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.goals.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Goals"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.goals.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.goals.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "goalId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Goal"}, "response": {"$ref": "Goal"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
+	$this->management_profileUserLinks = new Google_ManagementProfileUserLinksServiceResource($this, $this->serviceName, 'profileUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.profileUserLinks.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.profileUserLinks.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.profileUserLinks.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "profileId": {"type": "string", "required": true, "location": "path"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.profileUserLinks.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
+	$this->management_profiles = new Google_ManagementProfilesServiceResource($this, $this->serviceName, 'profiles', json_decode('{"methods": {"delete": {"id": "analytics.management.profiles.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.profiles.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.profiles.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.profiles.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Profiles"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.profiles.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.profiles.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "profileId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Profile"}, "response": {"$ref": "Profile"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
+	$this->management_segments = new Google_ManagementSegmentsServiceResource($this, $this->serviceName, 'segments', json_decode('{"methods": {"list": {"id": "analytics.management.segments.list", "path": "management/segments", "httpMethod": "GET", "parameters": {"max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Segments"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
+	$this->management_uploads = new Google_ManagementUploadsServiceResource($this, $this->serviceName, 'uploads', json_decode('{"methods": {"deleteUploadData": {"id": "analytics.management.uploads.deleteUploadData", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/deleteUploadData", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "AnalyticsDataimportDeleteUploadDataRequest"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "get": {"id": "analytics.management.uploads.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads/{uploadId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "uploadId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Upload"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "list": {"id": "analytics.management.uploads.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Uploads"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "uploadData": {"id": "analytics.management.uploads.uploadData", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "customDataSourceId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Upload"}, "scopes": ["https://www.googleapis.com/auth/analytics"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["application/octet-stream"], "maxSize": "1GB", "protocols": {"simple": {"multipart": true, "path": "/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads"}, "resumable": {"multipart": true, "path": "/resumable/upload/analytics/v3/management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads"}}}}}}', true));
+	$this->management_webproperties = new Google_ManagementWebpropertiesServiceResource($this, $this->serviceName, 'webproperties', json_decode('{"methods": {"get": {"id": "analytics.management.webproperties.get", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "insert": {"id": "analytics.management.webproperties.insert", "path": "management/accounts/{accountId}/webproperties", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "list": {"id": "analytics.management.webproperties.list", "path": "management/accounts/{accountId}/webproperties", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}}, "response": {"$ref": "Webproperties"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}, "patch": {"id": "analytics.management.webproperties.patch", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "PATCH", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}, "update": {"id": "analytics.management.webproperties.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Webproperty"}, "response": {"$ref": "Webproperty"}, "scopes": ["https://www.googleapis.com/auth/analytics"]}}}', true));
+	$this->management_webpropertyUserLinks = new Google_ManagementWebpropertyUserLinksServiceResource($this, $this->serviceName, 'webpropertyUserLinks', json_decode('{"methods": {"delete": {"id": "analytics.management.webpropertyUserLinks.delete", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}", "httpMethod": "DELETE", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "insert": {"id": "analytics.management.webpropertyUserLinks.insert", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks", "httpMethod": "POST", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "list": {"id": "analytics.management.webpropertyUserLinks.list", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks", "httpMethod": "GET", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "max-results": {"type": "integer", "format": "int32", "location": "query"}, "start-index": {"type": "integer", "format": "int32", "minimum": "1", "location": "query"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "EntityUserLinks"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}, "update": {"id": "analytics.management.webpropertyUserLinks.update", "path": "management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}", "httpMethod": "PUT", "parameters": {"accountId": {"type": "string", "required": true, "location": "path"}, "linkId": {"type": "string", "required": true, "location": "path"}, "webPropertyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "EntityUserLink"}, "response": {"$ref": "EntityUserLink"}, "scopes": ["https://www.googleapis.com/auth/analytics.manage.users"]}}}', true));
+	$this->metadata_columns = new Google_MetadataColumnsServiceResource($this, $this->serviceName, 'columns', json_decode('{"methods": {"list": {"id": "analytics.metadata.columns.list", "path": "metadata/{reportType}/columns", "httpMethod": "GET", "parameters": {"reportType": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Columns"}, "scopes": ["https://www.googleapis.com/auth/analytics", "https://www.googleapis.com/auth/analytics.readonly"]}}}', true));
 
   }
 }
@@ -1261,52 +1261,52 @@ 
   public $selfLink;
   public $updated;
   public function setChildLink(Google_AccountChildLink $childLink) {
-    $this->childLink = $childLink;
+	$this->childLink = $childLink;
   }
   public function getChildLink() {
-    return $this->childLink;
+	return $this->childLink;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setPermissions(Google_AccountPermissions $permissions) {
-    $this->permissions = $permissions;
+	$this->permissions = $permissions;
   }
   public function getPermissions() {
-    return $this->permissions;
+	return $this->permissions;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
 }
 
@@ -1314,27 +1314,27 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
 class Google_AccountPermissions extends Google_Model {
   public $effective;
   public function setEffective(/* array(Google_string) */ $effective) {
-    $this->assertIsArray($effective, 'Google_string', __METHOD__);
-    $this->effective = $effective;
+	$this->assertIsArray($effective, 'Google_string', __METHOD__);
+	$this->effective = $effective;
   }
   public function getEffective() {
-    return $this->effective;
+	return $this->effective;
   }
 }
 
@@ -1344,28 +1344,28 @@ 
   public $kind;
   public $name;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
 }
 
@@ -1381,64 +1381,64 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Account) */ $items) {
-    $this->assertIsArray($items, 'Google_Account', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Account', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
 class Google_AnalyticsDataimportDeleteUploadDataRequest extends Google_Model {
   public $customDataImportUids;
   public function setCustomDataImportUids(/* array(Google_string) */ $customDataImportUids) {
-    $this->assertIsArray($customDataImportUids, 'Google_string', __METHOD__);
-    $this->customDataImportUids = $customDataImportUids;
+	$this->assertIsArray($customDataImportUids, 'Google_string', __METHOD__);
+	$this->customDataImportUids = $customDataImportUids;
   }
   public function getCustomDataImportUids() {
-    return $this->customDataImportUids;
+	return $this->customDataImportUids;
   }
 }
 
@@ -1447,22 +1447,22 @@ 
   public $id;
   public $kind;
   public function setAttributes( $attributes) {
-    $this->attributes = $attributes;
+	$this->attributes = $attributes;
   }
   public function getAttributes() {
-    return $this->attributes;
+	return $this->attributes;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1475,36 +1475,36 @@ 
   public $kind;
   public $totalResults;
   public function setAttributeNames(/* array(Google_string) */ $attributeNames) {
-    $this->assertIsArray($attributeNames, 'Google_string', __METHOD__);
-    $this->attributeNames = $attributeNames;
+	$this->assertIsArray($attributeNames, 'Google_string', __METHOD__);
+	$this->attributeNames = $attributeNames;
   }
   public function getAttributeNames() {
-    return $this->attributeNames;
+	return $this->attributeNames;
   }
   public function setEtag( $etag) {
-    $this->etag = $etag;
+	$this->etag = $etag;
   }
   public function getEtag() {
-    return $this->etag;
+	return $this->etag;
   }
   public function setItems(/* array(Google_Column) */ $items) {
-    $this->assertIsArray($items, 'Google_Column', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Column', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
 }
 
@@ -1527,83 +1527,83 @@ 
   public $updated;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setChildLink(Google_CustomDataSourceChildLink $childLink) {
-    $this->childLink = $childLink;
+	$this->childLink = $childLink;
   }
   public function getChildLink() {
-    return $this->childLink;
+	return $this->childLink;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setDescription( $description) {
-    $this->description = $description;
+	$this->description = $description;
   }
   public function getDescription() {
-    return $this->description;
+	return $this->description;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setParentLink(Google_CustomDataSourceParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setProfilesLinked(/* array(Google_string) */ $profilesLinked) {
-    $this->assertIsArray($profilesLinked, 'Google_string', __METHOD__);
-    $this->profilesLinked = $profilesLinked;
+	$this->assertIsArray($profilesLinked, 'Google_string', __METHOD__);
+	$this->profilesLinked = $profilesLinked;
   }
   public function getProfilesLinked() {
-    return $this->profilesLinked;
+	return $this->profilesLinked;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -1611,16 +1611,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -1628,16 +1628,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -1653,53 +1653,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_CustomDataSource) */ $items) {
-    $this->assertIsArray($items, 'Google_CustomDataSource', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_CustomDataSource', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -1720,71 +1720,71 @@ 
   public $selfLink;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAppendCount( $appendCount) {
-    $this->appendCount = $appendCount;
+	$this->appendCount = $appendCount;
   }
   public function getAppendCount() {
-    return $this->appendCount;
+	return $this->appendCount;
   }
   public function setCreatedTime( $createdTime) {
-    $this->createdTime = $createdTime;
+	$this->createdTime = $createdTime;
   }
   public function getCreatedTime() {
-    return $this->createdTime;
+	return $this->createdTime;
   }
   public function setCustomDataSourceId( $customDataSourceId) {
-    $this->customDataSourceId = $customDataSourceId;
+	$this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
-    return $this->customDataSourceId;
+	return $this->customDataSourceId;
   }
   public function setDate( $date) {
-    $this->date = $date;
+	$this->date = $date;
   }
   public function getDate() {
-    return $this->date;
+	return $this->date;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setModifiedTime( $modifiedTime) {
-    $this->modifiedTime = $modifiedTime;
+	$this->modifiedTime = $modifiedTime;
   }
   public function getModifiedTime() {
-    return $this->modifiedTime;
+	return $this->modifiedTime;
   }
   public function setParentLink(Google_DailyUploadParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setRecentChanges(/* array(Google_DailyUploadRecentChanges) */ $recentChanges) {
-    $this->assertIsArray($recentChanges, 'Google_DailyUploadRecentChanges', __METHOD__);
-    $this->recentChanges = $recentChanges;
+	$this->assertIsArray($recentChanges, 'Google_DailyUploadRecentChanges', __METHOD__);
+	$this->recentChanges = $recentChanges;
   }
   public function getRecentChanges() {
-    return $this->recentChanges;
+	return $this->recentChanges;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -1797,46 +1797,46 @@ 
   public $nextAppendLink;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAppendNumber( $appendNumber) {
-    $this->appendNumber = $appendNumber;
+	$this->appendNumber = $appendNumber;
   }
   public function getAppendNumber() {
-    return $this->appendNumber;
+	return $this->appendNumber;
   }
   public function setCustomDataSourceId( $customDataSourceId) {
-    $this->customDataSourceId = $customDataSourceId;
+	$this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
-    return $this->customDataSourceId;
+	return $this->customDataSourceId;
   }
   public function setDate( $date) {
-    $this->date = $date;
+	$this->date = $date;
   }
   public function getDate() {
-    return $this->date;
+	return $this->date;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextAppendLink( $nextAppendLink) {
-    $this->nextAppendLink = $nextAppendLink;
+	$this->nextAppendLink = $nextAppendLink;
   }
   public function getNextAppendLink() {
-    return $this->nextAppendLink;
+	return $this->nextAppendLink;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -1844,16 +1844,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -1861,16 +1861,16 @@ 
   public $change;
   public $time;
   public function setChange( $change) {
-    $this->change = $change;
+	$this->change = $change;
   }
   public function getChange() {
-    return $this->change;
+	return $this->change;
   }
   public function setTime( $time) {
-    $this->time = $time;
+	$this->time = $time;
   }
   public function getTime() {
-    return $this->time;
+	return $this->time;
   }
 }
 
@@ -1886,53 +1886,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_DailyUpload) */ $items) {
-    $this->assertIsArray($items, 'Google_DailyUpload', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_DailyUpload', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -1950,40 +1950,40 @@ 
   protected $__userRefDataType = '';
   public $userRef;
   public function setEntity(Google_EntityUserLinkEntity $entity) {
-    $this->entity = $entity;
+	$this->entity = $entity;
   }
   public function getEntity() {
-    return $this->entity;
+	return $this->entity;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setPermissions(Google_EntityUserLinkPermissions $permissions) {
-    $this->permissions = $permissions;
+	$this->permissions = $permissions;
   }
   public function getPermissions() {
-    return $this->permissions;
+	return $this->permissions;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setUserRef(Google_UserRef $userRef) {
-    $this->userRef = $userRef;
+	$this->userRef = $userRef;
   }
   public function getUserRef() {
-    return $this->userRef;
+	return $this->userRef;
   }
 }
 
@@ -1998,22 +1998,22 @@ 
   protected $__webPropertyRefDataType = '';
   public $webPropertyRef;
   public function setAccountRef(Google_AccountRef $accountRef) {
-    $this->accountRef = $accountRef;
+	$this->accountRef = $accountRef;
   }
   public function getAccountRef() {
-    return $this->accountRef;
+	return $this->accountRef;
   }
   public function setProfileRef(Google_ProfileRef $profileRef) {
-    $this->profileRef = $profileRef;
+	$this->profileRef = $profileRef;
   }
   public function getProfileRef() {
-    return $this->profileRef;
+	return $this->profileRef;
   }
   public function setWebPropertyRef(Google_WebPropertyRef $webPropertyRef) {
-    $this->webPropertyRef = $webPropertyRef;
+	$this->webPropertyRef = $webPropertyRef;
   }
   public function getWebPropertyRef() {
-    return $this->webPropertyRef;
+	return $this->webPropertyRef;
   }
 }
 
@@ -2021,18 +2021,18 @@ 
   public $effective;
   public $local;
   public function setEffective(/* array(Google_string) */ $effective) {
-    $this->assertIsArray($effective, 'Google_string', __METHOD__);
-    $this->effective = $effective;
+	$this->assertIsArray($effective, 'Google_string', __METHOD__);
+	$this->effective = $effective;
   }
   public function getEffective() {
-    return $this->effective;
+	return $this->effective;
   }
   public function setLocal(/* array(Google_string) */ $local) {
-    $this->assertIsArray($local, 'Google_string', __METHOD__);
-    $this->local = $local;
+	$this->assertIsArray($local, 'Google_string', __METHOD__);
+	$this->local = $local;
   }
   public function getLocal() {
-    return $this->local;
+	return $this->local;
   }
 }
 
@@ -2047,47 +2047,47 @@ 
   public $startIndex;
   public $totalResults;
   public function setItems(/* array(Google_EntityUserLink) */ $items) {
-    $this->assertIsArray($items, 'Google_EntityUserLink', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_EntityUserLink', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
 }
 
@@ -2124,167 +2124,167 @@ 
   public $winnerConfidenceLevel;
   public $winnerFound;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setDescription( $description) {
-    $this->description = $description;
+	$this->description = $description;
   }
   public function getDescription() {
-    return $this->description;
+	return $this->description;
   }
   public function setEditableInGaUi( $editableInGaUi) {
-    $this->editableInGaUi = $editableInGaUi;
+	$this->editableInGaUi = $editableInGaUi;
   }
   public function getEditableInGaUi() {
-    return $this->editableInGaUi;
+	return $this->editableInGaUi;
   }
   public function setEndTime( $endTime) {
-    $this->endTime = $endTime;
+	$this->endTime = $endTime;
   }
   public function getEndTime() {
-    return $this->endTime;
+	return $this->endTime;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setMinimumExperimentLengthInDays( $minimumExperimentLengthInDays) {
-    $this->minimumExperimentLengthInDays = $minimumExperimentLengthInDays;
+	$this->minimumExperimentLengthInDays = $minimumExperimentLengthInDays;
   }
   public function getMinimumExperimentLengthInDays() {
-    return $this->minimumExperimentLengthInDays;
+	return $this->minimumExperimentLengthInDays;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setObjectiveMetric( $objectiveMetric) {
-    $this->objectiveMetric = $objectiveMetric;
+	$this->objectiveMetric = $objectiveMetric;
   }
   public function getObjectiveMetric() {
-    return $this->objectiveMetric;
+	return $this->objectiveMetric;
   }
   public function setOptimizationType( $optimizationType) {
-    $this->optimizationType = $optimizationType;
+	$this->optimizationType = $optimizationType;
   }
   public function getOptimizationType() {
-    return $this->optimizationType;
+	return $this->optimizationType;
   }
   public function setParentLink(Google_ExperimentParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setProfileId( $profileId) {
-    $this->profileId = $profileId;
+	$this->profileId = $profileId;
   }
   public function getProfileId() {
-    return $this->profileId;
+	return $this->profileId;
   }
   public function setReasonExperimentEnded( $reasonExperimentEnded) {
-    $this->reasonExperimentEnded = $reasonExperimentEnded;
+	$this->reasonExperimentEnded = $reasonExperimentEnded;
   }
   public function getReasonExperimentEnded() {
-    return $this->reasonExperimentEnded;
+	return $this->reasonExperimentEnded;
   }
   public function setRewriteVariationUrlsAsOriginal( $rewriteVariationUrlsAsOriginal) {
-    $this->rewriteVariationUrlsAsOriginal = $rewriteVariationUrlsAsOriginal;
+	$this->rewriteVariationUrlsAsOriginal = $rewriteVariationUrlsAsOriginal;
   }
   public function getRewriteVariationUrlsAsOriginal() {
-    return $this->rewriteVariationUrlsAsOriginal;
+	return $this->rewriteVariationUrlsAsOriginal;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setServingFramework( $servingFramework) {
-    $this->servingFramework = $servingFramework;
+	$this->servingFramework = $servingFramework;
   }
   public function getServingFramework() {
-    return $this->servingFramework;
+	return $this->servingFramework;
   }
   public function setSnippet( $snippet) {
-    $this->snippet = $snippet;
+	$this->snippet = $snippet;
   }
   public function getSnippet() {
-    return $this->snippet;
+	return $this->snippet;
   }
   public function setStartTime( $startTime) {
-    $this->startTime = $startTime;
+	$this->startTime = $startTime;
   }
   public function getStartTime() {
-    return $this->startTime;
+	return $this->startTime;
   }
   public function setStatus( $status) {
-    $this->status = $status;
+	$this->status = $status;
   }
   public function getStatus() {
-    return $this->status;
+	return $this->status;
   }
   public function setTrafficCoverage( $trafficCoverage) {
-    $this->trafficCoverage = $trafficCoverage;
+	$this->trafficCoverage = $trafficCoverage;
   }
   public function getTrafficCoverage() {
-    return $this->trafficCoverage;
+	return $this->trafficCoverage;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
   public function setVariations(/* array(Google_ExperimentVariations) */ $variations) {
-    $this->assertIsArray($variations, 'Google_ExperimentVariations', __METHOD__);
-    $this->variations = $variations;
+	$this->assertIsArray($variations, 'Google_ExperimentVariations', __METHOD__);
+	$this->variations = $variations;
   }
   public function getVariations() {
-    return $this->variations;
+	return $this->variations;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
   public function setWinnerConfidenceLevel( $winnerConfidenceLevel) {
-    $this->winnerConfidenceLevel = $winnerConfidenceLevel;
+	$this->winnerConfidenceLevel = $winnerConfidenceLevel;
   }
   public function getWinnerConfidenceLevel() {
-    return $this->winnerConfidenceLevel;
+	return $this->winnerConfidenceLevel;
   }
   public function setWinnerFound( $winnerFound) {
-    $this->winnerFound = $winnerFound;
+	$this->winnerFound = $winnerFound;
   }
   public function getWinnerFound() {
-    return $this->winnerFound;
+	return $this->winnerFound;
   }
 }
 
@@ -2292,16 +2292,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -2312,34 +2312,34 @@ 
   public $weight;
   public $won;
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setStatus( $status) {
-    $this->status = $status;
+	$this->status = $status;
   }
   public function getStatus() {
-    return $this->status;
+	return $this->status;
   }
   public function setUrl( $url) {
-    $this->url = $url;
+	$this->url = $url;
   }
   public function getUrl() {
-    return $this->url;
+	return $this->url;
   }
   public function setWeight( $weight) {
-    $this->weight = $weight;
+	$this->weight = $weight;
   }
   public function getWeight() {
-    return $this->weight;
+	return $this->weight;
   }
   public function setWon( $won) {
-    $this->won = $won;
+	$this->won = $won;
   }
   public function getWon() {
-    return $this->won;
+	return $this->won;
   }
 }
 
@@ -2355,53 +2355,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Experiment) */ $items) {
-    $this->assertIsArray($items, 'Google_Experiment', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Experiment', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -2426,84 +2426,84 @@ 
   public $totalResults;
   public $totalsForAllResults;
   public function setColumnHeaders(/* array(Google_GaDataColumnHeaders) */ $columnHeaders) {
-    $this->assertIsArray($columnHeaders, 'Google_GaDataColumnHeaders', __METHOD__);
-    $this->columnHeaders = $columnHeaders;
+	$this->assertIsArray($columnHeaders, 'Google_GaDataColumnHeaders', __METHOD__);
+	$this->columnHeaders = $columnHeaders;
   }
   public function getColumnHeaders() {
-    return $this->columnHeaders;
+	return $this->columnHeaders;
   }
   public function setContainsSampledData( $containsSampledData) {
-    $this->containsSampledData = $containsSampledData;
+	$this->containsSampledData = $containsSampledData;
   }
   public function getContainsSampledData() {
-    return $this->containsSampledData;
+	return $this->containsSampledData;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setProfileInfo(Google_GaDataProfileInfo $profileInfo) {
-    $this->profileInfo = $profileInfo;
+	$this->profileInfo = $profileInfo;
   }
   public function getProfileInfo() {
-    return $this->profileInfo;
+	return $this->profileInfo;
   }
   public function setQuery(Google_GaDataQuery $query) {
-    $this->query = $query;
+	$this->query = $query;
   }
   public function getQuery() {
-    return $this->query;
+	return $this->query;
   }
   public function setRows(/* array(Google_string) */ $rows) {
-    $this->assertIsArray($rows, 'Google_string', __METHOD__);
-    $this->rows = $rows;
+	$this->assertIsArray($rows, 'Google_string', __METHOD__);
+	$this->rows = $rows;
   }
   public function getRows() {
-    return $this->rows;
+	return $this->rows;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setTotalsForAllResults( $totalsForAllResults) {
-    $this->totalsForAllResults = $totalsForAllResults;
+	$this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
-    return $this->totalsForAllResults;
+	return $this->totalsForAllResults;
   }
 }
 
@@ -2512,22 +2512,22 @@ 
   public $dataType;
   public $name;
   public function setColumnType( $columnType) {
-    $this->columnType = $columnType;
+	$this->columnType = $columnType;
   }
   public function getColumnType() {
-    return $this->columnType;
+	return $this->columnType;
   }
   public function setDataType( $dataType) {
-    $this->dataType = $dataType;
+	$this->dataType = $dataType;
   }
   public function getDataType() {
-    return $this->dataType;
+	return $this->dataType;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
 }
 
@@ -2539,40 +2539,40 @@ 
   public $tableId;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setProfileId( $profileId) {
-    $this->profileId = $profileId;
+	$this->profileId = $profileId;
   }
   public function getProfileId() {
-    return $this->profileId;
+	return $this->profileId;
   }
   public function setProfileName( $profileName) {
-    $this->profileName = $profileName;
+	$this->profileName = $profileName;
   }
   public function getProfileName() {
-    return $this->profileName;
+	return $this->profileName;
   }
   public function setTableId( $tableId) {
-    $this->tableId = $tableId;
+	$this->tableId = $tableId;
   }
   public function getTableId() {
-    return $this->tableId;
+	return $this->tableId;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -2588,66 +2588,66 @@ 
   public $start_date;
   public $start_index;
   public function setDimensions( $dimensions) {
-    $this->dimensions = $dimensions;
+	$this->dimensions = $dimensions;
   }
   public function getDimensions() {
-    return $this->dimensions;
+	return $this->dimensions;
   }
   public function setEnd_date( $end_date) {
-    $this->end_date = $end_date;
+	$this->end_date = $end_date;
   }
   public function getEnd_date() {
-    return $this->end_date;
+	return $this->end_date;
   }
   public function setFilters( $filters) {
-    $this->filters = $filters;
+	$this->filters = $filters;
   }
   public function getFilters() {
-    return $this->filters;
+	return $this->filters;
   }
   public function setIds( $ids) {
-    $this->ids = $ids;
+	$this->ids = $ids;
   }
   public function getIds() {
-    return $this->ids;
+	return $this->ids;
   }
   public function setMax_results( $max_results) {
-    $this->max_results = $max_results;
+	$this->max_results = $max_results;
   }
   public function getMax_results() {
-    return $this->max_results;
+	return $this->max_results;
   }
   public function setMetrics(/* array(Google_string) */ $metrics) {
-    $this->assertIsArray($metrics, 'Google_string', __METHOD__);
-    $this->metrics = $metrics;
+	$this->assertIsArray($metrics, 'Google_string', __METHOD__);
+	$this->metrics = $metrics;
   }
   public function getMetrics() {
-    return $this->metrics;
+	return $this->metrics;
   }
   public function setSegment( $segment) {
-    $this->segment = $segment;
+	$this->segment = $segment;
   }
   public function getSegment() {
-    return $this->segment;
+	return $this->segment;
   }
   public function setSort(/* array(Google_string) */ $sort) {
-    $this->assertIsArray($sort, 'Google_string', __METHOD__);
-    $this->sort = $sort;
+	$this->assertIsArray($sort, 'Google_string', __METHOD__);
+	$this->sort = $sort;
   }
   public function getSort() {
-    return $this->sort;
+	return $this->sort;
   }
   public function setStart_date( $start_date) {
-    $this->start_date = $start_date;
+	$this->start_date = $start_date;
   }
   public function getStart_date() {
-    return $this->start_date;
+	return $this->start_date;
   }
   public function setStart_index( $start_index) {
-    $this->start_index = $start_index;
+	$this->start_index = $start_index;
   }
   public function getStart_index() {
-    return $this->start_index;
+	return $this->start_index;
   }
 }
 
@@ -2681,112 +2681,112 @@ 
   public $visitTimeOnSiteDetails;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setActive( $active) {
-    $this->active = $active;
+	$this->active = $active;
   }
   public function getActive() {
-    return $this->active;
+	return $this->active;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setEventDetails(Google_GoalEventDetails $eventDetails) {
-    $this->eventDetails = $eventDetails;
+	$this->eventDetails = $eventDetails;
   }
   public function getEventDetails() {
-    return $this->eventDetails;
+	return $this->eventDetails;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setParentLink(Google_GoalParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setProfileId( $profileId) {
-    $this->profileId = $profileId;
+	$this->profileId = $profileId;
   }
   public function getProfileId() {
-    return $this->profileId;
+	return $this->profileId;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
   public function setUrlDestinationDetails(Google_GoalUrlDestinationDetails $urlDestinationDetails) {
-    $this->urlDestinationDetails = $urlDestinationDetails;
+	$this->urlDestinationDetails = $urlDestinationDetails;
   }
   public function getUrlDestinationDetails() {
-    return $this->urlDestinationDetails;
+	return $this->urlDestinationDetails;
   }
   public function setValue( $value) {
-    $this->value = $value;
+	$this->value = $value;
   }
   public function getValue() {
-    return $this->value;
+	return $this->value;
   }
   public function setVisitNumPagesDetails(Google_GoalVisitNumPagesDetails $visitNumPagesDetails) {
-    $this->visitNumPagesDetails = $visitNumPagesDetails;
+	$this->visitNumPagesDetails = $visitNumPagesDetails;
   }
   public function getVisitNumPagesDetails() {
-    return $this->visitNumPagesDetails;
+	return $this->visitNumPagesDetails;
   }
   public function setVisitTimeOnSiteDetails(Google_GoalVisitTimeOnSiteDetails $visitTimeOnSiteDetails) {
-    $this->visitTimeOnSiteDetails = $visitTimeOnSiteDetails;
+	$this->visitTimeOnSiteDetails = $visitTimeOnSiteDetails;
   }
   public function getVisitTimeOnSiteDetails() {
-    return $this->visitTimeOnSiteDetails;
+	return $this->visitTimeOnSiteDetails;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -2796,17 +2796,17 @@ 
   public $eventConditions;
   public $useEventValue;
   public function setEventConditions(/* array(Google_GoalEventDetailsEventConditions) */ $eventConditions) {
-    $this->assertIsArray($eventConditions, 'Google_GoalEventDetailsEventConditions', __METHOD__);
-    $this->eventConditions = $eventConditions;
+	$this->assertIsArray($eventConditions, 'Google_GoalEventDetailsEventConditions', __METHOD__);
+	$this->eventConditions = $eventConditions;
   }
   public function getEventConditions() {
-    return $this->eventConditions;
+	return $this->eventConditions;
   }
   public function setUseEventValue( $useEventValue) {
-    $this->useEventValue = $useEventValue;
+	$this->useEventValue = $useEventValue;
   }
   public function getUseEventValue() {
-    return $this->useEventValue;
+	return $this->useEventValue;
   }
 }
 
@@ -2817,34 +2817,34 @@ 
   public $matchType;
   public $type;
   public function setComparisonType( $comparisonType) {
-    $this->comparisonType = $comparisonType;
+	$this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
-    return $this->comparisonType;
+	return $this->comparisonType;
   }
   public function setComparisonValue( $comparisonValue) {
-    $this->comparisonValue = $comparisonValue;
+	$this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
-    return $this->comparisonValue;
+	return $this->comparisonValue;
   }
   public function setExpression( $expression) {
-    $this->expression = $expression;
+	$this->expression = $expression;
   }
   public function getExpression() {
-    return $this->expression;
+	return $this->expression;
   }
   public function setMatchType( $matchType) {
-    $this->matchType = $matchType;
+	$this->matchType = $matchType;
   }
   public function getMatchType() {
-    return $this->matchType;
+	return $this->matchType;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -2852,16 +2852,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -2874,35 +2874,35 @@ 
   public $steps;
   public $url;
   public function setCaseSensitive( $caseSensitive) {
-    $this->caseSensitive = $caseSensitive;
+	$this->caseSensitive = $caseSensitive;
   }
   public function getCaseSensitive() {
-    return $this->caseSensitive;
+	return $this->caseSensitive;
   }
   public function setFirstStepRequired( $firstStepRequired) {
-    $this->firstStepRequired = $firstStepRequired;
+	$this->firstStepRequired = $firstStepRequired;
   }
   public function getFirstStepRequired() {
-    return $this->firstStepRequired;
+	return $this->firstStepRequired;
   }
   public function setMatchType( $matchType) {
-    $this->matchType = $matchType;
+	$this->matchType = $matchType;
   }
   public function getMatchType() {
-    return $this->matchType;
+	return $this->matchType;
   }
   public function setSteps(/* array(Google_GoalUrlDestinationDetailsSteps) */ $steps) {
-    $this->assertIsArray($steps, 'Google_GoalUrlDestinationDetailsSteps', __METHOD__);
-    $this->steps = $steps;
+	$this->assertIsArray($steps, 'Google_GoalUrlDestinationDetailsSteps', __METHOD__);
+	$this->steps = $steps;
   }
   public function getSteps() {
-    return $this->steps;
+	return $this->steps;
   }
   public function setUrl( $url) {
-    $this->url = $url;
+	$this->url = $url;
   }
   public function getUrl() {
-    return $this->url;
+	return $this->url;
   }
 }
 
@@ -2911,22 +2911,22 @@ 
   public $number;
   public $url;
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setNumber( $number) {
-    $this->number = $number;
+	$this->number = $number;
   }
   public function getNumber() {
-    return $this->number;
+	return $this->number;
   }
   public function setUrl( $url) {
-    $this->url = $url;
+	$this->url = $url;
   }
   public function getUrl() {
-    return $this->url;
+	return $this->url;
   }
 }
 
@@ -2934,16 +2934,16 @@ 
   public $comparisonType;
   public $comparisonValue;
   public function setComparisonType( $comparisonType) {
-    $this->comparisonType = $comparisonType;
+	$this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
-    return $this->comparisonType;
+	return $this->comparisonType;
   }
   public function setComparisonValue( $comparisonValue) {
-    $this->comparisonValue = $comparisonValue;
+	$this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
-    return $this->comparisonValue;
+	return $this->comparisonValue;
   }
 }
 
@@ -2951,16 +2951,16 @@ 
   public $comparisonType;
   public $comparisonValue;
   public function setComparisonType( $comparisonType) {
-    $this->comparisonType = $comparisonType;
+	$this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
-    return $this->comparisonType;
+	return $this->comparisonType;
   }
   public function setComparisonValue( $comparisonValue) {
-    $this->comparisonValue = $comparisonValue;
+	$this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
-    return $this->comparisonValue;
+	return $this->comparisonValue;
   }
 }
 
@@ -2976,53 +2976,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Goal) */ $items) {
-    $this->assertIsArray($items, 'Google_Goal', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Goal', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -3049,84 +3049,84 @@ 
   public $totalResults;
   public $totalsForAllResults;
   public function setColumnHeaders(/* array(Google_McfDataColumnHeaders) */ $columnHeaders) {
-    $this->assertIsArray($columnHeaders, 'Google_McfDataColumnHeaders', __METHOD__);
-    $this->columnHeaders = $columnHeaders;
+	$this->assertIsArray($columnHeaders, 'Google_McfDataColumnHeaders', __METHOD__);
+	$this->columnHeaders = $columnHeaders;
   }
   public function getColumnHeaders() {
-    return $this->columnHeaders;
+	return $this->columnHeaders;
   }
   public function setContainsSampledData( $containsSampledData) {
-    $this->containsSampledData = $containsSampledData;
+	$this->containsSampledData = $containsSampledData;
   }
   public function getContainsSampledData() {
-    return $this->containsSampledData;
+	return $this->containsSampledData;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setProfileInfo(Google_McfDataProfileInfo $profileInfo) {
-    $this->profileInfo = $profileInfo;
+	$this->profileInfo = $profileInfo;
   }
   public function getProfileInfo() {
-    return $this->profileInfo;
+	return $this->profileInfo;
   }
   public function setQuery(Google_McfDataQuery $query) {
-    $this->query = $query;
+	$this->query = $query;
   }
   public function getQuery() {
-    return $this->query;
+	return $this->query;
   }
   public function setRows(/* array(Google_McfDataRows) */ $rows) {
-    $this->assertIsArray($rows, 'Google_McfDataRows', __METHOD__);
-    $this->rows = $rows;
+	$this->assertIsArray($rows, 'Google_McfDataRows', __METHOD__);
+	$this->rows = $rows;
   }
   public function getRows() {
-    return $this->rows;
+	return $this->rows;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setTotalsForAllResults( $totalsForAllResults) {
-    $this->totalsForAllResults = $totalsForAllResults;
+	$this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
-    return $this->totalsForAllResults;
+	return $this->totalsForAllResults;
   }
 }
 
@@ -3135,22 +3135,22 @@ 
   public $dataType;
   public $name;
   public function setColumnType( $columnType) {
-    $this->columnType = $columnType;
+	$this->columnType = $columnType;
   }
   public function getColumnType() {
-    return $this->columnType;
+	return $this->columnType;
   }
   public function setDataType( $dataType) {
-    $this->dataType = $dataType;
+	$this->dataType = $dataType;
   }
   public function getDataType() {
-    return $this->dataType;
+	return $this->dataType;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
 }
 
@@ -3162,40 +3162,40 @@ 
   public $tableId;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setProfileId( $profileId) {
-    $this->profileId = $profileId;
+	$this->profileId = $profileId;
   }
   public function getProfileId() {
-    return $this->profileId;
+	return $this->profileId;
   }
   public function setProfileName( $profileName) {
-    $this->profileName = $profileName;
+	$this->profileName = $profileName;
   }
   public function getProfileName() {
-    return $this->profileName;
+	return $this->profileName;
   }
   public function setTableId( $tableId) {
-    $this->tableId = $tableId;
+	$this->tableId = $tableId;
   }
   public function getTableId() {
-    return $this->tableId;
+	return $this->tableId;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -3211,66 +3211,66 @@ 
   public $start_date;
   public $start_index;
   public function setDimensions( $dimensions) {
-    $this->dimensions = $dimensions;
+	$this->dimensions = $dimensions;
   }
   public function getDimensions() {
-    return $this->dimensions;
+	return $this->dimensions;
   }
   public function setEnd_date( $end_date) {
-    $this->end_date = $end_date;
+	$this->end_date = $end_date;
   }
   public function getEnd_date() {
-    return $this->end_date;
+	return $this->end_date;
   }
   public function setFilters( $filters) {
-    $this->filters = $filters;
+	$this->filters = $filters;
   }
   public function getFilters() {
-    return $this->filters;
+	return $this->filters;
   }
   public function setIds( $ids) {
-    $this->ids = $ids;
+	$this->ids = $ids;
   }
   public function getIds() {
-    return $this->ids;
+	return $this->ids;
   }
   public function setMax_results( $max_results) {
-    $this->max_results = $max_results;
+	$this->max_results = $max_results;
   }
   public function getMax_results() {
-    return $this->max_results;
+	return $this->max_results;
   }
   public function setMetrics(/* array(Google_string) */ $metrics) {
-    $this->assertIsArray($metrics, 'Google_string', __METHOD__);
-    $this->metrics = $metrics;
+	$this->assertIsArray($metrics, 'Google_string', __METHOD__);
+	$this->metrics = $metrics;
   }
   public function getMetrics() {
-    return $this->metrics;
+	return $this->metrics;
   }
   public function setSegment( $segment) {
-    $this->segment = $segment;
+	$this->segment = $segment;
   }
   public function getSegment() {
-    return $this->segment;
+	return $this->segment;
   }
   public function setSort(/* array(Google_string) */ $sort) {
-    $this->assertIsArray($sort, 'Google_string', __METHOD__);
-    $this->sort = $sort;
+	$this->assertIsArray($sort, 'Google_string', __METHOD__);
+	$this->sort = $sort;
   }
   public function getSort() {
-    return $this->sort;
+	return $this->sort;
   }
   public function setStart_date( $start_date) {
-    $this->start_date = $start_date;
+	$this->start_date = $start_date;
   }
   public function getStart_date() {
-    return $this->start_date;
+	return $this->start_date;
   }
   public function setStart_index( $start_index) {
-    $this->start_index = $start_index;
+	$this->start_index = $start_index;
   }
   public function getStart_index() {
-    return $this->start_index;
+	return $this->start_index;
   }
 }
 
@@ -3280,17 +3280,17 @@ 
   public $conversionPathValue;
   public $primitiveValue;
   public function setConversionPathValue(/* array(Google_McfDataRowsConversionPathValue) */ $conversionPathValue) {
-    $this->assertIsArray($conversionPathValue, 'Google_McfDataRowsConversionPathValue', __METHOD__);
-    $this->conversionPathValue = $conversionPathValue;
+	$this->assertIsArray($conversionPathValue, 'Google_McfDataRowsConversionPathValue', __METHOD__);
+	$this->conversionPathValue = $conversionPathValue;
   }
   public function getConversionPathValue() {
-    return $this->conversionPathValue;
+	return $this->conversionPathValue;
   }
   public function setPrimitiveValue( $primitiveValue) {
-    $this->primitiveValue = $primitiveValue;
+	$this->primitiveValue = $primitiveValue;
   }
   public function getPrimitiveValue() {
-    return $this->primitiveValue;
+	return $this->primitiveValue;
   }
 }
 
@@ -3298,16 +3298,16 @@ 
   public $interactionType;
   public $nodeValue;
   public function setInteractionType( $interactionType) {
-    $this->interactionType = $interactionType;
+	$this->interactionType = $interactionType;
   }
   public function getInteractionType() {
-    return $this->interactionType;
+	return $this->interactionType;
   }
   public function setNodeValue( $nodeValue) {
-    $this->nodeValue = $nodeValue;
+	$this->nodeValue = $nodeValue;
   }
   public function getNodeValue() {
-    return $this->nodeValue;
+	return $this->nodeValue;
   }
 }
 
@@ -3340,130 +3340,130 @@ 
   public $webPropertyId;
   public $websiteUrl;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setChildLink(Google_ProfileChildLink $childLink) {
-    $this->childLink = $childLink;
+	$this->childLink = $childLink;
   }
   public function getChildLink() {
-    return $this->childLink;
+	return $this->childLink;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setCurrency( $currency) {
-    $this->currency = $currency;
+	$this->currency = $currency;
   }
   public function getCurrency() {
-    return $this->currency;
+	return $this->currency;
   }
   public function setDefaultPage( $defaultPage) {
-    $this->defaultPage = $defaultPage;
+	$this->defaultPage = $defaultPage;
   }
   public function getDefaultPage() {
-    return $this->defaultPage;
+	return $this->defaultPage;
   }
   public function setECommerceTracking( $eCommerceTracking) {
-    $this->eCommerceTracking = $eCommerceTracking;
+	$this->eCommerceTracking = $eCommerceTracking;
   }
   public function getECommerceTracking() {
-    return $this->eCommerceTracking;
+	return $this->eCommerceTracking;
   }
   public function setExcludeQueryParameters( $excludeQueryParameters) {
-    $this->excludeQueryParameters = $excludeQueryParameters;
+	$this->excludeQueryParameters = $excludeQueryParameters;
   }
   public function getExcludeQueryParameters() {
-    return $this->excludeQueryParameters;
+	return $this->excludeQueryParameters;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setParentLink(Google_ProfileParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setPermissions(Google_ProfilePermissions $permissions) {
-    $this->permissions = $permissions;
+	$this->permissions = $permissions;
   }
   public function getPermissions() {
-    return $this->permissions;
+	return $this->permissions;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setSiteSearchCategoryParameters( $siteSearchCategoryParameters) {
-    $this->siteSearchCategoryParameters = $siteSearchCategoryParameters;
+	$this->siteSearchCategoryParameters = $siteSearchCategoryParameters;
   }
   public function getSiteSearchCategoryParameters() {
-    return $this->siteSearchCategoryParameters;
+	return $this->siteSearchCategoryParameters;
   }
   public function setSiteSearchQueryParameters( $siteSearchQueryParameters) {
-    $this->siteSearchQueryParameters = $siteSearchQueryParameters;
+	$this->siteSearchQueryParameters = $siteSearchQueryParameters;
   }
   public function getSiteSearchQueryParameters() {
-    return $this->siteSearchQueryParameters;
+	return $this->siteSearchQueryParameters;
   }
   public function setTimezone( $timezone) {
-    $this->timezone = $timezone;
+	$this->timezone = $timezone;
   }
   public function getTimezone() {
-    return $this->timezone;
+	return $this->timezone;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
   public function setWebsiteUrl( $websiteUrl) {
-    $this->websiteUrl = $websiteUrl;
+	$this->websiteUrl = $websiteUrl;
   }
   public function getWebsiteUrl() {
-    return $this->websiteUrl;
+	return $this->websiteUrl;
   }
 }
 
@@ -3471,16 +3471,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -3488,27 +3488,27 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
 class Google_ProfilePermissions extends Google_Model {
   public $effective;
   public function setEffective(/* array(Google_string) */ $effective) {
-    $this->assertIsArray($effective, 'Google_string', __METHOD__);
-    $this->effective = $effective;
+	$this->assertIsArray($effective, 'Google_string', __METHOD__);
+	$this->effective = $effective;
   }
   public function getEffective() {
-    return $this->effective;
+	return $this->effective;
   }
 }
 
@@ -3521,46 +3521,46 @@ 
   public $name;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -3576,53 +3576,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Profile) */ $items) {
-    $this->assertIsArray($items, 'Google_Profile', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Profile', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -3643,60 +3643,60 @@ 
   public $totalResults;
   public $totalsForAllResults;
   public function setColumnHeaders(/* array(Google_RealtimeDataColumnHeaders) */ $columnHeaders) {
-    $this->assertIsArray($columnHeaders, 'Google_RealtimeDataColumnHeaders', __METHOD__);
-    $this->columnHeaders = $columnHeaders;
+	$this->assertIsArray($columnHeaders, 'Google_RealtimeDataColumnHeaders', __METHOD__);
+	$this->columnHeaders = $columnHeaders;
   }
   public function getColumnHeaders() {
-    return $this->columnHeaders;
+	return $this->columnHeaders;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setProfileInfo(Google_RealtimeDataProfileInfo $profileInfo) {
-    $this->profileInfo = $profileInfo;
+	$this->profileInfo = $profileInfo;
   }
   public function getProfileInfo() {
-    return $this->profileInfo;
+	return $this->profileInfo;
   }
   public function setQuery(Google_RealtimeDataQuery $query) {
-    $this->query = $query;
+	$this->query = $query;
   }
   public function getQuery() {
-    return $this->query;
+	return $this->query;
   }
   public function setRows(/* array(Google_string) */ $rows) {
-    $this->assertIsArray($rows, 'Google_string', __METHOD__);
-    $this->rows = $rows;
+	$this->assertIsArray($rows, 'Google_string', __METHOD__);
+	$this->rows = $rows;
   }
   public function getRows() {
-    return $this->rows;
+	return $this->rows;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setTotalsForAllResults( $totalsForAllResults) {
-    $this->totalsForAllResults = $totalsForAllResults;
+	$this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
-    return $this->totalsForAllResults;
+	return $this->totalsForAllResults;
   }
 }
 
@@ -3705,22 +3705,22 @@ 
   public $dataType;
   public $name;
   public function setColumnType( $columnType) {
-    $this->columnType = $columnType;
+	$this->columnType = $columnType;
   }
   public function getColumnType() {
-    return $this->columnType;
+	return $this->columnType;
   }
   public function setDataType( $dataType) {
-    $this->dataType = $dataType;
+	$this->dataType = $dataType;
   }
   public function getDataType() {
-    return $this->dataType;
+	return $this->dataType;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
 }
 
@@ -3732,40 +3732,40 @@ 
   public $tableId;
   public $webPropertyId;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setProfileId( $profileId) {
-    $this->profileId = $profileId;
+	$this->profileId = $profileId;
   }
   public function getProfileId() {
-    return $this->profileId;
+	return $this->profileId;
   }
   public function setProfileName( $profileName) {
-    $this->profileName = $profileName;
+	$this->profileName = $profileName;
   }
   public function getProfileName() {
-    return $this->profileName;
+	return $this->profileName;
   }
   public function setTableId( $tableId) {
-    $this->tableId = $tableId;
+	$this->tableId = $tableId;
   }
   public function getTableId() {
-    return $this->tableId;
+	return $this->tableId;
   }
   public function setWebPropertyId( $webPropertyId) {
-    $this->webPropertyId = $webPropertyId;
+	$this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
-    return $this->webPropertyId;
+	return $this->webPropertyId;
   }
 }
 
@@ -3777,42 +3777,42 @@ 
   public $metrics;
   public $sort;
   public function setDimensions( $dimensions) {
-    $this->dimensions = $dimensions;
+	$this->dimensions = $dimensions;
   }
   public function getDimensions() {
-    return $this->dimensions;
+	return $this->dimensions;
   }
   public function setFilters( $filters) {
-    $this->filters = $filters;
+	$this->filters = $filters;
   }
   public function getFilters() {
-    return $this->filters;
+	return $this->filters;
   }
   public function setIds( $ids) {
-    $this->ids = $ids;
+	$this->ids = $ids;
   }
   public function getIds() {
-    return $this->ids;
+	return $this->ids;
   }
   public function setMax_results( $max_results) {
-    $this->max_results = $max_results;
+	$this->max_results = $max_results;
   }
   public function getMax_results() {
-    return $this->max_results;
+	return $this->max_results;
   }
   public function setMetrics(/* array(Google_string) */ $metrics) {
-    $this->assertIsArray($metrics, 'Google_string', __METHOD__);
-    $this->metrics = $metrics;
+	$this->assertIsArray($metrics, 'Google_string', __METHOD__);
+	$this->metrics = $metrics;
   }
   public function getMetrics() {
-    return $this->metrics;
+	return $this->metrics;
   }
   public function setSort(/* array(Google_string) */ $sort) {
-    $this->assertIsArray($sort, 'Google_string', __METHOD__);
-    $this->sort = $sort;
+	$this->assertIsArray($sort, 'Google_string', __METHOD__);
+	$this->sort = $sort;
   }
   public function getSort() {
-    return $this->sort;
+	return $this->sort;
   }
 }
 
@@ -3826,52 +3826,52 @@ 
   public $selfLink;
   public $updated;
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setDefinition( $definition) {
-    $this->definition = $definition;
+	$this->definition = $definition;
   }
   public function getDefinition() {
-    return $this->definition;
+	return $this->definition;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setSegmentId( $segmentId) {
-    $this->segmentId = $segmentId;
+	$this->segmentId = $segmentId;
   }
   public function getSegmentId() {
-    return $this->segmentId;
+	return $this->segmentId;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
 }
 
@@ -3887,53 +3887,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Segment) */ $items) {
-    $this->assertIsArray($items, 'Google_Segment', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Segment', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -3945,41 +3945,41 @@ 
   public $kind;
   public $status;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setCustomDataSourceId( $customDataSourceId) {
-    $this->customDataSourceId = $customDataSourceId;
+	$this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
-    return $this->customDataSourceId;
+	return $this->customDataSourceId;
   }
   public function setErrors(/* array(Google_string) */ $errors) {
-    $this->assertIsArray($errors, 'Google_string', __METHOD__);
-    $this->errors = $errors;
+	$this->assertIsArray($errors, 'Google_string', __METHOD__);
+	$this->errors = $errors;
   }
   public function getErrors() {
-    return $this->errors;
+	return $this->errors;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setStatus( $status) {
-    $this->status = $status;
+	$this->status = $status;
   }
   public function getStatus() {
-    return $this->status;
+	return $this->status;
   }
 }
 
@@ -3994,47 +3994,47 @@ 
   public $startIndex;
   public $totalResults;
   public function setItems(/* array(Google_Upload) */ $items) {
-    $this->assertIsArray($items, 'Google_Upload', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Upload', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
 }
 
@@ -4043,22 +4043,22 @@ 
   public $id;
   public $kind;
   public function setEmail( $email) {
-    $this->email = $email;
+	$this->email = $email;
   }
   public function getEmail() {
-    return $this->email;
+	return $this->email;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -4070,40 +4070,40 @@ 
   public $kind;
   public $name;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
 }
 
@@ -4119,53 +4119,53 @@ 
   public $totalResults;
   public $username;
   public function setItems(/* array(Google_Webproperty) */ $items) {
-    $this->assertIsArray($items, 'Google_Webproperty', __METHOD__);
-    $this->items = $items;
+	$this->assertIsArray($items, 'Google_Webproperty', __METHOD__);
+	$this->items = $items;
   }
   public function getItems() {
-    return $this->items;
+	return $this->items;
   }
   public function setItemsPerPage( $itemsPerPage) {
-    $this->itemsPerPage = $itemsPerPage;
+	$this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
-    return $this->itemsPerPage;
+	return $this->itemsPerPage;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextLink( $nextLink) {
-    $this->nextLink = $nextLink;
+	$this->nextLink = $nextLink;
   }
   public function getNextLink() {
-    return $this->nextLink;
+	return $this->nextLink;
   }
   public function setPreviousLink( $previousLink) {
-    $this->previousLink = $previousLink;
+	$this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
-    return $this->previousLink;
+	return $this->previousLink;
   }
   public function setStartIndex( $startIndex) {
-    $this->startIndex = $startIndex;
+	$this->startIndex = $startIndex;
   }
   public function getStartIndex() {
-    return $this->startIndex;
+	return $this->startIndex;
   }
   public function setTotalResults( $totalResults) {
-    $this->totalResults = $totalResults;
+	$this->totalResults = $totalResults;
   }
   public function getTotalResults() {
-    return $this->totalResults;
+	return $this->totalResults;
   }
   public function setUsername( $username) {
-    $this->username = $username;
+	$this->username = $username;
   }
   public function getUsername() {
-    return $this->username;
+	return $this->username;
   }
 }
 
@@ -4193,100 +4193,100 @@ 
   public $updated;
   public $websiteUrl;
   public function setAccountId( $accountId) {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId() {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setChildLink(Google_WebpropertyChildLink $childLink) {
-    $this->childLink = $childLink;
+	$this->childLink = $childLink;
   }
   public function getChildLink() {
-    return $this->childLink;
+	return $this->childLink;
   }
   public function setCreated( $created) {
-    $this->created = $created;
+	$this->created = $created;
   }
   public function getCreated() {
-    return $this->created;
+	return $this->created;
   }
   public function setDefaultProfileId( $defaultProfileId) {
-    $this->defaultProfileId = $defaultProfileId;
+	$this->defaultProfileId = $defaultProfileId;
   }
   public function getDefaultProfileId() {
-    return $this->defaultProfileId;
+	return $this->defaultProfileId;
   }
   public function setId( $id) {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId() {
-    return $this->id;
+	return $this->id;
   }
   public function setIndustryVertical( $industryVertical) {
-    $this->industryVertical = $industryVertical;
+	$this->industryVertical = $industryVertical;
   }
   public function getIndustryVertical() {
-    return $this->industryVertical;
+	return $this->industryVertical;
   }
   public function setInternalWebPropertyId( $internalWebPropertyId) {
-    $this->internalWebPropertyId = $internalWebPropertyId;
+	$this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
-    return $this->internalWebPropertyId;
+	return $this->internalWebPropertyId;
   }
   public function setKind( $kind) {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind() {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLevel( $level) {
-    $this->level = $level;
+	$this->level = $level;
   }
   public function getLevel() {
-    return $this->level;
+	return $this->level;
   }
   public function setName( $name) {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName() {
-    return $this->name;
+	return $this->name;
   }
   public function setParentLink(Google_WebpropertyParentLink $parentLink) {
-    $this->parentLink = $parentLink;
+	$this->parentLink = $parentLink;
   }
   public function getParentLink() {
-    return $this->parentLink;
+	return $this->parentLink;
   }
   public function setPermissions(Google_WebpropertyPermissions $permissions) {
-    $this->permissions = $permissions;
+	$this->permissions = $permissions;
   }
   public function getPermissions() {
-    return $this->permissions;
+	return $this->permissions;
   }
   public function setProfileCount( $profileCount) {
-    $this->profileCount = $profileCount;
+	$this->profileCount = $profileCount;
   }
   public function getProfileCount() {
-    return $this->profileCount;
+	return $this->profileCount;
   }
   public function setSelfLink( $selfLink) {
-    $this->selfLink = $selfLink;
+	$this->selfLink = $selfLink;
   }
   public function getSelfLink() {
-    return $this->selfLink;
+	return $this->selfLink;
   }
   public function setUpdated( $updated) {
-    $this->updated = $updated;
+	$this->updated = $updated;
   }
   public function getUpdated() {
-    return $this->updated;
+	return $this->updated;
   }
   public function setWebsiteUrl( $websiteUrl) {
-    $this->websiteUrl = $websiteUrl;
+	$this->websiteUrl = $websiteUrl;
   }
   public function getWebsiteUrl() {
-    return $this->websiteUrl;
+	return $this->websiteUrl;
   }
 }
 
@@ -4294,16 +4294,16 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -4311,26 +4311,26 @@ 
   public $href;
   public $type;
   public function setHref( $href) {
-    $this->href = $href;
+	$this->href = $href;
   }
   public function getHref() {
-    return $this->href;
+	return $this->href;
   }
   public function setType( $type) {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType() {
-    return $this->type;
+	return $this->type;
   }
 }
 
 class Google_WebpropertyPermissions extends Google_Model {
   public $effective;
   public function setEffective(/* array(Google_string) */ $effective) {
-    $this->assertIsArray($effective, 'Google_string', __METHOD__);
-    $this->effective = $effective;
+	$this->assertIsArray($effective, 'Google_string', __METHOD__);
+	$this->effective = $effective;
   }
   public function getEffective() {
-    return $this->effective;
+	return $this->effective;
   }
 }

Spacing +328 added lines, -328 removed lines

@@ -1266,25 +1266,25 @@ 
   public function getChildLink() {
     return $this->childLink;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -1296,13 +1296,13 @@ 
   public function getPermissions() {
     return $this->permissions;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
@@ -1313,13 +1313,13 @@ 
 class Google_AccountChildLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -1343,25 +1343,25 @@ 
   public $id;
   public $kind;
   public $name;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -1387,43 +1387,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -1446,19 +1446,19 @@ 
   public $attributes;
   public $id;
   public $kind;
-  public function setAttributes( $attributes) {
+  public function setAttributes($attributes) {
     $this->attributes = $attributes;
   }
   public function getAttributes() {
     return $this->attributes;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
@@ -1481,7 +1481,7 @@ 
   public function getAttributeNames() {
     return $this->attributeNames;
   }
-  public function setEtag( $etag) {
+  public function setEtag($etag) {
     $this->etag = $etag;
   }
   public function getEtag() {
@@ -1494,13 +1494,13 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
@@ -1526,7 +1526,7 @@ 
   public $type;
   public $updated;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
@@ -1538,31 +1538,31 @@ 
   public function getChildLink() {
     return $this->childLink;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setDescription( $description) {
+  public function setDescription($description) {
     $this->description = $description;
   }
   public function getDescription() {
     return $this->description;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -1581,25 +1581,25 @@ 
   public function getProfilesLinked() {
     return $this->profilesLinked;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
     return $this->type;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
     return $this->updated;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -1610,13 +1610,13 @@ 
 class Google_CustomDataSourceChildLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -1627,13 +1627,13 @@ 
 class Google_CustomDataSourceParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -1659,43 +1659,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -1719,43 +1719,43 @@ 
   public $recentChanges;
   public $selfLink;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setAppendCount( $appendCount) {
+  public function setAppendCount($appendCount) {
     $this->appendCount = $appendCount;
   }
   public function getAppendCount() {
     return $this->appendCount;
   }
-  public function setCreatedTime( $createdTime) {
+  public function setCreatedTime($createdTime) {
     $this->createdTime = $createdTime;
   }
   public function getCreatedTime() {
     return $this->createdTime;
   }
-  public function setCustomDataSourceId( $customDataSourceId) {
+  public function setCustomDataSourceId($customDataSourceId) {
     $this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
     return $this->customDataSourceId;
   }
-  public function setDate( $date) {
+  public function setDate($date) {
     $this->date = $date;
   }
   public function getDate() {
     return $this->date;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setModifiedTime( $modifiedTime) {
+  public function setModifiedTime($modifiedTime) {
     $this->modifiedTime = $modifiedTime;
   }
   public function getModifiedTime() {
@@ -1774,13 +1774,13 @@ 
   public function getRecentChanges() {
     return $this->recentChanges;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -1796,43 +1796,43 @@ 
   public $kind;
   public $nextAppendLink;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setAppendNumber( $appendNumber) {
+  public function setAppendNumber($appendNumber) {
     $this->appendNumber = $appendNumber;
   }
   public function getAppendNumber() {
     return $this->appendNumber;
   }
-  public function setCustomDataSourceId( $customDataSourceId) {
+  public function setCustomDataSourceId($customDataSourceId) {
     $this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
     return $this->customDataSourceId;
   }
-  public function setDate( $date) {
+  public function setDate($date) {
     $this->date = $date;
   }
   public function getDate() {
     return $this->date;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextAppendLink( $nextAppendLink) {
+  public function setNextAppendLink($nextAppendLink) {
     $this->nextAppendLink = $nextAppendLink;
   }
   public function getNextAppendLink() {
     return $this->nextAppendLink;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -1843,13 +1843,13 @@ 
 class Google_DailyUploadParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -1860,13 +1860,13 @@ 
 class Google_DailyUploadRecentChanges extends Google_Model {
   public $change;
   public $time;
-  public function setChange( $change) {
+  public function setChange($change) {
     $this->change = $change;
   }
   public function getChange() {
     return $this->change;
   }
-  public function setTime( $time) {
+  public function setTime($time) {
     $this->time = $time;
   }
   public function getTime() {
@@ -1892,43 +1892,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -1955,13 +1955,13 @@ 
   public function getEntity() {
     return $this->entity;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
@@ -1973,7 +1973,7 @@ 
   public function getPermissions() {
     return $this->permissions;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
@@ -2053,37 +2053,37 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
@@ -2123,73 +2123,73 @@ 
   public $webPropertyId;
   public $winnerConfidenceLevel;
   public $winnerFound;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setDescription( $description) {
+  public function setDescription($description) {
     $this->description = $description;
   }
   public function getDescription() {
     return $this->description;
   }
-  public function setEditableInGaUi( $editableInGaUi) {
+  public function setEditableInGaUi($editableInGaUi) {
     $this->editableInGaUi = $editableInGaUi;
   }
   public function getEditableInGaUi() {
     return $this->editableInGaUi;
   }
-  public function setEndTime( $endTime) {
+  public function setEndTime($endTime) {
     $this->endTime = $endTime;
   }
   public function getEndTime() {
     return $this->endTime;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setMinimumExperimentLengthInDays( $minimumExperimentLengthInDays) {
+  public function setMinimumExperimentLengthInDays($minimumExperimentLengthInDays) {
     $this->minimumExperimentLengthInDays = $minimumExperimentLengthInDays;
   }
   public function getMinimumExperimentLengthInDays() {
     return $this->minimumExperimentLengthInDays;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
     return $this->name;
   }
-  public function setObjectiveMetric( $objectiveMetric) {
+  public function setObjectiveMetric($objectiveMetric) {
     $this->objectiveMetric = $objectiveMetric;
   }
   public function getObjectiveMetric() {
     return $this->objectiveMetric;
   }
-  public function setOptimizationType( $optimizationType) {
+  public function setOptimizationType($optimizationType) {
     $this->optimizationType = $optimizationType;
   }
   public function getOptimizationType() {
@@ -2201,61 +2201,61 @@ 
   public function getParentLink() {
     return $this->parentLink;
   }
-  public function setProfileId( $profileId) {
+  public function setProfileId($profileId) {
     $this->profileId = $profileId;
   }
   public function getProfileId() {
     return $this->profileId;
   }
-  public function setReasonExperimentEnded( $reasonExperimentEnded) {
+  public function setReasonExperimentEnded($reasonExperimentEnded) {
     $this->reasonExperimentEnded = $reasonExperimentEnded;
   }
   public function getReasonExperimentEnded() {
     return $this->reasonExperimentEnded;
   }
-  public function setRewriteVariationUrlsAsOriginal( $rewriteVariationUrlsAsOriginal) {
+  public function setRewriteVariationUrlsAsOriginal($rewriteVariationUrlsAsOriginal) {
     $this->rewriteVariationUrlsAsOriginal = $rewriteVariationUrlsAsOriginal;
   }
   public function getRewriteVariationUrlsAsOriginal() {
     return $this->rewriteVariationUrlsAsOriginal;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setServingFramework( $servingFramework) {
+  public function setServingFramework($servingFramework) {
     $this->servingFramework = $servingFramework;
   }
   public function getServingFramework() {
     return $this->servingFramework;
   }
-  public function setSnippet( $snippet) {
+  public function setSnippet($snippet) {
     $this->snippet = $snippet;
   }
   public function getSnippet() {
     return $this->snippet;
   }
-  public function setStartTime( $startTime) {
+  public function setStartTime($startTime) {
     $this->startTime = $startTime;
   }
   public function getStartTime() {
     return $this->startTime;
   }
-  public function setStatus( $status) {
+  public function setStatus($status) {
     $this->status = $status;
   }
   public function getStatus() {
     return $this->status;
   }
-  public function setTrafficCoverage( $trafficCoverage) {
+  public function setTrafficCoverage($trafficCoverage) {
     $this->trafficCoverage = $trafficCoverage;
   }
   public function getTrafficCoverage() {
     return $this->trafficCoverage;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
@@ -2268,19 +2268,19 @@ 
   public function getVariations() {
     return $this->variations;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
     return $this->webPropertyId;
   }
-  public function setWinnerConfidenceLevel( $winnerConfidenceLevel) {
+  public function setWinnerConfidenceLevel($winnerConfidenceLevel) {
     $this->winnerConfidenceLevel = $winnerConfidenceLevel;
   }
   public function getWinnerConfidenceLevel() {
     return $this->winnerConfidenceLevel;
   }
-  public function setWinnerFound( $winnerFound) {
+  public function setWinnerFound($winnerFound) {
     $this->winnerFound = $winnerFound;
   }
   public function getWinnerFound() {
@@ -2291,13 +2291,13 @@ 
 class Google_ExperimentParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -2311,31 +2311,31 @@ 
   public $url;
   public $weight;
   public $won;
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
     return $this->name;
   }
-  public function setStatus( $status) {
+  public function setStatus($status) {
     $this->status = $status;
   }
   public function getStatus() {
     return $this->status;
   }
-  public function setUrl( $url) {
+  public function setUrl($url) {
     $this->url = $url;
   }
   public function getUrl() {
     return $this->url;
   }
-  public function setWeight( $weight) {
+  public function setWeight($weight) {
     $this->weight = $weight;
   }
   public function getWeight() {
     return $this->weight;
   }
-  public function setWon( $won) {
+  public function setWon($won) {
     $this->won = $won;
   }
   public function getWon() {
@@ -2361,43 +2361,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -2432,37 +2432,37 @@ 
   public function getColumnHeaders() {
     return $this->columnHeaders;
   }
-  public function setContainsSampledData( $containsSampledData) {
+  public function setContainsSampledData($containsSampledData) {
     $this->containsSampledData = $containsSampledData;
   }
   public function getContainsSampledData() {
     return $this->containsSampledData;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
@@ -2487,19 +2487,19 @@ 
   public function getRows() {
     return $this->rows;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setTotalsForAllResults( $totalsForAllResults) {
+  public function setTotalsForAllResults($totalsForAllResults) {
     $this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
@@ -2511,19 +2511,19 @@ 
   public $columnType;
   public $dataType;
   public $name;
-  public function setColumnType( $columnType) {
+  public function setColumnType($columnType) {
     $this->columnType = $columnType;
   }
   public function getColumnType() {
     return $this->columnType;
   }
-  public function setDataType( $dataType) {
+  public function setDataType($dataType) {
     $this->dataType = $dataType;
   }
   public function getDataType() {
     return $this->dataType;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -2538,37 +2538,37 @@ 
   public $profileName;
   public $tableId;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setProfileId( $profileId) {
+  public function setProfileId($profileId) {
     $this->profileId = $profileId;
   }
   public function getProfileId() {
     return $this->profileId;
   }
-  public function setProfileName( $profileName) {
+  public function setProfileName($profileName) {
     $this->profileName = $profileName;
   }
   public function getProfileName() {
     return $this->profileName;
   }
-  public function setTableId( $tableId) {
+  public function setTableId($tableId) {
     $this->tableId = $tableId;
   }
   public function getTableId() {
     return $this->tableId;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -2587,31 +2587,31 @@ 
   public $sort;
   public $start_date;
   public $start_index;
-  public function setDimensions( $dimensions) {
+  public function setDimensions($dimensions) {
     $this->dimensions = $dimensions;
   }
   public function getDimensions() {
     return $this->dimensions;
   }
-  public function setEnd_date( $end_date) {
+  public function setEnd_date($end_date) {
     $this->end_date = $end_date;
   }
   public function getEnd_date() {
     return $this->end_date;
   }
-  public function setFilters( $filters) {
+  public function setFilters($filters) {
     $this->filters = $filters;
   }
   public function getFilters() {
     return $this->filters;
   }
-  public function setIds( $ids) {
+  public function setIds($ids) {
     $this->ids = $ids;
   }
   public function getIds() {
     return $this->ids;
   }
-  public function setMax_results( $max_results) {
+  public function setMax_results($max_results) {
     $this->max_results = $max_results;
   }
   public function getMax_results() {
@@ -2624,7 +2624,7 @@ 
   public function getMetrics() {
     return $this->metrics;
   }
-  public function setSegment( $segment) {
+  public function setSegment($segment) {
     $this->segment = $segment;
   }
   public function getSegment() {
@@ -2637,13 +2637,13 @@ 
   public function getSort() {
     return $this->sort;
   }
-  public function setStart_date( $start_date) {
+  public function setStart_date($start_date) {
     $this->start_date = $start_date;
   }
   public function getStart_date() {
     return $this->start_date;
   }
-  public function setStart_index( $start_index) {
+  public function setStart_index($start_index) {
     $this->start_index = $start_index;
   }
   public function getStart_index() {
@@ -2680,19 +2680,19 @@ 
   protected $__visitTimeOnSiteDetailsDataType = '';
   public $visitTimeOnSiteDetails;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setActive( $active) {
+  public function setActive($active) {
     $this->active = $active;
   }
   public function getActive() {
     return $this->active;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
@@ -2704,25 +2704,25 @@ 
   public function getEventDetails() {
     return $this->eventDetails;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -2734,25 +2734,25 @@ 
   public function getParentLink() {
     return $this->parentLink;
   }
-  public function setProfileId( $profileId) {
+  public function setProfileId($profileId) {
     $this->profileId = $profileId;
   }
   public function getProfileId() {
     return $this->profileId;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
     return $this->type;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
@@ -2764,7 +2764,7 @@ 
   public function getUrlDestinationDetails() {
     return $this->urlDestinationDetails;
   }
-  public function setValue( $value) {
+  public function setValue($value) {
     $this->value = $value;
   }
   public function getValue() {
@@ -2782,7 +2782,7 @@ 
   public function getVisitTimeOnSiteDetails() {
     return $this->visitTimeOnSiteDetails;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -2802,7 +2802,7 @@ 
   public function getEventConditions() {
     return $this->eventConditions;
   }
-  public function setUseEventValue( $useEventValue) {
+  public function setUseEventValue($useEventValue) {
     $this->useEventValue = $useEventValue;
   }
   public function getUseEventValue() {
@@ -2816,31 +2816,31 @@ 
   public $expression;
   public $matchType;
   public $type;
-  public function setComparisonType( $comparisonType) {
+  public function setComparisonType($comparisonType) {
     $this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
     return $this->comparisonType;
   }
-  public function setComparisonValue( $comparisonValue) {
+  public function setComparisonValue($comparisonValue) {
     $this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
     return $this->comparisonValue;
   }
-  public function setExpression( $expression) {
+  public function setExpression($expression) {
     $this->expression = $expression;
   }
   public function getExpression() {
     return $this->expression;
   }
-  public function setMatchType( $matchType) {
+  public function setMatchType($matchType) {
     $this->matchType = $matchType;
   }
   public function getMatchType() {
     return $this->matchType;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -2851,13 +2851,13 @@ 
 class Google_GoalParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -2873,19 +2873,19 @@ 
   protected $__stepsDataType = 'array';
   public $steps;
   public $url;
-  public function setCaseSensitive( $caseSensitive) {
+  public function setCaseSensitive($caseSensitive) {
     $this->caseSensitive = $caseSensitive;
   }
   public function getCaseSensitive() {
     return $this->caseSensitive;
   }
-  public function setFirstStepRequired( $firstStepRequired) {
+  public function setFirstStepRequired($firstStepRequired) {
     $this->firstStepRequired = $firstStepRequired;
   }
   public function getFirstStepRequired() {
     return $this->firstStepRequired;
   }
-  public function setMatchType( $matchType) {
+  public function setMatchType($matchType) {
     $this->matchType = $matchType;
   }
   public function getMatchType() {
@@ -2898,7 +2898,7 @@ 
   public function getSteps() {
     return $this->steps;
   }
-  public function setUrl( $url) {
+  public function setUrl($url) {
     $this->url = $url;
   }
   public function getUrl() {
@@ -2910,19 +2910,19 @@ 
   public $name;
   public $number;
   public $url;
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
     return $this->name;
   }
-  public function setNumber( $number) {
+  public function setNumber($number) {
     $this->number = $number;
   }
   public function getNumber() {
     return $this->number;
   }
-  public function setUrl( $url) {
+  public function setUrl($url) {
     $this->url = $url;
   }
   public function getUrl() {
@@ -2933,13 +2933,13 @@ 
 class Google_GoalVisitNumPagesDetails extends Google_Model {
   public $comparisonType;
   public $comparisonValue;
-  public function setComparisonType( $comparisonType) {
+  public function setComparisonType($comparisonType) {
     $this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
     return $this->comparisonType;
   }
-  public function setComparisonValue( $comparisonValue) {
+  public function setComparisonValue($comparisonValue) {
     $this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
@@ -2950,13 +2950,13 @@ 
 class Google_GoalVisitTimeOnSiteDetails extends Google_Model {
   public $comparisonType;
   public $comparisonValue;
-  public function setComparisonType( $comparisonType) {
+  public function setComparisonType($comparisonType) {
     $this->comparisonType = $comparisonType;
   }
   public function getComparisonType() {
     return $this->comparisonType;
   }
-  public function setComparisonValue( $comparisonValue) {
+  public function setComparisonValue($comparisonValue) {
     $this->comparisonValue = $comparisonValue;
   }
   public function getComparisonValue() {
@@ -2982,43 +2982,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -3055,37 +3055,37 @@ 
   public function getColumnHeaders() {
     return $this->columnHeaders;
   }
-  public function setContainsSampledData( $containsSampledData) {
+  public function setContainsSampledData($containsSampledData) {
     $this->containsSampledData = $containsSampledData;
   }
   public function getContainsSampledData() {
     return $this->containsSampledData;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
@@ -3110,19 +3110,19 @@ 
   public function getRows() {
     return $this->rows;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setTotalsForAllResults( $totalsForAllResults) {
+  public function setTotalsForAllResults($totalsForAllResults) {
     $this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
@@ -3134,19 +3134,19 @@ 
   public $columnType;
   public $dataType;
   public $name;
-  public function setColumnType( $columnType) {
+  public function setColumnType($columnType) {
     $this->columnType = $columnType;
   }
   public function getColumnType() {
     return $this->columnType;
   }
-  public function setDataType( $dataType) {
+  public function setDataType($dataType) {
     $this->dataType = $dataType;
   }
   public function getDataType() {
     return $this->dataType;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -3161,37 +3161,37 @@ 
   public $profileName;
   public $tableId;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setProfileId( $profileId) {
+  public function setProfileId($profileId) {
     $this->profileId = $profileId;
   }
   public function getProfileId() {
     return $this->profileId;
   }
-  public function setProfileName( $profileName) {
+  public function setProfileName($profileName) {
     $this->profileName = $profileName;
   }
   public function getProfileName() {
     return $this->profileName;
   }
-  public function setTableId( $tableId) {
+  public function setTableId($tableId) {
     $this->tableId = $tableId;
   }
   public function getTableId() {
     return $this->tableId;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -3210,31 +3210,31 @@ 
   public $sort;
   public $start_date;
   public $start_index;
-  public function setDimensions( $dimensions) {
+  public function setDimensions($dimensions) {
     $this->dimensions = $dimensions;
   }
   public function getDimensions() {
     return $this->dimensions;
   }
-  public function setEnd_date( $end_date) {
+  public function setEnd_date($end_date) {
     $this->end_date = $end_date;
   }
   public function getEnd_date() {
     return $this->end_date;
   }
-  public function setFilters( $filters) {
+  public function setFilters($filters) {
     $this->filters = $filters;
   }
   public function getFilters() {
     return $this->filters;
   }
-  public function setIds( $ids) {
+  public function setIds($ids) {
     $this->ids = $ids;
   }
   public function getIds() {
     return $this->ids;
   }
-  public function setMax_results( $max_results) {
+  public function setMax_results($max_results) {
     $this->max_results = $max_results;
   }
   public function getMax_results() {
@@ -3247,7 +3247,7 @@ 
   public function getMetrics() {
     return $this->metrics;
   }
-  public function setSegment( $segment) {
+  public function setSegment($segment) {
     $this->segment = $segment;
   }
   public function getSegment() {
@@ -3260,13 +3260,13 @@ 
   public function getSort() {
     return $this->sort;
   }
-  public function setStart_date( $start_date) {
+  public function setStart_date($start_date) {
     $this->start_date = $start_date;
   }
   public function getStart_date() {
     return $this->start_date;
   }
-  public function setStart_index( $start_index) {
+  public function setStart_index($start_index) {
     $this->start_index = $start_index;
   }
   public function getStart_index() {
@@ -3286,7 +3286,7 @@ 
   public function getConversionPathValue() {
     return $this->conversionPathValue;
   }
-  public function setPrimitiveValue( $primitiveValue) {
+  public function setPrimitiveValue($primitiveValue) {
     $this->primitiveValue = $primitiveValue;
   }
   public function getPrimitiveValue() {
@@ -3297,13 +3297,13 @@ 
 class Google_McfDataRowsConversionPathValue extends Google_Model {
   public $interactionType;
   public $nodeValue;
-  public function setInteractionType( $interactionType) {
+  public function setInteractionType($interactionType) {
     $this->interactionType = $interactionType;
   }
   public function getInteractionType() {
     return $this->interactionType;
   }
-  public function setNodeValue( $nodeValue) {
+  public function setNodeValue($nodeValue) {
     $this->nodeValue = $nodeValue;
   }
   public function getNodeValue() {
@@ -3339,7 +3339,7 @@ 
   public $updated;
   public $webPropertyId;
   public $websiteUrl;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
@@ -3351,55 +3351,55 @@ 
   public function getChildLink() {
     return $this->childLink;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setCurrency( $currency) {
+  public function setCurrency($currency) {
     $this->currency = $currency;
   }
   public function getCurrency() {
     return $this->currency;
   }
-  public function setDefaultPage( $defaultPage) {
+  public function setDefaultPage($defaultPage) {
     $this->defaultPage = $defaultPage;
   }
   public function getDefaultPage() {
     return $this->defaultPage;
   }
-  public function setECommerceTracking( $eCommerceTracking) {
+  public function setECommerceTracking($eCommerceTracking) {
     $this->eCommerceTracking = $eCommerceTracking;
   }
   public function getECommerceTracking() {
     return $this->eCommerceTracking;
   }
-  public function setExcludeQueryParameters( $excludeQueryParameters) {
+  public function setExcludeQueryParameters($excludeQueryParameters) {
     $this->excludeQueryParameters = $excludeQueryParameters;
   }
   public function getExcludeQueryParameters() {
     return $this->excludeQueryParameters;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -3417,49 +3417,49 @@ 
   public function getPermissions() {
     return $this->permissions;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setSiteSearchCategoryParameters( $siteSearchCategoryParameters) {
+  public function setSiteSearchCategoryParameters($siteSearchCategoryParameters) {
     $this->siteSearchCategoryParameters = $siteSearchCategoryParameters;
   }
   public function getSiteSearchCategoryParameters() {
     return $this->siteSearchCategoryParameters;
   }
-  public function setSiteSearchQueryParameters( $siteSearchQueryParameters) {
+  public function setSiteSearchQueryParameters($siteSearchQueryParameters) {
     $this->siteSearchQueryParameters = $siteSearchQueryParameters;
   }
   public function getSiteSearchQueryParameters() {
     return $this->siteSearchQueryParameters;
   }
-  public function setTimezone( $timezone) {
+  public function setTimezone($timezone) {
     $this->timezone = $timezone;
   }
   public function getTimezone() {
     return $this->timezone;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
     return $this->type;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
     return $this->updated;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
     return $this->webPropertyId;
   }
-  public function setWebsiteUrl( $websiteUrl) {
+  public function setWebsiteUrl($websiteUrl) {
     $this->websiteUrl = $websiteUrl;
   }
   public function getWebsiteUrl() {
@@ -3470,13 +3470,13 @@ 
 class Google_ProfileChildLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -3487,13 +3487,13 @@ 
 class Google_ProfileParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -3520,43 +3520,43 @@ 
   public $kind;
   public $name;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
     return $this->name;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -3582,43 +3582,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -3649,13 +3649,13 @@ 
   public function getColumnHeaders() {
     return $this->columnHeaders;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
@@ -3680,19 +3680,19 @@ 
   public function getRows() {
     return $this->rows;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setTotalsForAllResults( $totalsForAllResults) {
+  public function setTotalsForAllResults($totalsForAllResults) {
     $this->totalsForAllResults = $totalsForAllResults;
   }
   public function getTotalsForAllResults() {
@@ -3704,19 +3704,19 @@ 
   public $columnType;
   public $dataType;
   public $name;
-  public function setColumnType( $columnType) {
+  public function setColumnType($columnType) {
     $this->columnType = $columnType;
   }
   public function getColumnType() {
     return $this->columnType;
   }
-  public function setDataType( $dataType) {
+  public function setDataType($dataType) {
     $this->dataType = $dataType;
   }
   public function getDataType() {
     return $this->dataType;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -3731,37 +3731,37 @@ 
   public $profileName;
   public $tableId;
   public $webPropertyId;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setProfileId( $profileId) {
+  public function setProfileId($profileId) {
     $this->profileId = $profileId;
   }
   public function getProfileId() {
     return $this->profileId;
   }
-  public function setProfileName( $profileName) {
+  public function setProfileName($profileName) {
     $this->profileName = $profileName;
   }
   public function getProfileName() {
     return $this->profileName;
   }
-  public function setTableId( $tableId) {
+  public function setTableId($tableId) {
     $this->tableId = $tableId;
   }
   public function getTableId() {
     return $this->tableId;
   }
-  public function setWebPropertyId( $webPropertyId) {
+  public function setWebPropertyId($webPropertyId) {
     $this->webPropertyId = $webPropertyId;
   }
   public function getWebPropertyId() {
@@ -3776,25 +3776,25 @@ 
   public $max_results;
   public $metrics;
   public $sort;
-  public function setDimensions( $dimensions) {
+  public function setDimensions($dimensions) {
     $this->dimensions = $dimensions;
   }
   public function getDimensions() {
     return $this->dimensions;
   }
-  public function setFilters( $filters) {
+  public function setFilters($filters) {
     $this->filters = $filters;
   }
   public function getFilters() {
     return $this->filters;
   }
-  public function setIds( $ids) {
+  public function setIds($ids) {
     $this->ids = $ids;
   }
   public function getIds() {
     return $this->ids;
   }
-  public function setMax_results( $max_results) {
+  public function setMax_results($max_results) {
     $this->max_results = $max_results;
   }
   public function getMax_results() {
@@ -3825,49 +3825,49 @@ 
   public $segmentId;
   public $selfLink;
   public $updated;
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setDefinition( $definition) {
+  public function setDefinition($definition) {
     $this->definition = $definition;
   }
   public function getDefinition() {
     return $this->definition;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
     return $this->name;
   }
-  public function setSegmentId( $segmentId) {
+  public function setSegmentId($segmentId) {
     $this->segmentId = $segmentId;
   }
   public function getSegmentId() {
     return $this->segmentId;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
@@ -3893,43 +3893,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -3944,13 +3944,13 @@ 
   public $id;
   public $kind;
   public $status;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setCustomDataSourceId( $customDataSourceId) {
+  public function setCustomDataSourceId($customDataSourceId) {
     $this->customDataSourceId = $customDataSourceId;
   }
   public function getCustomDataSourceId() {
@@ -3963,19 +3963,19 @@ 
   public function getErrors() {
     return $this->errors;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setStatus( $status) {
+  public function setStatus($status) {
     $this->status = $status;
   }
   public function getStatus() {
@@ -4000,37 +4000,37 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
@@ -4042,19 +4042,19 @@ 
   public $email;
   public $id;
   public $kind;
-  public function setEmail( $email) {
+  public function setEmail($email) {
     $this->email = $email;
   }
   public function getEmail() {
     return $this->email;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
@@ -4069,37 +4069,37 @@ 
   public $internalWebPropertyId;
   public $kind;
   public $name;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
     return $this->accountId;
   }
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -4125,43 +4125,43 @@ 
   public function getItems() {
     return $this->items;
   }
-  public function setItemsPerPage( $itemsPerPage) {
+  public function setItemsPerPage($itemsPerPage) {
     $this->itemsPerPage = $itemsPerPage;
   }
   public function getItemsPerPage() {
     return $this->itemsPerPage;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setNextLink( $nextLink) {
+  public function setNextLink($nextLink) {
     $this->nextLink = $nextLink;
   }
   public function getNextLink() {
     return $this->nextLink;
   }
-  public function setPreviousLink( $previousLink) {
+  public function setPreviousLink($previousLink) {
     $this->previousLink = $previousLink;
   }
   public function getPreviousLink() {
     return $this->previousLink;
   }
-  public function setStartIndex( $startIndex) {
+  public function setStartIndex($startIndex) {
     $this->startIndex = $startIndex;
   }
   public function getStartIndex() {
     return $this->startIndex;
   }
-  public function setTotalResults( $totalResults) {
+  public function setTotalResults($totalResults) {
     $this->totalResults = $totalResults;
   }
   public function getTotalResults() {
     return $this->totalResults;
   }
-  public function setUsername( $username) {
+  public function setUsername($username) {
     $this->username = $username;
   }
   public function getUsername() {
@@ -4192,7 +4192,7 @@ 
   public $selfLink;
   public $updated;
   public $websiteUrl;
-  public function setAccountId( $accountId) {
+  public function setAccountId($accountId) {
     $this->accountId = $accountId;
   }
   public function getAccountId() {
@@ -4204,49 +4204,49 @@ 
   public function getChildLink() {
     return $this->childLink;
   }
-  public function setCreated( $created) {
+  public function setCreated($created) {
     $this->created = $created;
   }
   public function getCreated() {
     return $this->created;
   }
-  public function setDefaultProfileId( $defaultProfileId) {
+  public function setDefaultProfileId($defaultProfileId) {
     $this->defaultProfileId = $defaultProfileId;
   }
   public function getDefaultProfileId() {
     return $this->defaultProfileId;
   }
-  public function setId( $id) {
+  public function setId($id) {
     $this->id = $id;
   }
   public function getId() {
     return $this->id;
   }
-  public function setIndustryVertical( $industryVertical) {
+  public function setIndustryVertical($industryVertical) {
     $this->industryVertical = $industryVertical;
   }
   public function getIndustryVertical() {
     return $this->industryVertical;
   }
-  public function setInternalWebPropertyId( $internalWebPropertyId) {
+  public function setInternalWebPropertyId($internalWebPropertyId) {
     $this->internalWebPropertyId = $internalWebPropertyId;
   }
   public function getInternalWebPropertyId() {
     return $this->internalWebPropertyId;
   }
-  public function setKind( $kind) {
+  public function setKind($kind) {
     $this->kind = $kind;
   }
   public function getKind() {
     return $this->kind;
   }
-  public function setLevel( $level) {
+  public function setLevel($level) {
     $this->level = $level;
   }
   public function getLevel() {
     return $this->level;
   }
-  public function setName( $name) {
+  public function setName($name) {
     $this->name = $name;
   }
   public function getName() {
@@ -4264,25 +4264,25 @@ 
   public function getPermissions() {
     return $this->permissions;
   }
-  public function setProfileCount( $profileCount) {
+  public function setProfileCount($profileCount) {
     $this->profileCount = $profileCount;
   }
   public function getProfileCount() {
     return $this->profileCount;
   }
-  public function setSelfLink( $selfLink) {
+  public function setSelfLink($selfLink) {
     $this->selfLink = $selfLink;
   }
   public function getSelfLink() {
     return $this->selfLink;
   }
-  public function setUpdated( $updated) {
+  public function setUpdated($updated) {
     $this->updated = $updated;
   }
   public function getUpdated() {
     return $this->updated;
   }
-  public function setWebsiteUrl( $websiteUrl) {
+  public function setWebsiteUrl($websiteUrl) {
     $this->websiteUrl = $websiteUrl;
   }
   public function getWebsiteUrl() {
@@ -4293,13 +4293,13 @@ 
 class Google_WebpropertyChildLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {
@@ -4310,13 +4310,13 @@ 
 class Google_WebpropertyParentLink extends Google_Model {
   public $href;
   public $type;
-  public function setHref( $href) {
+  public function setHref($href) {
     $this->href = $href;
   }
   public function getHref() {
     return $this->href;
   }
-  public function setType( $type) {
+  public function setType($type) {
     $this->type = $type;
   }
   public function getType() {