ソースを参照

ZF-11177: Update Zend_Gdata to use HTTPS by default for all services that fully support it.

This enables HTTPS by default for the following services:
- Zend_Gdata_Books
- Zend_Gdata_Calendar
- Zend_Gdata_Docs
- Zend_Gdata_Gbase
- Zend_Gdata_Photos
- Zend_Gdata_Spreadsheets

Notably, Zend_Gdata_YouTube is omitted due to blocking issues on YouTube's end.


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23804 1589e24e-76c8-4bf2-8f94-c092ebc2bf4e
tjohns 15 年 前
コミット
4ecac7f2b9

+ 3 - 3
library/Zend/Gdata/Books.php

@@ -62,9 +62,9 @@ require_once 'Zend/Gdata/Books/VolumeFeed.php';
  */
 class Zend_Gdata_Books extends Zend_Gdata
 {
-    const VOLUME_FEED_URI = 'http://books.google.com/books/feeds/volumes';
-    const MY_LIBRARY_FEED_URI = 'http://books.google.com/books/feeds/users/me/collections/library/volumes';
-    const MY_ANNOTATION_FEED_URI = 'http://books.google.com/books/feeds/users/me/volumes';
+    const VOLUME_FEED_URI = 'https://books.google.com/books/feeds/volumes';
+    const MY_LIBRARY_FEED_URI = 'https://books.google.com/books/feeds/users/me/collections/library/volumes';
+    const MY_ANNOTATION_FEED_URI = 'https://books.google.com/books/feeds/users/me/volumes';
     const AUTH_SERVICE_NAME = 'print';
 
     /**

+ 2 - 2
library/Zend/Gdata/Calendar.php

@@ -59,8 +59,8 @@ require_once 'Zend/Gdata/Calendar/ListEntry.php';
 class Zend_Gdata_Calendar extends Zend_Gdata
 {
 
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
-    const CALENDAR_EVENT_FEED_URI = 'http://www.google.com/calendar/feeds/default/private/full';
+    const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds';
+    const CALENDAR_EVENT_FEED_URI = 'https://www.google.com/calendar/feeds/default/private/full';
     const AUTH_SERVICE_NAME = 'cl';
 
     protected $_defaultPostUri = self::CALENDAR_EVENT_FEED_URI;

+ 3 - 3
library/Zend/Gdata/Calendar/EventQuery.php

@@ -45,7 +45,7 @@ require_once('Zend/Gdata/Query.php');
 class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query
 {
 
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
+    const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds';
 
     /**
      * The default URI used for feeds.
@@ -91,9 +91,9 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query
     /**
      * Create Gdata_Calendar_EventQuery object.  If a URL is provided,
      * it becomes the base URL, and additional URL components may be
-     * appended.  For instance, if $url is 'http://www.google.com/calendar',
+     * appended.  For instance, if $url is 'https://www.google.com/calendar',
      * the default URL constructed will be
-     * 'http://www.google.com/calendar/default/public/full'.
+     * 'https://www.google.com/calendar/default/public/full'.
      *
      * If the URL already contains a calendar ID, projection, visibility,
      * event ID, or comment ID, you will need to set these fields to null

+ 6 - 6
library/Zend/Gdata/Docs.php

@@ -59,10 +59,10 @@ require_once 'Zend/Gdata/App/Extension/Title.php';
 class Zend_Gdata_Docs extends Zend_Gdata
 {
 
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full';
-    const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full';
-    const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind';
-    const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder';
+    const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents/private/full';
+    const DOCUMENTS_FOLDER_FEED_URI = 'https://docs.google.com/feeds/folders/private/full';
+    const DOCUMENTS_CATEGORY_SCHEMA = 'https://schemas.google.com/g/2005#kind';
+    const DOCUMENTS_CATEGORY_TERM = 'https://schemas.google.com/docs/2007#folder';
     const AUTH_SERVICE_NAME = 'writely';
 
     protected $_defaultPostUri = self::DOCUMENTS_LIST_FEED_URI;
@@ -162,7 +162,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
      * @return Zend_Gdata_Docs_DocumentListEntry
      */
     public function getDoc($docId, $docType) {
-        $location = 'http://docs.google.com/feeds/documents/private/full/' .
+        $location = 'https://docs.google.com/feeds/documents/private/full/' .
             $docType . '%3A' . $docId;
         return $this->getDocumentListEntry($location);
     }
@@ -215,7 +215,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *         which are enumerated in SUPPORTED_FILETYPES.
      * @param string $uri (optional) The URL to which the upload should be
      *         made.
-     *         Example: 'http://docs.google.com/feeds/documents/private/full'.
+     *         Example: 'https://docs.google.com/feeds/documents/private/full'.
      * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly
      *         created Google Document.
      */

+ 1 - 1
library/Zend/Gdata/Docs/Query.php

@@ -45,7 +45,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
      *
      * @var string
      */
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents';
+    const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents';
 
     /**
      * The generic base URL used by some inherited methods

+ 2 - 2
library/Zend/Gdata/Gbase.php

@@ -63,12 +63,12 @@ class Zend_Gdata_Gbase extends Zend_Gdata
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
+    const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 
     /**
      * Authentication service name for Google Base

+ 1 - 1
library/Zend/Gdata/Gbase/ItemQuery.php

@@ -48,7 +48,7 @@ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 
     /**
      * The default URI for POST methods

+ 2 - 2
library/Zend/Gdata/Gbase/Query.php

@@ -43,12 +43,12 @@ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query
     /**
      * Path to the customer items feeds on the Google Base server.
      */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
+    const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items';
 
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
+    const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 
     /**
      * The default URI for POST methods

+ 1 - 1
library/Zend/Gdata/Gbase/SnippetQuery.php

@@ -47,7 +47,7 @@ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query
     /**
      * Path to the snippets feeds on the Google Base server.
      */
-    const BASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
+    const BASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets';
 
     /**
      * The default URI for POST methods

+ 2 - 2
library/Zend/Gdata/Photos.php

@@ -58,8 +58,8 @@ require_once 'Zend/Gdata/Photos/PhotoFeed.php';
 class Zend_Gdata_Photos extends Zend_Gdata
 {
 
-    const PICASA_BASE_URI = 'http://picasaweb.google.com/data';
-    const PICASA_BASE_FEED_URI = 'http://picasaweb.google.com/data/feed';
+    const PICASA_BASE_URI = 'https://picasaweb.google.com/data';
+    const PICASA_BASE_FEED_URI = 'https://picasaweb.google.com/data/feed';
     const AUTH_SERVICE_NAME = 'lh2';
 
     /**

+ 2 - 2
library/Zend/Gdata/Spreadsheets.php

@@ -94,8 +94,8 @@ require_once('Zend/Gdata/Spreadsheets/CellQuery.php');
  */
 class Zend_Gdata_Spreadsheets extends Zend_Gdata
 {
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds/spreadsheets';
-    const SPREADSHEETS_POST_URI = 'http://spreadsheets.google.com/feeds/spreadsheets/private/full';
+    const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds/spreadsheets';
+    const SPREADSHEETS_POST_URI = 'https://spreadsheets.google.com/feeds/spreadsheets/private/full';
     const WORKSHEETS_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#worksheetsfeed';
     const LIST_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#listfeed';
     const CELL_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#cellsfeed';

+ 1 - 1
library/Zend/Gdata/Spreadsheets/CellQuery.php

@@ -45,7 +45,7 @@ require_once('Zend/Gdata/Query.php');
 class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_CELL_FEED_URI = 'http://spreadsheets.google.com/feeds/cells';
+    const SPREADSHEETS_CELL_FEED_URI = 'https://spreadsheets.google.com/feeds/cells';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_CELL_FEED_URI;
     protected $_visibility = 'private';

+ 1 - 1
library/Zend/Gdata/Spreadsheets/DocumentQuery.php

@@ -45,7 +45,7 @@ require_once('Zend/Gdata/Query.php');
 class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds';
+    const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_FEED_URI;
     protected $_documentType;

+ 1 - 1
library/Zend/Gdata/Spreadsheets/ListQuery.php

@@ -45,7 +45,7 @@ require_once('Zend/Gdata/Query.php');
 class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query
 {
 
-    const SPREADSHEETS_LIST_FEED_URI = 'http://spreadsheets.google.com/feeds/list';
+    const SPREADSHEETS_LIST_FEED_URI = 'https://spreadsheets.google.com/feeds/list';
 
     protected $_defaultFeedUri = self::SPREADSHEETS_LIST_FEED_URI;
     protected $_visibility = 'private';