Merge pull request googleglass#12 from googleglass/upgrade-client-lib

Upgraded PHP API client library to 0.6.6 (which enables XE8 features), s...

Author: allevato

google-api-php-client/LICENSE

@@ -15,12 +15,8 @@
  * limitations under the License.
  */
 
-// Check for the required json and curl extensions, the Google APIs PHP Client
-// won't function without them.
-if (! function_exists('curl_init')) {
-  throw new Exception('Google PHP API Client requires the CURL PHP extension');
-}
-
+// Check for the json extension, the Google APIs PHP Client won't function
+// without it.
 if (! function_exists('json_decode')) {
   throw new Exception('Google PHP API Client requires the JSON PHP extension');
 }
@@ -365,6 +361,19 @@ public function getScopes() {
      return $this->scopes;
   }
 
+  /**
+   * If 'plus.login' is included in the list of requested scopes, you can use
+   * this method to define types of app activities that your app will write.
+   * You can find a list of available types here:
+   * @link https://developers.google.com/+/api/moment-types
+   *
+   * @param array $requestVisibleActions Array of app activity types
+   */
+  public function setRequestVisibleActions($requestVisibleActions) {
+    self::$auth->requestVisibleActions =
+            join(" ", $requestVisibleActions);
+  }
+
   /**
    * Declare if objects should be returned by the api service classes.
    *

google-api-php-client/NOTICE

@@ -43,7 +43,6 @@ class Google_AssertionCredentials {
    * @param string $assertionType
    * @param bool|string $sub The email address of the user for which the
    *               application is requesting delegated access.
-   *
    */
   public function __construct(
       $serviceAccountName,

google-api-php-client/README

@@ -35,6 +35,7 @@ class Google_OAuth2 extends Google_Auth {
   public $state;
   public $accessType = 'offline';
   public $approvalPrompt = 'force';
+  public $requestVisibleActions;
 
   /** @var Google_AssertionCredentials $assertionCredentials */
   public $assertionCredentials;
@@ -137,6 +138,13 @@ public function createAuthUrl($scope) {
         'approval_prompt=' . urlencode($this->approvalPrompt),
     );
 
+    // if the list of scopes contains plus.login, add request_visible_actions
+    // to auth URL
+    if(strpos($scope, 'plus.login') && count($this->requestVisibleActions) > 0) {
+        $params[] = 'request_visible_actions=' .
+            urlencode($this->requestVisibleActions);
+    }
+
     if (isset($this->state)) {
       $params[] = 'state=' . urlencode($this->state);
     }

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

@@ -97,7 +97,7 @@ public function get($key, $expiration = false) {
     if (($ret = @memcache_get($this->connection, $key)) === false) {
       return false;
     }
-    if (! $expiration || (time() - $ret['time'] > $expiration)) {
+    if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
       $this->delete($key);
       return false;
     }