Changeset 991985

Timestamp:

09/17/2014 03:12:44 PM (11 years ago)

Author:

djtidau

Message:

1.2.0

Location:

sm2wp-google-minimal

Files:

• tags/1.2.0 (added)
• tags/1.2.0/classes (added)
• tags/1.2.0/classes/common.php (added)
• tags/1.2.0/classes/google_plus.php (added)
• tags/1.2.0/classes/sm2wp_googleplus.php (added)
• tags/1.2.0/classes/sm2wp_googleplus_admin.php (added)
• tags/1.2.0/readme.txt (added)
• tags/1.2.0/sm2wp.php (added)
• tags/1.2.0/views (added)
• tags/1.2.0/views/admin.php (added)
• trunk/classes/google_plus.php (modified) (5 diffs)
• trunk/classes/sm2wp_googleplus_admin.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/sm2wp.php (modified) (1 diff)
• trunk/views/admin.php (modified) (2 diffs)

sm2wp-google-minimal/trunk/classes/google_plus.php

@@ -337 +337 @@
         }
 
+        $authString = $this->_parent->apiKey ? 'key='.$this->_parent->apiKey : 'access_token='.$this->_parent->accessToken;
         do
         {
-            list($s, $r) = SM2WP_GooglePlus_Library::get(SM2WP_GooglePlus_Library::API_URL."activities/$this->id/comments?maxResults=100&pageToken=$pageToken&access_token=".$this->_parent->accessToken);
+            list($s, $r) = SM2WP_GooglePlus_Library::get(SM2WP_GooglePlus_Library::API_URL."activities/$this->id/comments?maxResults=100&pageToken=$pageToken&".$authString);
 
             if (!$r) {
@@ -379 +380 @@
     public $author = null;
 
+    public $apiKey = null;
+    public $authString = null;
+
     public function __construct($id, $accessToken, $profileId, $name=null, $avatar=null, $author=null) {
         $this->id = $id;
@@ -386 +390 @@
         $this->avatar = $avatar;
         $this->author = $author;
+        $this->apiKey = get_option('gfw_api_key');
+
+        $this->authString = $this->apiKey ? 'key='.$this->apiKey : 'access_token='.$this->accessToken;
     }
 
@@ -431 +438 @@
 
     public function update_profile() {
-        $url = SM2WP_GooglePlus_Library::API_URL.'people/'.$this->profileId.'?access_token='.$this->accessToken;
+        $url = SM2WP_GooglePlus_Library::API_URL.'people/'.$this->profileId."?$this->authString";
         list($s, $r) = SM2WP_GooglePlus_Library::get($url);
 //         if (in_array($s, array(401,403))) {
-        if (!$r || json_decode($r)->error) {
+        if (!$this->apiKey && (!$r || json_decode($r)->error)) {
             $this->refresh();
             $url = SM2WP_GooglePlus_Library::API_URL.'people/'.$this->profileId.'?access_token='.$this->accessToken;
@@ -455 +462 @@
         $maxResolution = get_option('gfw_max_resolution', 1024);
         do {
-            $url = SM2WP_GooglePlus_Library::API_URL."people/$this->profileId/activities/public?access_token=$this->accessToken&maxResults=$maxResults&pageToken=$pageToken";
+
+            $url = SM2WP_GooglePlus_Library::API_URL."people/$this->profileId/activities/public?maxResults=$maxResults&pageToken=$pageToken&$this->authString";
             list($s, $r) = SM2WP_GooglePlus_Library::get($url);
 
             #if (in_array($s, array(401,403))) {
-            if (!$r || json_decode($r)->error) {
+            if (!$this->apiKey && (!$r || json_decode($r)->error)) {
                 $this->refresh();
                 $url = SM2WP_GooglePlus_Library::API_URL."people/$this->profileId/activities/public?access_token=$this->accessToken&maxResults=$maxResults&pageToken=$pageToken";

sm2wp-google-minimal/trunk/classes/sm2wp_googleplus_admin.php

@@ -115 +115 @@
 
         register_setting('gfw_profiles', 'gfw_profiles');
+    register_setting('gfw_api', 'gfw_api_key', array($this, 'api_key_resolution_changed'));
         register_setting('gfw_import_settings', 'gfw_history');
         register_setting('gfw_import_settings', 'gfw_comments');
@@ -133 +134 @@
     }
 
+    public function api_key_resolution_changed($api_key) {
+      if (!trim($api_key)) {
+        if (get_option('gfw_history') > 100) update_option('gfw_history', 100);
+        if (get_option('gfw_comments')) update_option('gfw_comments', false);
+      }
+      return trim($api_key);
+    }
+
     public function max_resolution_changed($max_resolution) {
-        if (!$max_resolution) $max_resolution = '1024';
+        if (!trim($max_resolution)) $max_resolution = '1024';
         return $max_resolution;
     }

sm2wp-google-minimal/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.0
-Stable tag: 1.1.9
+Stable tag: 1.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -47 +47 @@
 
 == Changelog ==
+
+= 1.2.0 =
+* Added API Key setting to ensure a way around exceeded quotas
 
 = 1.1.9 =

sm2wp-google-minimal/trunk/sm2wp.php

@@ -4 +4 @@
  * Plugin URI:      http://sm2wp.com
  * Description:     Import your Google+ Posts to your WordPress Blog
- * Version:         1.1.9
+ * Version:         1.2.0
  * Author:            Daniel Treadwell
  * Author URI:      http://minimali.se

sm2wp-google-minimal/trunk/views/admin.php

@@ -138 +138 @@
         </div>
     </div>
-
-
-
     <div id='dashboard-widgets-wrap'>
         <div id='dashboard-widgets' class='metabox-holder'>
@@ -252 +249 @@
     <div id='side-sortables' class="meta-box-sortables ui-sortable">
 
+<div class='postbox'>
+
+    <h3 class='hndle' style='cursor:default;'>Connectivity</h3>
+    <div class="inside">
+        <div class="main">
+            <form action='options.php' method='POST'>
+            <?php settings_fields( 'gfw_api' ); ?>
+
+<ul>
+
+
+    <li style='clear:both;'>
+        <b>API Key</b>
+        <input style='float:right;margin-top:6px;' size='35' type='text' name='gfw_api_key' value='<?php echo get_option('gfw_api_key') ?>' />
+        <a style='display:block;' href='#'>What is this?</a>
+    </li>
+
+    </ul>
+    <input type='submit' class='button button-primary' value='Update Key'>
+</form>
+</div>
+</div>
+</div>
+
 
 <div class='postbox'>