GeoDirectory / geodirectory

geodirectory-admin/google-api-php-client/src/auth/Google_PemVerifier.php

Doc Comments +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
    * Verifies the signature on data.
    *
    * Returns true if the signature is valid, false otherwise.
-   * @param $data
-   * @param $signature
+   * @param string $data
+   * @param string $signature
    * @throws Google_AuthException
    * @return bool
    */

Indentation +15 added lines, -15 removed lines

@@ -32,19 +32,19 @@ 
    * @throws Google_Exception
    */
   function __construct($pem) {
-    if (!function_exists('openssl_x509_read')) {
-      throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
-    }
-    $this->publicKey = openssl_x509_read($pem);
-    if (!$this->publicKey) {
-      throw new Google_AuthException("Unable to parse PEM: $pem");
-    }
+	if (!function_exists('openssl_x509_read')) {
+	  throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
+	}
+	$this->publicKey = openssl_x509_read($pem);
+	if (!$this->publicKey) {
+	  throw new Google_AuthException("Unable to parse PEM: $pem");
+	}
   }
 
   function __destruct() {
-    if ($this->publicKey) {
-      openssl_x509_free($this->publicKey);
-    }
+	if ($this->publicKey) {
+	  openssl_x509_free($this->publicKey);
+	}
   }
 
   /**
@@ -57,10 +57,10 @@ 
    * @return bool
    */
   function verify($data, $signature) {
-    $status = openssl_verify($data, $signature, $this->publicKey, "sha256");
-    if ($status === -1) {
-      throw new Google_AuthException('Signature verification error: ' . openssl_error_string());
-    }
-    return $status === 1;
+	$status = openssl_verify($data, $signature, $this->publicKey, "sha256");
+	if ($status === -1) {
+	  throw new Google_AuthException('Signature verification error: ' . openssl_error_string());
+	}
+	return $status === 1;
   }
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
   function verify($data, $signature) {
     $status = openssl_verify($data, $signature, $this->publicKey, "sha256");
     if ($status === -1) {
-      throw new Google_AuthException('Signature verification error: ' . openssl_error_string());
+      throw new Google_AuthException('Signature verification error: '.openssl_error_string());
     }
     return $status === 1;
   }

geodirectory-admin/google-api-php-client/src/cache/Google_FileCache.php

Doc Comments +9 added lines

