Changeset 445382

Timestamp:

09/29/2011 06:58:25 PM (15 years ago)

Author:

sebstein

Message:

• fix: don't produce PHP warning if Google API is not available for some reason ​http://wordpress.org/support/topic/plugin-google-crossposting-invalid-argument-supplied-for-foreach

Location:

g-crossposting/trunk

Files:

• admin.php (modified) (1 diff)
• gplus-crosspost.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

g-crossposting/trunk/admin.php

@@ -174 +174 @@
         $new_input['apikey'] = '';
         g_crossposting_add_error('g_crossposting_err_apikey', __("You provided an invalid Google API key."));
+    }
+
+    // if API key and Google+ are given, check if they are valid
+    if (! empty($new_input['gplusid']) && ! empty($new_input['apikey'])) {
+        if (g_crossposting_api_activities_list($new_input['gplusid'], $new_input['apikey'], 1) == null) {
+            // at least one of both must be wrong
+            $new_input['gplusid'] = '';
+            $new_input['apikey'] = '';
+        }
     }
 

g-crossposting/trunk/gplus-crosspost.php

@@ -148 +148 @@
 
     if (! g_crossposting_check_gplusid($options['gplusid'])) {
+        $options['gplusid'] = '';
+        update_option('g_crossposting_options', $options);
         return FALSE;
     }
 
     if (! g_crossposting_check_apikey($options['apikey'])) {
-        return FALSE;
-    }
-
+        $options['apikey'] = '';
+        update_option('g_crossposting_options', $options);
+        return FALSE;
+    }
+
+    // basic validation showed that we might have valid connection settings
+    // now do an actual connect to see if we are able to connect
+    if (g_crossposting_api_activities_list($options['gplusid'], $options['apikey'], 1) == null) {
+        // in the end we can't say which of both settings is wrong
+        // so we reset both
+        $options['gplusid'] = '';
+        $options['apikey'] = '';
+        update_option('g_crossposting_options', $options);
+
+        return FALSE;
+    }
+
+    // great, we are able to connect to the API
+    //
+    // go on validating remaining settings
     if (! g_crossposting_check_maxactivities($options['maxactivities'])) {
         return FALSE;
@@ -179 +198 @@
 
 /**
- *  returns new activities not yet posted on blog
- *
- *  @return array of new activities or null if no new activities were
- *          found on Google+
- */
-function g_crossposting_get_new_activities() {
-    $options = get_option('g_crossposting_options');
-    $last_activity_id = get_option('g_crossposting_last_activity_id', null);
-
-    // get list of 100 recent activities
-    $ch = curl_init("https://www.googleapis.com/plus/v1/people/{$options['gplusid']}/activities/public?alt=json&maxResults={$options['maxactivities']}&key={$options['apikey']}");
+ *  query Google+ API activities.list function
+ *
+ *  @return array with activities or null
+ */
+function g_crossposting_api_activities_list($p_gplusid, $p_apikey, $p_maxactivities) {
+    // get list of latest p_maxactivities activities
+    $ch = curl_init("https://www.googleapis.com/plus/v1/people/{$p_gplusid}/activities/public?alt=json&maxResults={$p_maxactivities}&key={$p_apikey}");
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     $activities = curl_exec($ch);
     curl_close($ch);
     $activities = json_decode($activities);
+
+    // check if we got errors
+    if ($activities->error) {
+        return null;
+    }
+
+    // looks fine, return activities
+    return $activities;
+}
+
+/**
+ *  returns new activities not yet posted on blog
+ *
+ *  @return array of new activities or null if no new activities were
+ *          found on Google+
+ */
+function g_crossposting_get_new_activities() {
+    // load options
+    $options = get_option('g_crossposting_options');
+    $last_activity_id = get_option('g_crossposting_last_activity_id', null);
+
+    // get activities from Google+
+    $activities = g_crossposting_api_activities_list($options['gplusid'],
+                            $options['apikey'], $options['maxactivities']);
+    if ($activities == null) {
+        return null;
+    }
 
     // go through activities to see if we got some not posted yet

g-crossposting/trunk/readme.txt

@@ -62 +62 @@
 = 1.0.1 =
 * fix: correctly validate Google API key as it may also contain a dash
+* fix: don't produce PHP warning if Google API is not available for some reason
 
 = 1.0 =