@@ -37,6 +37,9 @@ 
     return file_exists($storageFile . '.lock');
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function createLock($storageFile) {
     $storageDir = dirname($storageFile);
     if (! is_dir($storageDir)) {
@@ -57,6 +60,9 @@ 
     @unlink($storageFile . '.lock');
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function waitForLock($storageFile) {
     // 20 x 250 = 5 seconds
     $tries = 20;
@@ -81,6 +87,9 @@ 
     return $this->path . '/' . substr($hash, 0, 2);
   }
 
+  /**
+   * @param string $hash
+   */
   private function getCacheFile($hash) {
     return $this->getCacheDir($hash) . '/' . $hash;
   }

Indentation +78 added lines, -78 removed lines

@@ -28,110 +28,110 @@
   private $path;
 
   public function __construct() {
-    global $apiConfig;
-    $this->path = $apiConfig['ioFileCache_directory'];
+	global $apiConfig;
+	$this->path = $apiConfig['ioFileCache_directory'];
   }
 
   private function isLocked($storageFile) {
-    // our lock file convention is simple: /the/file/path.lock
-    return file_exists($storageFile . '.lock');
+	// our lock file convention is simple: /the/file/path.lock
+	return file_exists($storageFile . '.lock');
   }
 
   private function createLock($storageFile) {
-    $storageDir = dirname($storageFile);
-    if (! is_dir($storageDir)) {
-      // @codeCoverageIgnoreStart
-      if (! @mkdir($storageDir, 0755, true)) {
-        // make sure the failure isn't because of a concurrency issue
-        if (! is_dir($storageDir)) {
-          throw new Google_CacheException("Could not create storage directory: $storageDir");
-        }
-      }
-      // @codeCoverageIgnoreEnd
-    }
-    @touch($storageFile . '.lock');
+	$storageDir = dirname($storageFile);
+	if (! is_dir($storageDir)) {
+	  // @codeCoverageIgnoreStart
+	  if (! @mkdir($storageDir, 0755, true)) {
+		// make sure the failure isn't because of a concurrency issue
+		if (! is_dir($storageDir)) {
+		  throw new Google_CacheException("Could not create storage directory: $storageDir");
+		}
+	  }
+	  // @codeCoverageIgnoreEnd
+	}
+	@touch($storageFile . '.lock');
   }
 
   private function removeLock($storageFile) {
-    // suppress all warnings, if some other process removed it that's ok too
-    @unlink($storageFile . '.lock');
+	// suppress all warnings, if some other process removed it that's ok too
+	@unlink($storageFile . '.lock');
   }
 
   private function waitForLock($storageFile) {
-    // 20 x 250 = 5 seconds
-    $tries = 20;
-    $cnt = 0;
-    do {
-      // make sure PHP picks up on file changes. This is an expensive action but really can't be avoided
-      clearstatcache();
-      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
-      usleep(250);
-      $cnt ++;
-    } while ($cnt <= $tries && $this->isLocked($storageFile));
-    if ($this->isLocked($storageFile)) {
-      // 5 seconds passed, assume the owning process died off and remove it
-      $this->removeLock($storageFile);
-    }
+	// 20 x 250 = 5 seconds
+	$tries = 20;
+	$cnt = 0;
+	do {
+	  // make sure PHP picks up on file changes. This is an expensive action but really can't be avoided
+	  clearstatcache();
+	  // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
+	  usleep(250);
+	  $cnt ++;
+	} while ($cnt <= $tries && $this->isLocked($storageFile));
+	if ($this->isLocked($storageFile)) {
+	  // 5 seconds passed, assume the owning process died off and remove it
+	  $this->removeLock($storageFile);
+	}
   }
 
   private function getCacheDir($hash) {
-    // use the first 2 characters of the hash as a directory prefix
-    // this should prevent slowdowns due to huge directory listings
-    // and thus give some basic amount of scalability
-    return $this->path . '/' . substr($hash, 0, 2);
+	// use the first 2 characters of the hash as a directory prefix
+	// this should prevent slowdowns due to huge directory listings
+	// and thus give some basic amount of scalability
+	return $this->path . '/' . substr($hash, 0, 2);
   }
 
   private function getCacheFile($hash) {
-    return $this->getCacheDir($hash) . '/' . $hash;
+	return $this->getCacheDir($hash) . '/' . $hash;
   }
 
   public function get($key, $expiration = false) {
-    $storageFile = $this->getCacheFile(md5($key));
-    // See if this storage file is locked, if so we wait up to 5 seconds for the lock owning process to
-    // complete it's work. If the lock is not released within that time frame, it's cleaned up.
-    // This should give us a fair amount of 'Cache Stampeding' protection
-    if ($this->isLocked($storageFile)) {
-      $this->waitForLock($storageFile);
-    }
-    if (file_exists($storageFile) && is_readable($storageFile)) {
-      $now = time();
-      if (! $expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
-        if (($data = @file_get_contents($storageFile)) !== false) {
-          $data = unserialize($data);
-          return $data;
-        }
-      }
-    }
-    return false;
+	$storageFile = $this->getCacheFile(md5($key));
+	// See if this storage file is locked, if so we wait up to 5 seconds for the lock owning process to
+	// complete it's work. If the lock is not released within that time frame, it's cleaned up.
+	// This should give us a fair amount of 'Cache Stampeding' protection
+	if ($this->isLocked($storageFile)) {
+	  $this->waitForLock($storageFile);
+	}
+	if (file_exists($storageFile) && is_readable($storageFile)) {
+	  $now = time();
+	  if (! $expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
+		if (($data = @file_get_contents($storageFile)) !== false) {
+		  $data = unserialize($data);
+		  return $data;
+		}
+	  }
+	}
+	return false;
   }
 
   public function set($key, $value) {
-    $storageDir = $this->getCacheDir(md5($key));
-    $storageFile = $this->getCacheFile(md5($key));
-    if ($this->isLocked($storageFile)) {
-      // some other process is writing to this file too, wait until it's done to prevent hiccups
-      $this->waitForLock($storageFile);
-    }
-    if (! is_dir($storageDir)) {
-      if (! @mkdir($storageDir, 0755, true)) {
-        throw new Google_CacheException("Could not create storage directory: $storageDir");
-      }
-    }
-    // we serialize the whole request object, since we don't only want the
-    // responseContent but also the postBody used, headers, size, etc
-    $data = serialize($value);
-    $this->createLock($storageFile);
-    if (! @file_put_contents($storageFile, $data)) {
-      $this->removeLock($storageFile);
-      throw new Google_CacheException("Could not store data in the file");
-    }
-    $this->removeLock($storageFile);
+	$storageDir = $this->getCacheDir(md5($key));
+	$storageFile = $this->getCacheFile(md5($key));
+	if ($this->isLocked($storageFile)) {
+	  // some other process is writing to this file too, wait until it's done to prevent hiccups
+	  $this->waitForLock($storageFile);
+	}
+	if (! is_dir($storageDir)) {
+	  if (! @mkdir($storageDir, 0755, true)) {
+		throw new Google_CacheException("Could not create storage directory: $storageDir");
+	  }
+	}
+	// we serialize the whole request object, since we don't only want the
+	// responseContent but also the postBody used, headers, size, etc
+	$data = serialize($value);
+	$this->createLock($storageFile);
+	if (! @file_put_contents($storageFile, $data)) {
+	  $this->removeLock($storageFile);
+	  throw new Google_CacheException("Could not store data in the file");
+	}
+	$this->removeLock($storageFile);
   }
 
   public function delete($key) {
-    $file = $this->getCacheFile(md5($key));
-    if (! @unlink($file)) {
-      throw new Google_CacheException("Cache file could not be deleted");
-    }
+	$file = $this->getCacheFile(md5($key));
+	if (! @unlink($file)) {
+	  throw new Google_CacheException("Cache file could not be deleted");
+	}
   }
 }

Spacing +14 added lines, -14 removed lines

@@ -34,27 +34,27 @@ 
 
   private function isLocked($storageFile) {
     // our lock file convention is simple: /the/file/path.lock
-    return file_exists($storageFile . '.lock');
+    return file_exists($storageFile.'.lock');
   }
 
   private function createLock($storageFile) {
     $storageDir = dirname($storageFile);
-    if (! is_dir($storageDir)) {
+    if (!is_dir($storageDir)) {
       // @codeCoverageIgnoreStart
-      if (! @mkdir($storageDir, 0755, true)) {
+      if (!@mkdir($storageDir, 0755, true)) {
         // make sure the failure isn't because of a concurrency issue
-        if (! is_dir($storageDir)) {
+        if (!is_dir($storageDir)) {
           throw new Google_CacheException("Could not create storage directory: $storageDir");
         }
       }
       // @codeCoverageIgnoreEnd
     }
-    @touch($storageFile . '.lock');
+    @touch($storageFile.'.lock');
   }
 
   private function removeLock($storageFile) {
     // suppress all warnings, if some other process removed it that's ok too
-    @unlink($storageFile . '.lock');
+    @unlink($storageFile.'.lock');
   }
 
   private function waitForLock($storageFile) {
@@ -66,7 +66,7 @@ 
       clearstatcache();
       // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
       usleep(250);
-      $cnt ++;
+      $cnt++;
     } while ($cnt <= $tries && $this->isLocked($storageFile));
     if ($this->isLocked($storageFile)) {
       // 5 seconds passed, assume the owning process died off and remove it
@@ -78,11 +78,11 @@ 
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    return $this->path . '/' . substr($hash, 0, 2);
+    return $this->path.'/'.substr($hash, 0, 2);
   }
 
   private function getCacheFile($hash) {
-    return $this->getCacheDir($hash) . '/' . $hash;
+    return $this->getCacheDir($hash).'/'.$hash;
   }
 
   public function get($key, $expiration = false) {
@@ -95,7 +95,7 @@ 
     }
     if (file_exists($storageFile) && is_readable($storageFile)) {
       $now = time();
-      if (! $expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
+      if (!$expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
         if (($data = @file_get_contents($storageFile)) !== false) {
           $data = unserialize($data);
           return $data;
@@ -112,8 +112,8 @@ 
       // some other process is writing to this file too, wait until it's done to prevent hiccups
       $this->waitForLock($storageFile);
     }
-    if (! is_dir($storageDir)) {
-      if (! @mkdir($storageDir, 0755, true)) {
+    if (!is_dir($storageDir)) {
+      if (!@mkdir($storageDir, 0755, true)) {
         throw new Google_CacheException("Could not create storage directory: $storageDir");
       }
     }
@@ -121,7 +121,7 @@ 
     // responseContent but also the postBody used, headers, size, etc
     $data = serialize($value);
     $this->createLock($storageFile);
-    if (! @file_put_contents($storageFile, $data)) {
+    if (!@file_put_contents($storageFile, $data)) {
       $this->removeLock($storageFile);
       throw new Google_CacheException("Could not store data in the file");
     }
@@ -130,7 +130,7 @@ 
 
   public function delete($key) {
     $file = $this->getCacheFile(md5($key));
-    if (! @unlink($file)) {
+    if (!@unlink($file)) {
       throw new Google_CacheException("Cache file could not be deleted");
     }
   }

geodirectory-admin/google-api-php-client/src/external/URITemplateParser.php

Doc Comments +6 added lines

@@ -43,6 +43,9 @@ 
     public static $reserved;
     public static $reserved_pct;
 
+    /**
+     * @param string $template
+     */
     public function __construct($template) {
       self::$reserved = array_merge(self::$gen_delims, self::$sub_delims);
       self::$reserved_pct = array_merge(self::$gen_delims_pct, self::$sub_delims_pct);
@@ -150,6 +153,9 @@ 
       return $this->expansion;
     }
 
+    /**
+     * @param stdClass $exp
+     */
     private function val_from_var($var, $exp) {
       $val = '';
       if (is_array($var->data)) {

Indentation +165 added lines, -165 removed lines

@@ -31,30 +31,30 @@ 
 if( ! class_exists( 'URI_Template_Parser' ) ) { 
   class URI_Template_Parser {
 
-    public static $operators = array('+', ';', '?', '/', '.');
-    public static $reserved_operators = array('|', '!', '@');
-    public static $explode_modifiers = array('+', '*');
-    public static $partial_modifiers = array(':', '^');
-
-    public static $gen_delims = array(':', '/', '?', '#', '[', ']', '@');
-    public static $gen_delims_pct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D', '%40');
-    public static $sub_delims = array('!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=');
-    public static $sub_delims_pct = array('%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C', '%3B', '%3D');
-    public static $reserved;
-    public static $reserved_pct;
-
-    public function __construct($template) {
-      self::$reserved = array_merge(self::$gen_delims, self::$sub_delims);
-      self::$reserved_pct = array_merge(self::$gen_delims_pct, self::$sub_delims_pct);
-      $this->template = $template;
-    }
-
-    public function expand($data) {
-      // Modification to make this a bit more performant (since gettype is very slow)
-      if (! is_array($data)) {
-        $data = (array)$data;
-      }
-      /*
+	public static $operators = array('+', ';', '?', '/', '.');
+	public static $reserved_operators = array('|', '!', '@');
+	public static $explode_modifiers = array('+', '*');
+	public static $partial_modifiers = array(':', '^');
+
+	public static $gen_delims = array(':', '/', '?', '#', '[', ']', '@');
+	public static $gen_delims_pct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D', '%40');
+	public static $sub_delims = array('!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=');
+	public static $sub_delims_pct = array('%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C', '%3B', '%3D');
+	public static $reserved;
+	public static $reserved_pct;
+
+	public function __construct($template) {
+	  self::$reserved = array_merge(self::$gen_delims, self::$sub_delims);
+	  self::$reserved_pct = array_merge(self::$gen_delims_pct, self::$sub_delims_pct);
+	  $this->template = $template;
+	}
+
+	public function expand($data) {
+	  // Modification to make this a bit more performant (since gettype is very slow)
+	  if (! is_array($data)) {
+		$data = (array)$data;
+	  }
+	  /*
       // Original code, which uses a slow gettype() statement, kept in place for if the assumption that is_array always works here is incorrect
       switch (gettype($data)) {
         case "boolean":
@@ -67,146 +67,146 @@ 
       }
   */
 
-      // Resolve template vars
-      preg_match_all('/\{([^\}]*)\}/', $this->template, $em);
-
-      foreach ($em[1] as $i => $bare_expression) {
-        preg_match('/^([\+\;\?\/\.]{1})?(.*)$/', $bare_expression, $lm);
-        $exp = new StdClass();
-        $exp->expression = $em[0][$i];
-        $exp->operator = $lm[1];
-        $exp->variable_list = $lm[2];
-        $exp->varspecs = explode(',', $exp->variable_list);
-        $exp->vars = array();
-        foreach ($exp->varspecs as $varspec) {
-          preg_match('/^([a-zA-Z0-9_]+)([\*\+]{1})?([\:\^][0-9-]+)?(\=[^,]+)?$/', $varspec, $vm);
-          $var = new StdClass();
-          $var->name = $vm[1];
-          $var->modifier = isset($vm[2]) && $vm[2] ? $vm[2] : null;
-          $var->modifier = isset($vm[3]) && $vm[3] ? $vm[3] : $var->modifier;
-          $var->default = isset($vm[4]) ? substr($vm[4], 1) : null;
-          $exp->vars[] = $var;
-        }
-
-        // Add processing flags
-        $exp->reserved = false;
-        $exp->prefix = '';
-        $exp->delimiter = ',';
-        switch ($exp->operator) {
-          case '+':
-            $exp->reserved = 'true';
-            break;
-          case ';':
-            $exp->prefix = ';';
-            $exp->delimiter = ';';
-            break;
-          case '?':
-            $exp->prefix = '?';
-            $exp->delimiter = '&';
-            break;
-          case '/':
-            $exp->prefix = '/';
-            $exp->delimiter = '/';
-            break;
-          case '.':
-            $exp->prefix = '.';
-            $exp->delimiter = '.';
-            break;
-        }
-        $expressions[] = $exp;
-      }
-
-      // Expansion
-      $this->expansion = $this->template;
-
-      foreach ($expressions as $exp) {
-        $part = $exp->prefix;
-        $exp->one_var_defined = false;
-        foreach ($exp->vars as $var) {
-          $val = '';
-          if ($exp->one_var_defined && isset($data[$var->name])) {
-            $part .= $exp->delimiter;
-          }
-          // Variable present
-          if (isset($data[$var->name])) {
-            $exp->one_var_defined = true;
-            $var->data = $data[$var->name];
-
-            $val = self::val_from_var($var, $exp);
-
-          // Variable missing
-          } else {
-            if ($var->default) {
-              $exp->one_var_defined = true;
-              $val = $var->default;
-            }
-          }
-          $part .= $val;
-        }
-        if (! $exp->one_var_defined) $part = '';
-        $this->expansion = str_replace($exp->expression, $part, $this->expansion);
-      }
-
-      return $this->expansion;
-    }
-
-    private function val_from_var($var, $exp) {
-      $val = '';
-      if (is_array($var->data)) {
-        $i = 0;
-        if ($exp->operator == '?' && ! $var->modifier) {
-          $val .= $var->name . '=';
-        }
-        foreach ($var->data as $k => $v) {
-          $del = $var->modifier ? $exp->delimiter : ',';
-          $ek = rawurlencode($k);
-          $ev = rawurlencode($v);
-
-          // Array
-          if ($k !== $i) {
-            if ($var->modifier == '+') {
-              $val .= $var->name . '.';
-            }
-            if ($exp->operator == '?' && $var->modifier || $exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+') {
-              $val .= $ek . '=';
-            } else {
-              $val .= $ek . $del;
-            }
-
-          // List
-          } else {
-            if ($var->modifier == '+') {
-              if ($exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+' || $exp->operator == '?' && $var->modifier == '+') {
-                $val .= $var->name . '=';
-              } else {
-                $val .= $var->name . '.';
-              }
-            }
-          }
-          $val .= $ev . $del;
-          $i ++;
-        }
-        $val = trim($val, $del);
-
-      // Strings, numbers, etc.
-      } else {
-        if ($exp->operator == '?') {
-          $val = $var->name . (isset($var->data) ? '=' : '');
-        } else if ($exp->operator == ';') {
-          $val = $var->name . ($var->data ? '=' : '');
-        }
-        $val .= rawurlencode($var->data);
-        if ($exp->operator == '+') {
-          $val = str_replace(self::$reserved_pct, self::$reserved, $val);
-        }
-      }
-      return $val;
-    }
-
-    public function match($uri) {}
-
-    public function __toString() {
-      return $this->template;
-    }
+	  // Resolve template vars
+	  preg_match_all('/\{([^\}]*)\}/', $this->template, $em);
+
+	  foreach ($em[1] as $i => $bare_expression) {
+		preg_match('/^([\+\;\?\/\.]{1})?(.*)$/', $bare_expression, $lm);
+		$exp = new StdClass();
+		$exp->expression = $em[0][$i];
+		$exp->operator = $lm[1];
+		$exp->variable_list = $lm[2];
+		$exp->varspecs = explode(',', $exp->variable_list);
+		$exp->vars = array();
+		foreach ($exp->varspecs as $varspec) {
+		  preg_match('/^([a-zA-Z0-9_]+)([\*\+]{1})?([\:\^][0-9-]+)?(\=[^,]+)?$/', $varspec, $vm);
+		  $var = new StdClass();
+		  $var->name = $vm[1];
+		  $var->modifier = isset($vm[2]) && $vm[2] ? $vm[2] : null;
+		  $var->modifier = isset($vm[3]) && $vm[3] ? $vm[3] : $var->modifier;
+		  $var->default = isset($vm[4]) ? substr($vm[4], 1) : null;
+		  $exp->vars[] = $var;
+		}
+
+		// Add processing flags
+		$exp->reserved = false;
+		$exp->prefix = '';
+		$exp->delimiter = ',';
+		switch ($exp->operator) {
+		  case '+':
+			$exp->reserved = 'true';
+			break;
+		  case ';':
+			$exp->prefix = ';';
+			$exp->delimiter = ';';
+			break;
+		  case '?':
+			$exp->prefix = '?';
+			$exp->delimiter = '&';
+			break;
+		  case '/':
+			$exp->prefix = '/';
+			$exp->delimiter = '/';
+			break;
+		  case '.':
+			$exp->prefix = '.';
+			$exp->delimiter = '.';
+			break;
+		}
+		$expressions[] = $exp;
+	  }
+
+	  // Expansion
+	  $this->expansion = $this->template;
+
+	  foreach ($expressions as $exp) {
+		$part = $exp->prefix;
+		$exp->one_var_defined = false;
+		foreach ($exp->vars as $var) {
+		  $val = '';
+		  if ($exp->one_var_defined && isset($data[$var->name])) {
+			$part .= $exp->delimiter;
+		  }
+		  // Variable present
+		  if (isset($data[$var->name])) {
+			$exp->one_var_defined = true;
+			$var->data = $data[$var->name];
+
+			$val = self::val_from_var($var, $exp);
+
+		  // Variable missing
+		  } else {
+			if ($var->default) {
+			  $exp->one_var_defined = true;
+			  $val = $var->default;
+			}
+		  }
+		  $part .= $val;
+		}
+		if (! $exp->one_var_defined) $part = '';
+		$this->expansion = str_replace($exp->expression, $part, $this->expansion);
+	  }
+
+	  return $this->expansion;
+	}
+
+	private function val_from_var($var, $exp) {
+	  $val = '';
+	  if (is_array($var->data)) {
+		$i = 0;
+		if ($exp->operator == '?' && ! $var->modifier) {
+		  $val .= $var->name . '=';
+		}
+		foreach ($var->data as $k => $v) {
+		  $del = $var->modifier ? $exp->delimiter : ',';
+		  $ek = rawurlencode($k);
+		  $ev = rawurlencode($v);
+
+		  // Array
+		  if ($k !== $i) {
+			if ($var->modifier == '+') {
+			  $val .= $var->name . '.';
+			}
+			if ($exp->operator == '?' && $var->modifier || $exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+') {
+			  $val .= $ek . '=';
+			} else {
+			  $val .= $ek . $del;
+			}
+
+		  // List
+		  } else {
+			if ($var->modifier == '+') {
+			  if ($exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+' || $exp->operator == '?' && $var->modifier == '+') {
+				$val .= $var->name . '=';
+			  } else {
+				$val .= $var->name . '.';
+			  }
+			}
+		  }
+		  $val .= $ev . $del;
+		  $i ++;
+		}
+		$val = trim($val, $del);
+
+	  // Strings, numbers, etc.
+	  } else {
+		if ($exp->operator == '?') {
+		  $val = $var->name . (isset($var->data) ? '=' : '');
+		} else if ($exp->operator == ';') {
+		  $val = $var->name . ($var->data ? '=' : '');
+		}
+		$val .= rawurlencode($var->data);
+		if ($exp->operator == '+') {
+		  $val = str_replace(self::$reserved_pct, self::$reserved, $val);
+		}
+	  }
+	  return $val;
+	}
+
+	public function match($uri) {}
+
+	public function __toString() {
+	  return $this->template;
+	}
   }
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
  * Source: http://github.com/KevBurnsJr/php-uri-template-parser
  */
 
-if( ! class_exists( 'URI_Template_Parser' ) ) { 
+if (!class_exists('URI_Template_Parser')) { 
   class URI_Template_Parser {
 
     public static $operators = array('+', ';', '?', '/', '.');
@@ -51,8 +51,8 @@ 
 
     public function expand($data) {
       // Modification to make this a bit more performant (since gettype is very slow)
-      if (! is_array($data)) {
-        $data = (array)$data;
+      if (!is_array($data)) {
+        $data = (array) $data;
       }
       /*
       // Original code, which uses a slow gettype() statement, kept in place for if the assumption that is_array always works here is incorrect
@@ -143,7 +143,7 @@ 
           }
           $part .= $val;
         }
-        if (! $exp->one_var_defined) $part = '';
+        if (!$exp->one_var_defined) $part = '';
         $this->expansion = str_replace($exp->expression, $part, $this->expansion);
       }
 
@@ -154,8 +154,8 @@ 
       $val = '';
       if (is_array($var->data)) {
         $i = 0;
-        if ($exp->operator == '?' && ! $var->modifier) {
-          $val .= $var->name . '=';
+        if ($exp->operator == '?' && !$var->modifier) {
+          $val .= $var->name.'=';
         }
         foreach ($var->data as $k => $v) {
           $del = $var->modifier ? $exp->delimiter : ',';
@@ -165,35 +165,35 @@ 
           // Array
           if ($k !== $i) {
             if ($var->modifier == '+') {
-              $val .= $var->name . '.';
+              $val .= $var->name.'.';
             }
             if ($exp->operator == '?' && $var->modifier || $exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+') {
-              $val .= $ek . '=';
+              $val .= $ek.'=';
             } else {
-              $val .= $ek . $del;
+              $val .= $ek.$del;
             }
 
           // List
           } else {
             if ($var->modifier == '+') {
               if ($exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+' || $exp->operator == '?' && $var->modifier == '+') {
-                $val .= $var->name . '=';
+                $val .= $var->name.'=';
               } else {
-                $val .= $var->name . '.';
+                $val .= $var->name.'.';
               }
             }
           }
-          $val .= $ev . $del;
-          $i ++;
+          $val .= $ev.$del;
+          $i++;
         }
         $val = trim($val, $del);
 
       // Strings, numbers, etc.
       } else {
         if ($exp->operator == '?') {
-          $val = $var->name . (isset($var->data) ? '=' : '');
+          $val = $var->name.(isset($var->data) ? '=' : '');
         } else if ($exp->operator == ';') {
-          $val = $var->name . ($var->data ? '=' : '');
+          $val = $var->name.($var->data ? '=' : '');
         }
         $val .= rawurlencode($var->data);
         if ($exp->operator == '+') {

Braces +3 added lines, -1 removed lines

@@ -143,7 +143,9 @@
           }
           $part .= $val;
         }
-        if (! $exp->one_var_defined) $part = '';
+        if (! $exp->one_var_defined) {
+        	$part = '';
+        }
         $this->expansion = str_replace($exp->expression, $part, $this->expansion);
       }
 

geodirectory-admin/google-api-php-client/src/Google_Client.php

Doc Comments +3 added lines, -1 removed lines

@@ -108,6 +108,7 @@ 
 
   /**
    * Add a service
+   * @param string $service
    */
   public function addService($service, $version = false) {
     global $apiConfig;
@@ -316,7 +317,7 @@ 
    * token, if a token isn't provided.
    * @throws Google_AuthException
    * @param string|null $token The token (access token or a refresh token) that should be revoked.
-   * @return boolean Returns True if the revocation was successful, otherwise False.
+   * @return boolean|null Returns True if the revocation was successful, otherwise False.
    */
   public function revokeToken($token = null) {
     self::$auth->revokeToken($token);
@@ -347,6 +348,7 @@ 
    * so that you can ask for more or less permission in the auth flow
    * Set this before you call authenticate() though!
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.me', 'https://www.googleapis.com/auth/moderator')
+   * @param string[] $scopes
    */
   public function setScopes($scopes) {
     $this->scopes = is_string($scopes) ? explode(" ", $scopes) : $scopes;

Indentation +89 added lines, -89 removed lines

@@ -99,32 +99,32 @@ 
   private $authenticated = false;
 
   public function __construct($config = array()) {
-    global $apiConfig;
-    $apiConfig = array_merge($apiConfig, $config);
-    self::$cache = new $apiConfig['cacheClass']();
-    self::$auth = new $apiConfig['authClass']();
-    self::$io = new $apiConfig['ioClass']();
+	global $apiConfig;
+	$apiConfig = array_merge($apiConfig, $config);
+	self::$cache = new $apiConfig['cacheClass']();
+	self::$auth = new $apiConfig['authClass']();
+	self::$io = new $apiConfig['ioClass']();
   }
 
   /**
    * Add a service
    */
   public function addService($service, $version = false) {
-    global $apiConfig;
-    if ($this->authenticated) {
-      throw new Google_Exception('Cant add services after having authenticated');
-    }
-    $this->services[$service] = array();
-    if (isset($apiConfig['services'][$service])) {
-      // Merge the service descriptor with the default values
-      $this->services[$service] = array_merge($this->services[$service], $apiConfig['services'][$service]);
-    }
+	global $apiConfig;
+	if ($this->authenticated) {
+	  throw new Google_Exception('Cant add services after having authenticated');
+	}
+	$this->services[$service] = array();
+	if (isset($apiConfig['services'][$service])) {
+	  // Merge the service descriptor with the default values
+	  $this->services[$service] = array_merge($this->services[$service], $apiConfig['services'][$service]);
+	}
   }
 
   public function authenticate($code = null) {
-    $service = $this->prepareService();
-    $this->authenticated = true;
-    return self::$auth->authenticate($service, $code);
+	$service = $this->prepareService();
+	$this->authenticated = true;
+	return self::$auth->authenticate($service, $code);
   }
 
   /**
@@ -132,28 +132,28 @@ 
    * @visible For Testing
    */
   public function prepareService() {
-    $service = array();
-    $scopes = array();
-    if ($this->scopes) {
-      $scopes = $this->scopes;
-    } else {
-      foreach ($this->services as $key => $val) {
-        if (isset($val['scope'])) {
-          if (is_array($val['scope'])) {
-            $scopes = array_merge($val['scope'], $scopes);
-          } else {
-            $scopes[] = $val['scope'];
-          }
-        } else {
-          $scopes[] = 'https://www.googleapis.com/auth/' . $key;
-        }
-        unset($val['discoveryURI']);
-        unset($val['scope']);
-        $service = array_merge($service, $val);
-      }
-    }
-    $service['scope'] = implode(' ', $scopes);
-    return $service;
+	$service = array();
+	$scopes = array();
+	if ($this->scopes) {
+	  $scopes = $this->scopes;
+	} else {
+	  foreach ($this->services as $key => $val) {
+		if (isset($val['scope'])) {
+		  if (is_array($val['scope'])) {
+			$scopes = array_merge($val['scope'], $scopes);
+		  } else {
+			$scopes[] = $val['scope'];
+		  }
+		} else {
+		  $scopes[] = 'https://www.googleapis.com/auth/' . $key;
+		}
+		unset($val['discoveryURI']);
+		unset($val['scope']);
+		$service = array_merge($service, $val);
+	  }
+	}
+	$service['scope'] = implode(' ', $scopes);
+	return $service;
   }
 
   /**
@@ -164,10 +164,10 @@ 
    *  "expires_in":3600, "id_token":"TOKEN", "created":1320790426}
    */
   public function setAccessToken($accessToken) {
-    if ($accessToken == null || 'null' == $accessToken) {
-      $accessToken = null;
-    }
-    self::$auth->setAccessToken($accessToken);
+	if ($accessToken == null || 'null' == $accessToken) {
+	  $accessToken = null;
+	}
+	self::$auth->setAccessToken($accessToken);
   }
 
   /**
@@ -175,7 +175,7 @@ 
    * @param string $authClassName
    */
   public function setAuthClass($authClassName) {
-    self::$auth = new $authClassName();
+	self::$auth = new $authClassName();
   }
 
   /**
@@ -183,8 +183,8 @@ 
    * @return string
    */
   public function createAuthUrl() {
-    $service = $this->prepareService();
-    return self::$auth->createAuthUrl($service['scope']);
+	$service = $this->prepareService();
+	return self::$auth->createAuthUrl($service['scope']);
   }
 
   /**
@@ -194,8 +194,8 @@ 
    *  "expires_in":3600,"id_token":"TOKEN", "created":1320790426}
    */
   public function getAccessToken() {
-    $token = self::$auth->getAccessToken();
-    return (null == $token || 'null' == $token) ? null : $token;
+	$token = self::$auth->getAccessToken();
+	return (null == $token || 'null' == $token) ? null : $token;
   }
 
   /**
@@ -203,7 +203,7 @@ 
    * @return bool Returns True if the access_token is expired.
    */
   public function isAccessTokenExpired() {
-    return self::$auth->isAccessTokenExpired();
+	return self::$auth->isAccessTokenExpired();
   }
 
   /**
@@ -212,7 +212,7 @@ 
    * @param string $developerKey
    */
   public function setDeveloperKey($developerKey) {
-    self::$auth->setDeveloperKey($developerKey);
+	self::$auth->setDeveloperKey($developerKey);
   }
 
   /**
@@ -221,7 +221,7 @@ 
    * @param string $state
    */
   public function setState($state) {
-    self::$auth->setState($state);
+	self::$auth->setState($state);
   }
 
   /**
@@ -230,7 +230,7 @@ 
    *  {@code "online"} to request online access from the user.
    */
   public function setAccessType($accessType) {
-    self::$auth->setAccessType($accessType);
+	self::$auth->setAccessType($accessType);
   }
 
   /**
@@ -239,7 +239,7 @@ 
    *  {@code "auto"} to request auto-approval when possible.
    */
   public function setApprovalPrompt($approvalPrompt) {
-    self::$auth->setApprovalPrompt($approvalPrompt);
+	self::$auth->setApprovalPrompt($approvalPrompt);
   }
 
   /**
@@ -247,8 +247,8 @@ 
    * @param string $applicationName
    */
   public function setApplicationName($applicationName) {
-    global $apiConfig;
-    $apiConfig['application_name'] = $applicationName;
+	global $apiConfig;
+	$apiConfig['application_name'] = $applicationName;
   }
 
   /**
@@ -256,16 +256,16 @@ 
    * @param string $clientId
    */
   public function setClientId($clientId) {
-    global $apiConfig;
-    $apiConfig['oauth2_client_id'] = $clientId;
-    self::$auth->clientId = $clientId;
+	global $apiConfig;
+	$apiConfig['oauth2_client_id'] = $clientId;
+	self::$auth->clientId = $clientId;
   }
 
   /**
    * Get the OAuth 2.0 Client ID.
    */
   public function getClientId() {
-    return self::$auth->clientId;
+	return self::$auth->clientId;
   }
 
   /**
@@ -273,16 +273,16 @@ 
    * @param string $clientSecret
    */
   public function setClientSecret($clientSecret) {
-    global $apiConfig;
-    $apiConfig['oauth2_client_secret'] = $clientSecret;
-    self::$auth->clientSecret = $clientSecret;
+	global $apiConfig;
+	$apiConfig['oauth2_client_secret'] = $clientSecret;
+	self::$auth->clientSecret = $clientSecret;
   }
 
   /**
    * Get the OAuth 2.0 Client Secret.
    */
   public function getClientSecret() {
-    return self::$auth->clientSecret;
+	return self::$auth->clientSecret;
   }
 
   /**
@@ -290,16 +290,16 @@ 
    * @param string $redirectUri
    */
   public function setRedirectUri($redirectUri) {
-    global $apiConfig;
-    $apiConfig['oauth2_redirect_uri'] = $redirectUri;
-    self::$auth->redirectUri = $redirectUri;
+	global $apiConfig;
+	$apiConfig['oauth2_redirect_uri'] = $redirectUri;
+	self::$auth->redirectUri = $redirectUri;
   }
 
   /**
    * Get the OAuth 2.0 Redirect URI.
    */
   public function getRedirectUri() {
-    return self::$auth->redirectUri;
+	return self::$auth->redirectUri;
   }
 
   /**
@@ -308,7 +308,7 @@ 
    * @return void
    */
   public function refreshToken($refreshToken) {
-    self::$auth->refreshToken($refreshToken);
+	self::$auth->refreshToken($refreshToken);
   }
 
   /**
@@ -319,7 +319,7 @@ 
    * @return boolean Returns True if the revocation was successful, otherwise False.
    */
   public function revokeToken($token = null) {
-    self::$auth->revokeToken($token);
+	self::$auth->revokeToken($token);
   }
 
   /**
@@ -331,7 +331,7 @@ 
    * successful.
    */
   public function verifyIdToken($token = null) {
-    return self::$auth->verifyIdToken($token);
+	return self::$auth->verifyIdToken($token);
   }
 
   /**
@@ -339,7 +339,7 @@ 
    * @return void
    */
   public function setAssertionCredentials(Google_AssertionCredentials $creds) {
-    self::$auth->setAssertionCredentials($creds);
+	self::$auth->setAssertionCredentials($creds);
   }
 
   /**
@@ -349,7 +349,7 @@ 
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.me', 'https://www.googleapis.com/auth/moderator')
    */
   public function setScopes($scopes) {
-    $this->scopes = is_string($scopes) ? explode(" ", $scopes) : $scopes;
+	$this->scopes = is_string($scopes) ? explode(" ", $scopes) : $scopes;
   }
 
   /**
@@ -358,7 +358,7 @@ 
    *
    */
   public function getScopes() {
-     return $this->scopes;
+	 return $this->scopes;
   }
 
   /**
@@ -370,8 +370,8 @@ 
    * @param array $requestVisibleActions Array of app activity types
    */
   public function setRequestVisibleActions($requestVisibleActions) {
-    self::$auth->requestVisibleActions =
-            join(" ", $requestVisibleActions);
+	self::$auth->requestVisibleActions =
+			join(" ", $requestVisibleActions);
   }
 
   /**
@@ -382,8 +382,8 @@ 
    * @experimental
    */
   public function setUseObjects($useObjects) {
-    global $apiConfig;
-    $apiConfig['use_objects'] = $useObjects;
+	global $apiConfig;
+	$apiConfig['use_objects'] = $useObjects;
   }
 
   /**
@@ -394,7 +394,7 @@ 
    * @experimental
    */
   public function setUseBatch($useBatch) {
-    self::$useBatch = $useBatch;
+	self::$useBatch = $useBatch;
   }
 
   /**
@@ -402,7 +402,7 @@ 
    * @return Google_Auth the implementation of apiAuth.
    */
   public static function getAuth() {
-    return Google_Client::$auth;
+	return Google_Client::$auth;
   }
 
   /**
@@ -410,14 +410,14 @@ 
    * @return Google_IO the implementation of apiIo.
    */
   public static function getIo() {
-    return Google_Client::$io;
+	return Google_Client::$io;
   }
 
   /**
    * @return Google_Cache the implementation of apiCache.
    */
   public function getCache() {
-    return Google_Client::$cache;
+	return Google_Client::$cache;
   }
 }
 
@@ -442,14 +442,14 @@ 
    * response.  Defaults to [].
    */
   public function __construct($message, $code = 0, Exception $previous = null,
-                              $errors = array()) {
-    if(version_compare(PHP_VERSION, '5.3.0') >= 0) {
-      parent::__construct($message, $code, $previous);
-    } else {
-      parent::__construct($message, $code);
-    }
+							  $errors = array()) {
+	if(version_compare(PHP_VERSION, '5.3.0') >= 0) {
+	  parent::__construct($message, $code, $previous);
+	} else {
+	  parent::__construct($message, $code);
+	}
 
-    $this->errors = $errors;
+	$this->errors = $errors;
   }
 
   /**
@@ -466,6 +466,6 @@ 
    * @return [{string, string}] List of errors return in an HTTP response or [].
    */
   public function getErrors() {
-    return $this->errors;
+	return $this->errors;
   }
 }

Spacing +21 added lines, -21 removed lines

@@ -17,42 +17,42 @@ 
 
 // Check for the json extension, the Google APIs PHP Client won't function
 // without it.
-if (! function_exists('json_decode')) {
+if (!function_exists('json_decode')) {
   throw new Exception('Google PHP API Client requires the JSON PHP extension');
 }
 
-if (! function_exists('http_build_query')) {
+if (!function_exists('http_build_query')) {
   throw new Exception('Google PHP API Client requires http_build_query()');
 }
 
-if (! ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
+if (!ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
   date_default_timezone_set('UTC');
 }
-define("GA_API_Path", dirname(__FILE__) .'/');
+define("GA_API_Path", dirname(__FILE__).'/');
 // hack around with the include paths a bit so the library 'just works'
 //set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
 
-require_once (dirname(__FILE__) . "/config.php");
+require_once (dirname(__FILE__)."/config.php");
 // If a local configuration file is found, merge it's values with the default configuration
-if (file_exists(dirname(__FILE__)  . '/local_config.php')) {
+if (file_exists(dirname(__FILE__).'/local_config.php')) {
   $defaultConfig = $apiConfig;
-  require_once (dirname(__FILE__)  . '/local_config.php');
+  require_once (dirname(__FILE__).'/local_config.php');
   $apiConfig = array_merge($defaultConfig, $apiConfig);
 }
 
 // Include the top level classes, they each include their own dependencies
-require_once GA_API_Path. 'service/Google_Model.php';
-require_once GA_API_Path. 'service/Google_Service.php';
-require_once GA_API_Path. 'service/Google_ServiceResource.php';
-require_once GA_API_Path. 'auth/Google_AssertionCredentials.php';
-require_once GA_API_Path. 'auth/Google_Signer.php';
-require_once GA_API_Path. 'auth/Google_P12Signer.php';
-require_once GA_API_Path. 'service/Google_BatchRequest.php';
-require_once GA_API_Path. 'external/URITemplateParser.php';
-require_once GA_API_Path. 'auth/Google_Auth.php';
-require_once GA_API_Path. 'cache/Google_Cache.php';
-require_once GA_API_Path. 'io/Google_IO.php';
-require_once(GA_API_Path. 'service/Google_MediaFileUpload.php');
+require_once GA_API_Path.'service/Google_Model.php';
+require_once GA_API_Path.'service/Google_Service.php';
+require_once GA_API_Path.'service/Google_ServiceResource.php';
+require_once GA_API_Path.'auth/Google_AssertionCredentials.php';
+require_once GA_API_Path.'auth/Google_Signer.php';
+require_once GA_API_Path.'auth/Google_P12Signer.php';
+require_once GA_API_Path.'service/Google_BatchRequest.php';
+require_once GA_API_Path.'external/URITemplateParser.php';
+require_once GA_API_Path.'auth/Google_Auth.php';
+require_once GA_API_Path.'cache/Google_Cache.php';
+require_once GA_API_Path.'io/Google_IO.php';
+require_once(GA_API_Path.'service/Google_MediaFileUpload.php');
 
 /**
  * The Google API Client
@@ -145,7 +145,7 @@ 
             $scopes[] = $val['scope'];
           }
         } else {
-          $scopes[] = 'https://www.googleapis.com/auth/' . $key;
+          $scopes[] = 'https://www.googleapis.com/auth/'.$key;
         }
         unset($val['discoveryURI']);
         unset($val['scope']);
@@ -443,7 +443,7 @@ 
    */
   public function __construct($message, $code = 0, Exception $previous = null,
                               $errors = array()) {
-    if(version_compare(PHP_VERSION, '5.3.0') >= 0) {
+    if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
       parent::__construct($message, $code, $previous);
     } else {
       parent::__construct($message, $code);

geodirectory-admin/google-api-php-client/src/io/Google_HttpRequest.php

Doc Comments +4 added lines, -1 removed lines

@@ -44,6 +44,9 @@ 
   
   public $accessKey;
 
+  /**
+   * @param string|boolean $url
+   */
   public function __construct($url, $method = 'GET', $headers = array(), $postBody = null) {
     $this->setUrl($url);
     $this->setRequestMethod($method);
@@ -87,7 +90,7 @@ 
   }
 
   /**
-   * @return string HTTP Response Code.
+   * @return integer HTTP Response Code.
    */
   public function getResponseHttpCode() {
     return (int) $this->responseHttpCode;

Indentation +101 added lines, -101 removed lines

@@ -26,10 +26,10 @@ 
 class Google_HttpRequest {
   const USER_AGENT_SUFFIX = "google-api-php-client/0.6.5";
   private $batchHeaders = array(
-    'Content-Type' => 'application/http',
-    'Content-Transfer-Encoding' => 'binary',
-    'MIME-Version' => '1.0',
-    'Content-Length' => ''
+	'Content-Type' => 'application/http',
+	'Content-Transfer-Encoding' => 'binary',
+	'MIME-Version' => '1.0',
+	'Content-Length' => ''
   );
 
   protected $url;
@@ -45,17 +45,17 @@ 
   public $accessKey;
 
   public function __construct($url, $method = 'GET', $headers = array(), $postBody = null) {
-    $this->setUrl($url);
-    $this->setRequestMethod($method);
-    $this->setRequestHeaders($headers);
-    $this->setPostBody($postBody);
-
-    global $apiConfig;
-    if (empty($apiConfig['application_name'])) {
-      $this->userAgent = self::USER_AGENT_SUFFIX;
-    } else {
-      $this->userAgent = $apiConfig['application_name'] . " " . self::USER_AGENT_SUFFIX;
-    }
+	$this->setUrl($url);
+	$this->setRequestMethod($method);
+	$this->setRequestHeaders($headers);
+	$this->setPostBody($postBody);
+
+	global $apiConfig;
+	if (empty($apiConfig['application_name'])) {
+	  $this->userAgent = self::USER_AGENT_SUFFIX;
+	} else {
+	  $this->userAgent = $apiConfig['application_name'] . " " . self::USER_AGENT_SUFFIX;
+	}
   }
 
   /**
@@ -65,10 +65,10 @@ 
    * @see http://oauth.net/core/1.0a/#anchor13
    */
   public function getBaseUrl() {
-    if ($pos = strpos($this->url, '?')) {
-      return substr($this->url, 0, $pos);
-    }
-    return $this->url;
+	if ($pos = strpos($this->url, '?')) {
+	  return substr($this->url, 0, $pos);
+	}
+	return $this->url;
   }
 
   /**
@@ -77,41 +77,41 @@ 
    * @return array Query parameters in the query string.
    */
   public function getQueryParams() {
-    if ($pos = strpos($this->url, '?')) {
-      $queryStr = substr($this->url, $pos + 1);
-      $params = array();
-      parse_str($queryStr, $params);
-      return $params;
-    }
-    return array();
+	if ($pos = strpos($this->url, '?')) {
+	  $queryStr = substr($this->url, $pos + 1);
+	  $params = array();
+	  parse_str($queryStr, $params);
+	  return $params;
+	}
+	return array();
   }
 
   /**
    * @return string HTTP Response Code.
    */
   public function getResponseHttpCode() {
-    return (int) $this->responseHttpCode;
+	return (int) $this->responseHttpCode;
   }
 
   /**
    * @param int $responseHttpCode HTTP Response Code.
    */
   public function setResponseHttpCode($responseHttpCode) {
-    $this->responseHttpCode = $responseHttpCode;
+	$this->responseHttpCode = $responseHttpCode;
   }
 
   /**
    * @return $responseHeaders (array) HTTP Response Headers.
    */
   public function getResponseHeaders() {
-    return $this->responseHeaders;
+	return $this->responseHeaders;
   }
 
   /**
    * @return string HTTP Response Body
    */
   public function getResponseBody() {
-    return $this->responseBody;
+	return $this->responseBody;
   }
 
   /**
@@ -119,12 +119,12 @@ 
    * to be normalized.
    */
   public function setResponseHeaders($headers) {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->responseHeaders) {
-      $headers = array_merge($this->responseHeaders, $headers);
-    }
+	$headers = Google_Utils::normalize($headers);
+	if ($this->responseHeaders) {
+	  $headers = array_merge($this->responseHeaders, $headers);
+	}
 
-    $this->responseHeaders = $headers;
+	$this->responseHeaders = $headers;
   }
 
   /**
@@ -133,16 +133,16 @@ 
    * false if unavailable.
    */
   public function getResponseHeader($key) {
-    return isset($this->responseHeaders[$key])
-        ? $this->responseHeaders[$key]
-        : false;
+	return isset($this->responseHeaders[$key])
+		? $this->responseHeaders[$key]
+		: false;
   }
 
   /**
    * @param string $responseBody The HTTP response body.
    */
   public function setResponseBody($responseBody) {
-    $this->responseBody = $responseBody;
+	$this->responseBody = $responseBody;
   }
 
   /**
@@ -150,21 +150,21 @@ 
    */
 
   public function getUrl() {
-    return $this->url;
+	return $this->url;
   }
 
   /**
    * @return string $method HTTP Request Method.
    */
   public function getRequestMethod() {
-    return $this->requestMethod;
+	return $this->requestMethod;
   }
 
   /**
    * @return array $headers HTTP Request Headers.
    */
   public function getRequestHeaders() {
-    return $this->requestHeaders;
+	return $this->requestHeaders;
   }
 
   /**
@@ -173,32 +173,32 @@ 
    * false if unavailable.
    */
   public function getRequestHeader($key) {
-    return isset($this->requestHeaders[$key])
-        ? $this->requestHeaders[$key]
-        : false;
+	return isset($this->requestHeaders[$key])
+		? $this->requestHeaders[$key]
+		: false;
   }
 
   /**
    * @return string $postBody HTTP Request Body.
    */
   public function getPostBody() {
-    return $this->postBody;
+	return $this->postBody;
   }
 
   /**
    * @param string $url the url to set
    */
   public function setUrl($url) {
-    if (substr($url, 0, 4) == 'http') {
-      $this->url = $url;
-    } else {
-      // Force the path become relative.
-      if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
-      }
-      global $apiConfig;
-      $this->url = $apiConfig['basePath'] . $url;
-    }
+	if (substr($url, 0, 4) == 'http') {
+	  $this->url = $url;
+	} else {
+	  // Force the path become relative.
+	  if (substr($url, 0, 1) !== '/') {
+		$url = '/' . $url;
+	  }
+	  global $apiConfig;
+	  $this->url = $apiConfig['basePath'] . $url;
+	}
   }
 
   /**
@@ -207,7 +207,7 @@ 
    *
    */
   public function setRequestMethod($method) {
-    $this->requestMethod = strtoupper($method);
+	$this->requestMethod = strtoupper($method);
   }
 
   /**
@@ -215,18 +215,18 @@ 
    * to be set and normalized.
    */
   public function setRequestHeaders($headers) {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->requestHeaders) {
-      $headers = array_merge($this->requestHeaders, $headers);
-    }
-    $this->requestHeaders = $headers;
+	$headers = Google_Utils::normalize($headers);
+	if ($this->requestHeaders) {
+	  $headers = array_merge($this->requestHeaders, $headers);
+	}
+	$this->requestHeaders = $headers;
   }
 
   /**
    * @param string $postBody the postBody to set
    */
   public function setPostBody($postBody) {
-    $this->postBody = $postBody;
+	$this->postBody = $postBody;
   }
 
   /**
@@ -234,14 +234,14 @@ 
    * @param string $userAgent The User-Agent.
    */
   public function setUserAgent($userAgent) {
-    $this->userAgent = $userAgent;
+	$this->userAgent = $userAgent;
   }
 
   /**
    * @return string The User-Agent.
    */
   public function getUserAgent() {
-    return $this->userAgent;
+	return $this->userAgent;
   }
 
   /**
@@ -251,28 +251,28 @@ 
    * @return string The md5 hash of the request cache key.
    */
   public function getCacheKey() {
-    $key = $this->getUrl();
+	$key = $this->getUrl();
 
-    if (isset($this->accessKey)) {
-      $key .= $this->accessKey;
-    }
+	if (isset($this->accessKey)) {
+	  $key .= $this->accessKey;
+	}
 
-    if (isset($this->requestHeaders['authorization'])) {
-      $key .= $this->requestHeaders['authorization'];
-    }
+	if (isset($this->requestHeaders['authorization'])) {
+	  $key .= $this->requestHeaders['authorization'];
+	}
 
-    return md5($key);
+	return md5($key);
   }
 
   public function getParsedCacheControl() {
-    $parsed = array();
-    $rawCacheControl = $this->getResponseHeader('cache-control');
-    if ($rawCacheControl) {
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
-      parse_str($rawCacheControl, $parsed);
-    }
-
-    return $parsed;
+	$parsed = array();
+	$rawCacheControl = $this->getResponseHeader('cache-control');
+	if ($rawCacheControl) {
+	  $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+	  parse_str($rawCacheControl, $parsed);
+	}
+
+	return $parsed;
   }
 
   /**
@@ -280,25 +280,25 @@ 
    * @return string A string representation of the HTTP Request.
    */
   public function toBatchString($id) {
-    $str = '';
-    foreach($this->batchHeaders as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
-
-    $str .= "Content-ID: $id\n";
-    $str .= "\n";
-
-    $path = parse_url($this->getUrl(), PHP_URL_PATH);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
-    foreach($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
-
-    if ($this->getPostBody()) {
-      $str .= "\n";
-      $str .= $this->getPostBody();
-    }
-
-    return $str;
+	$str = '';
+	foreach($this->batchHeaders as $key => $val) {
+	  $str .= $key . ': ' . $val . "\n";
+	}
+
+	$str .= "Content-ID: $id\n";
+	$str .= "\n";
+
+	$path = parse_url($this->getUrl(), PHP_URL_PATH);
+	$str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+	foreach($this->getRequestHeaders() as $key => $val) {
+	  $str .= $key . ': ' . $val . "\n";
+	}
+
+	if ($this->getPostBody()) {
+	  $str .= "\n";
+	  $str .= $this->getPostBody();
+	}
+
+	return $str;
   }
 }

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
     if (empty($apiConfig['application_name'])) {
       $this->userAgent = self::USER_AGENT_SUFFIX;
     } else {
-      $this->userAgent = $apiConfig['application_name'] . " " . self::USER_AGENT_SUFFIX;
+      $this->userAgent = $apiConfig['application_name']." ".self::USER_AGENT_SUFFIX;
     }
   }
 
@@ -194,10 +194,10 @@ 
     } else {
       // Force the path become relative.
       if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
+        $url = '/'.$url;
       }
       global $apiConfig;
-      $this->url = $apiConfig['basePath'] . $url;
+      $this->url = $apiConfig['basePath'].$url;
     }
   }
 
@@ -281,17 +281,17 @@ 
    */
   public function toBatchString($id) {
     $str = '';
-    foreach($this->batchHeaders as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
+    foreach ($this->batchHeaders as $key => $val) {
+      $str .= $key.': '.$val."\n";
     }
 
     $str .= "Content-ID: $id\n";
     $str .= "\n";
 
     $path = parse_url($this->getUrl(), PHP_URL_PATH);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
-    foreach($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
+    $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n";
+    foreach ($this->getRequestHeaders() as $key => $val) {
+      $str .= $key.': '.$val."\n";
     }
 
     if ($this->getPostBody()) {

geodirectory-admin/google-api-php-client/src/io/Google_HttpStreamIO.php

Doc Comments +3 added lines

@@ -140,6 +140,9 @@
   public function setOptions($options) {
   }
 
+  /**
+   * @return integer
+   */
   private function getHttpResponseCode($response_headers) {
     $header_count = count($response_headers);
 

Indentation +98 added lines, -98 removed lines

@@ -28,12 +28,12 @@ 
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
 
   private static $DEFAULT_HTTP_CONTEXT = array(
-    "follow_location" => 0,
-    "ignore_errors" => 1,
+	"follow_location" => 0,
+	"ignore_errors" => 1,
   );
 
   private static $DEFAULT_SSL_CONTEXT = array(
-    "verify_peer" => true,
+	"verify_peer" => true,
   );
 
   /**
@@ -47,8 +47,8 @@ 
    * responseHttpCode, responseHeaders and responseBody.
    */
   public function authenticatedRequest(Google_HttpRequest $request) {
-    $request = Google_Client::$auth->sign($request);
-    return $this->makeRequest($request);
+	$request = Google_Client::$auth->sign($request);
+	return $this->makeRequest($request);
   }
 
   /**
@@ -60,77 +60,77 @@ 
    * @throws Google_IOException on curl or IO error
    */
   public function makeRequest(Google_HttpRequest $request) {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false) {
-      if (!$this->checkMustRevaliadateCachedRequest($cached, $request)) {
-        return $cached;
-      }
-    }
-
-    $default_options = stream_context_get_options(stream_context_get_default());
-
-    $requestHttpContext = array_key_exists('http', $default_options) ?
-        $default_options['http'] : array();
-    if (array_key_exists($request->getRequestMethod(),
-          self::$ENTITY_HTTP_METHODS)) {
-      $request = $this->processEntityRequest($request);
-    }
-
-    if ($request->getPostBody()) {
-      $requestHttpContext["content"] = $request->getPostBody();
-    }
-
-    $requestHeaders = $request->getRequestHeaders();
-    if ($requestHeaders && is_array($requestHeaders)) {
-      $headers = "";
-      foreach($requestHeaders as $k => $v) {
-        $headers .= "$k: $v\n";
-      }
-      $requestHttpContext["header"] = $headers;
-    }
-
-    $requestHttpContext["method"] = $request->getRequestMethod();
-    $requestHttpContext["user_agent"] = $request->getUserAgent();
-
-    $requestSslContext = array_key_exists('ssl', $default_options) ?
-        $default_options['ssl'] : array();
-
-    if (!array_key_exists("cafile", $requestSslContext)) {
-      $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
-    }
-
-    $options = array("http" => array_merge(self::$DEFAULT_HTTP_CONTEXT,
-                                                 $requestHttpContext),
-                     "ssl" => array_merge(self::$DEFAULT_SSL_CONTEXT,
-                                          $requestSslContext));
-
-    $context = stream_context_create($options);
-
-    $response_data = file_get_contents($request->getUrl(),
-                                       false,
-                                       $context);
-
-    if (false === $response_data) {
-      throw new Google_IOException("HTTP Error: Unable to connect");
-    }
-
-    $respHttpCode = $this->getHttpResponseCode($http_response_header);
-    $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
-
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      $this->updateCachedRequest($cached, $responseHeaders);
-      return $cached;
-    }
-
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($response_data);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    return $request;
+	// First, check to see if we have a valid cached version.
+	$cached = $this->getCachedRequest($request);
+	if ($cached !== false) {
+	  if (!$this->checkMustRevaliadateCachedRequest($cached, $request)) {
+		return $cached;
+	  }
+	}
+
+	$default_options = stream_context_get_options(stream_context_get_default());
+
+	$requestHttpContext = array_key_exists('http', $default_options) ?
+		$default_options['http'] : array();
+	if (array_key_exists($request->getRequestMethod(),
+		  self::$ENTITY_HTTP_METHODS)) {
+	  $request = $this->processEntityRequest($request);
+	}
+
+	if ($request->getPostBody()) {
+	  $requestHttpContext["content"] = $request->getPostBody();
+	}
+
+	$requestHeaders = $request->getRequestHeaders();
+	if ($requestHeaders && is_array($requestHeaders)) {
+	  $headers = "";
+	  foreach($requestHeaders as $k => $v) {
+		$headers .= "$k: $v\n";
+	  }
+	  $requestHttpContext["header"] = $headers;
+	}
+
+	$requestHttpContext["method"] = $request->getRequestMethod();
+	$requestHttpContext["user_agent"] = $request->getUserAgent();
+
+	$requestSslContext = array_key_exists('ssl', $default_options) ?
+		$default_options['ssl'] : array();
+
+	if (!array_key_exists("cafile", $requestSslContext)) {
+	  $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
+	}
+
+	$options = array("http" => array_merge(self::$DEFAULT_HTTP_CONTEXT,
+												 $requestHttpContext),
+					 "ssl" => array_merge(self::$DEFAULT_SSL_CONTEXT,
+										  $requestSslContext));
+
+	$context = stream_context_create($options);
+
+	$response_data = file_get_contents($request->getUrl(),
+									   false,
+									   $context);
+
+	if (false === $response_data) {
+	  throw new Google_IOException("HTTP Error: Unable to connect");
+	}
+
+	$respHttpCode = $this->getHttpResponseCode($http_response_header);
+	$responseHeaders = $this->getHttpResponseHeaders($http_response_header);
+
+	if ($respHttpCode == 304 && $cached) {
+	  // If the server responded NOT_MODIFIED, return the cached request.
+	  $this->updateCachedRequest($cached, $responseHeaders);
+	  return $cached;
+	}
+
+	$request->setResponseHttpCode($respHttpCode);
+	$request->setResponseHeaders($responseHeaders);
+	$request->setResponseBody($response_data);
+	// Store the request in cache (the function checks to see if the request
+	// can actually be cached)
+	$this->setCachedRequest($request);
+	return $request;
   }
 
   /**
@@ -141,30 +141,30 @@ 
   }
 
   private function getHttpResponseCode($response_headers) {
-    $header_count = count($response_headers);
-
-    for ($i = 0; $i < $header_count; $i++) {
-      $header = $response_headers[$i];
-      if (strncasecmp("HTTP", $header, strlen("HTTP")) == 0) {
-        $response = explode(' ', $header);
-        return $response[1];
-      }
-    }
-    return 'UNKNOWN';
+	$header_count = count($response_headers);
+
+	for ($i = 0; $i < $header_count; $i++) {
+	  $header = $response_headers[$i];
+	  if (strncasecmp("HTTP", $header, strlen("HTTP")) == 0) {
+		$response = explode(' ', $header);
+		return $response[1];
+	  }
+	}
+	return 'UNKNOWN';
   }
 
   private function getHttpResponseHeaders($response_headers) {
-    $header_count = count($response_headers);
-    $headers = array();
-
-    for ($i = 0; $i < $header_count; $i++) {
-      $header = $response_headers[$i];
-      $header_parts = explode(':', $header);
-      if (count($header_parts) == 2) {
-        $headers[$header_parts[0]] = $header_parts[1];
-      }
-    }
-
-    return $headers;
+	$header_count = count($response_headers);
+	$headers = array();
+
+	for ($i = 0; $i < $header_count; $i++) {
+	  $header = $response_headers[$i];
+	  $header_parts = explode(':', $header);
+	  if (count($header_parts) == 2) {
+		$headers[$header_parts[0]] = $header_parts[1];
+	  }
+	}
+
+	return $headers;
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
     $requestHeaders = $request->getRequestHeaders();
     if ($requestHeaders && is_array($requestHeaders)) {
       $headers = "";
-      foreach($requestHeaders as $k => $v) {
+      foreach ($requestHeaders as $k => $v) {
         $headers .= "$k: $v\n";
       }
       $requestHttpContext["header"] = $headers;
@@ -97,7 +97,7 @@ 
         $default_options['ssl'] : array();
 
     if (!array_key_exists("cafile", $requestSslContext)) {
-      $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
+      $requestSslContext["cafile"] = dirname(__FILE__).'/cacerts.pem';
     }
 
     $options = array("http" => array_merge(self::$DEFAULT_HTTP_CONTEXT,

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

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
   /**
    * Prepares a standard file upload via cURL.
-   * @param $file
+   * @param boolean|string $file
    * @param $mime
    * @return array Includes the processed file name.
    * @visible For testing.

Indentation +162 added lines, -162 removed lines

@@ -53,19 +53,19 @@ 
    * only used if resumable=True
    */
   public function __construct($mimeType, $data, $resumable=false, $chunkSize=false) {
-    $this->mimeType = $mimeType;
-    $this->data = $data;
-    $this->size = strlen($this->data);
-    $this->resumable = $resumable;
-    if(!$chunkSize) {
-      $chunkSize = 256 * 1024;
-    }
-    $this->chunkSize = $chunkSize;
-    $this->progress = 0;
+	$this->mimeType = $mimeType;
+	$this->data = $data;
+	$this->size = strlen($this->data);
+	$this->resumable = $resumable;
+	if(!$chunkSize) {
+	  $chunkSize = 256 * 1024;
+	}
+	$this->chunkSize = $chunkSize;
+	$this->progress = 0;
   }
 
   public function setFileSize($size) {
-    $this->size = $size;
+	$this->size = $size;
   }
 
   /**
@@ -75,69 +75,69 @@ 
    * @return array|bool
    */
   public static function process($meta, &$params) {
-    $payload = array();
-    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
-    $uploadType = self::getUploadType($meta, $payload, $params);
-    if (!$uploadType) {
-      // Process as a normal API request.
-      return false;
-    }
-
-    // Process as a media upload request.
-    $params['uploadType'] = array(
-        'type' => 'string',
-        'location' => 'query',
-        'value' => $uploadType,
-    );
-
-    $mimeType = isset($params['mimeType'])
-        ? $params['mimeType']['value']
-        : false;
-    unset($params['mimeType']);
-
-    if (!$mimeType) {
-      $mimeType = $payload['content-type'];
-    }
-
-    if (isset($params['file'])) {
-      // This is a standard file upload with curl.
-      $file = $params['file']['value'];
-      unset($params['file']);
-      return self::processFileUpload($file, $mimeType);
-    }
-
-    $data = isset($params['data'])
-        ? $params['data']['value']
-        : false;
-    unset($params['data']);
-
-    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
-      $payload['content-type'] = $mimeType;
-      $payload['postBody'] = is_string($meta) ? $meta : json_encode($meta);
-
-    } elseif (self::UPLOAD_MEDIA_TYPE == $uploadType) {
-      // This is a simple media upload.
-      $payload['content-type'] = $mimeType;
-      $payload['postBody'] = $data;
-    }
-
-    elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
-      // This is a multipart/related upload.
-      $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
-      $boundary = str_replace('"', '', $boundary);
-      $payload['content-type'] = 'multipart/related; boundary=' . $boundary;
-      $related = "--$boundary\r\n";
-      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
-      $related .= "--$boundary\r\n";
-      $related .= "Content-Type: $mimeType\r\n";
-      $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($data) . "\r\n";
-      $related .= "--$boundary--";
-      $payload['postBody'] = $related;
-    }
-
-    return $payload;
+	$payload = array();
+	$meta = is_string($meta) ? json_decode($meta, true) : $meta;
+	$uploadType = self::getUploadType($meta, $payload, $params);
+	if (!$uploadType) {
+	  // Process as a normal API request.
+	  return false;
+	}
+
+	// Process as a media upload request.
+	$params['uploadType'] = array(
+		'type' => 'string',
+		'location' => 'query',
+		'value' => $uploadType,
+	);
+
+	$mimeType = isset($params['mimeType'])
+		? $params['mimeType']['value']
+		: false;
+	unset($params['mimeType']);
+
+	if (!$mimeType) {
+	  $mimeType = $payload['content-type'];
+	}
+
+	if (isset($params['file'])) {
+	  // This is a standard file upload with curl.
+	  $file = $params['file']['value'];
+	  unset($params['file']);
+	  return self::processFileUpload($file, $mimeType);
+	}
+
+	$data = isset($params['data'])
+		? $params['data']['value']
+		: false;
+	unset($params['data']);
+
+	if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
+	  $payload['content-type'] = $mimeType;
+	  $payload['postBody'] = is_string($meta) ? $meta : json_encode($meta);
+
+	} elseif (self::UPLOAD_MEDIA_TYPE == $uploadType) {
+	  // This is a simple media upload.
+	  $payload['content-type'] = $mimeType;
+	  $payload['postBody'] = $data;
+	}
+
+	elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+	  // This is a multipart/related upload.
+	  $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
+	  $boundary = str_replace('"', '', $boundary);
+	  $payload['content-type'] = 'multipart/related; boundary=' . $boundary;
+	  $related = "--$boundary\r\n";
+	  $related .= "Content-Type: application/json; charset=UTF-8\r\n";
+	  $related .= "\r\n" . json_encode($meta) . "\r\n";
+	  $related .= "--$boundary\r\n";
+	  $related .= "Content-Type: $mimeType\r\n";
+	  $related .= "Content-Transfer-Encoding: base64\r\n";
+	  $related .= "\r\n" . base64_encode($data) . "\r\n";
+	  $related .= "--$boundary--";
+	  $payload['postBody'] = $related;
+	}
+
+	return $payload;
   }
 
   /**
@@ -148,18 +148,18 @@ 
    * @visible For testing.
    */
   public static function processFileUpload($file, $mime) {
-    if (!$file) return array();
-    if (substr($file, 0, 1) != '@') {
-      $file = '@' . $file;
-    }
-
-    // This is a standard file upload with curl.
-    $params = array('postBody' => array('file' => $file));
-    if ($mime) {
-      $params['content-type'] = $mime;
-    }
-
-    return $params;
+	if (!$file) return array();
+	if (substr($file, 0, 1) != '@') {
+	  $file = '@' . $file;
+	}
+
+	// This is a standard file upload with curl.
+	$params = array('postBody' => array('file' => $file));
+	if ($mime) {
+	  $params['content-type'] = $mime;
+	}
+
+	return $params;
   }
 
   /**
@@ -174,89 +174,89 @@ 
    * @return bool|string
    */
   public static function getUploadType($meta, &$payload, &$params) {
-    if (isset($params['mediaUpload'])
-        && get_class($params['mediaUpload']['value']) == 'Google_MediaFileUpload') {
-      $upload = $params['mediaUpload']['value'];
-      unset($params['mediaUpload']);
-      $payload['content-type'] = $upload->mimeType;
-      if (isset($upload->resumable) && $upload->resumable) {
-        return self::UPLOAD_RESUMABLE_TYPE;
-      }
-    }
-
-    // Allow the developer to override the upload type.
-    if (isset($params['uploadType'])) {
-      return $params['uploadType']['value'];
-    }
-
-    $data = isset($params['data']['value'])
-        ? $params['data']['value'] : false;
-
-    if (false == $data && false == isset($params['file'])) {
-      // No upload data available.
-      return false;
-    }
-
-    if (isset($params['file'])) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
-
-    if (false == $meta) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
-
-    return self::UPLOAD_MULTIPART_TYPE;
+	if (isset($params['mediaUpload'])
+		&& get_class($params['mediaUpload']['value']) == 'Google_MediaFileUpload') {
+	  $upload = $params['mediaUpload']['value'];
+	  unset($params['mediaUpload']);
+	  $payload['content-type'] = $upload->mimeType;
+	  if (isset($upload->resumable) && $upload->resumable) {
+		return self::UPLOAD_RESUMABLE_TYPE;
+	  }
+	}
+
+	// Allow the developer to override the upload type.
+	if (isset($params['uploadType'])) {
+	  return $params['uploadType']['value'];
+	}
+
+	$data = isset($params['data']['value'])
+		? $params['data']['value'] : false;
+
+	if (false == $data && false == isset($params['file'])) {
+	  // No upload data available.
+	  return false;
+	}
+
+	if (isset($params['file'])) {
+	  return self::UPLOAD_MEDIA_TYPE;
+	}
+
+	if (false == $meta) {
+	  return self::UPLOAD_MEDIA_TYPE;
+	}
+
+	return self::UPLOAD_MULTIPART_TYPE;
   }
 
 
   public function nextChunk(Google_HttpRequest $req, $chunk=false) {
-    if (false == $this->resumeUri) {
-      $this->resumeUri = $this->getResumeUri($req);
-    }
-
-    if (false == $chunk) {
-      $chunk = substr($this->data, $this->progress, $this->chunkSize);
-    }
-
-    $lastBytePos = $this->progress + strlen($chunk) - 1;
-    $headers = array(
-      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
-      'content-type' => $req->getRequestHeader('content-type'),
-      'content-length' => $this->chunkSize,
-      'expect' => '',
-    );
-
-    $httpRequest = new Google_HttpRequest($this->resumeUri, 'PUT', $headers, $chunk);
-    $response = Google_Client::$io->authenticatedRequest($httpRequest);
-    $code = $response->getResponseHttpCode();
-    if (308 == $code) {
-      $range = explode('-', $response->getResponseHeader('range'));
-      $this->progress = $range[1] + 1;
-      return false;
-    } else {
-      return Google_REST::decodeHttpResponse($response);
-    }
+	if (false == $this->resumeUri) {
+	  $this->resumeUri = $this->getResumeUri($req);
+	}
+
+	if (false == $chunk) {
+	  $chunk = substr($this->data, $this->progress, $this->chunkSize);
+	}
+
+	$lastBytePos = $this->progress + strlen($chunk) - 1;
+	$headers = array(
+	  'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
+	  'content-type' => $req->getRequestHeader('content-type'),
+	  'content-length' => $this->chunkSize,
+	  'expect' => '',
+	);
+
+	$httpRequest = new Google_HttpRequest($this->resumeUri, 'PUT', $headers, $chunk);
+	$response = Google_Client::$io->authenticatedRequest($httpRequest);
+	$code = $response->getResponseHttpCode();
+	if (308 == $code) {
+	  $range = explode('-', $response->getResponseHeader('range'));
+	  $this->progress = $range[1] + 1;
+	  return false;
+	} else {
+	  return Google_REST::decodeHttpResponse($response);
+	}
   }
 
   private function getResumeUri(Google_HttpRequest $httpRequest) {
-    $result = null;
-    $body = $httpRequest->getPostBody();
-    if ($body) {
-      $httpRequest->setRequestHeaders(array(
-        'content-type' => 'application/json; charset=UTF-8',
-        'content-length' => Google_Utils::getStrLen($body),
-        'x-upload-content-type' => $this->mimeType,
-        'x-upload-content-length' => $this->size,
-        'expect' => '',
-      ));
-    }
-
-    $response = Google_Client::$io->makeRequest($httpRequest);
-    $location = $response->getResponseHeader('location');
-    $code = $response->getResponseHttpCode();
-    if (200 == $code && true == $location) {
-      return $location;
-    }
-    throw new Google_Exception("Failed to start the resumable upload");
+	$result = null;
+	$body = $httpRequest->getPostBody();
+	if ($body) {
+	  $httpRequest->setRequestHeaders(array(
+		'content-type' => 'application/json; charset=UTF-8',
+		'content-length' => Google_Utils::getStrLen($body),
+		'x-upload-content-type' => $this->mimeType,
+		'x-upload-content-length' => $this->size,
+		'expect' => '',
+	  ));
+	}
+
+	$response = Google_Client::$io->makeRequest($httpRequest);
+	$location = $response->getResponseHeader('location');
+	$code = $response->getResponseHttpCode();
+	if (200 == $code && true == $location) {
+	  return $location;
+	}
+	throw new Google_Exception("Failed to start the resumable upload");
   }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -52,12 +52,12 @@ 
    * @param bool $chunkSize File will be uploaded in chunks of this many bytes.
    * only used if resumable=True
    */
-  public function __construct($mimeType, $data, $resumable=false, $chunkSize=false) {
+  public function __construct($mimeType, $data, $resumable = false, $chunkSize = false) {
     $this->mimeType = $mimeType;
     $this->data = $data;
     $this->size = strlen($this->data);
     $this->resumable = $resumable;
-    if(!$chunkSize) {
+    if (!$chunkSize) {
       $chunkSize = 256 * 1024;
     }
     $this->chunkSize = $chunkSize;
@@ -125,14 +125,14 @@ 
       // This is a multipart/related upload.
       $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
       $boundary = str_replace('"', '', $boundary);
-      $payload['content-type'] = 'multipart/related; boundary=' . $boundary;
+      $payload['content-type'] = 'multipart/related; boundary='.$boundary;
       $related = "--$boundary\r\n";
       $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
+      $related .= "\r\n".json_encode($meta)."\r\n";
       $related .= "--$boundary\r\n";
       $related .= "Content-Type: $mimeType\r\n";
       $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($data) . "\r\n";
+      $related .= "\r\n".base64_encode($data)."\r\n";
       $related .= "--$boundary--";
       $payload['postBody'] = $related;
     }
@@ -150,7 +150,7 @@ 
   public static function processFileUpload($file, $mime) {
     if (!$file) return array();
     if (substr($file, 0, 1) != '@') {
-      $file = '@' . $file;
+      $file = '@'.$file;
     }
 
     // This is a standard file upload with curl.
@@ -209,7 +209,7 @@ 
   }
 
 
-  public function nextChunk(Google_HttpRequest $req, $chunk=false) {
+  public function nextChunk(Google_HttpRequest $req, $chunk = false) {
     if (false == $this->resumeUri) {
       $this->resumeUri = $this->getResumeUri($req);
     }

Braces +4 added lines, -4 removed lines

@@ -119,9 +119,7 @@ 
       // This is a simple media upload.
       $payload['content-type'] = $mimeType;
       $payload['postBody'] = $data;
-    }
-
-    elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+    } elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
       // This is a multipart/related upload.
       $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
       $boundary = str_replace('"', '', $boundary);
@@ -148,7 +146,9 @@ 
    * @visible For testing.
    */
   public static function processFileUpload($file, $mime) {
-    if (!$file) return array();
+    if (!$file) {
+    	return array();
+    }
     if (substr($file, 0, 1) != '@') {
       $file = '@' . $file;
     }

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]);
       }
     }