Changeset 995586

Timestamp:

09/23/2014 06:06:08 PM (12 years ago)

Author:

sebstein

Message:

merge feature branch import-all-branch into trunk 993754:995583

Location:

g-crossposting/trunk

Files:

• . (modified) (1 prop)
• admin.php (modified) (2 diffs)
• g-crossposting.php (modified) (9 diffs)
• lang/g-crossposting-de_DE.mo (modified) (previous)
• lang/g-crossposting-de_DE.po (modified) (3 diffs)
• lang/g-crossposting.pot (modified) (1 diff)
• readme.txt (modified) (2 diffs)

g-crossposting/trunk/admin.php

@@ -18 +18 @@
 // remove any old messages from cookie
 $g_crossposting_msg = null;
+
+// provide admins a hook to trigger manual import of ALL activities
+if (array_key_exists('g_crossposting_manual_import_all', $_GET)) {
+    $total_activities = g_crossposting_update_all();
+    g_crossposting_add_error('g_crossposting_err_import_all', __('Manual import of all '.$total_activities.' Google+ activities done.', 'g-crossposting'));
+}
 
 // provide admins a hook to trigger manual import of activities
@@ -252 +258 @@
     _e('manually check for new activities and import them', 'g-crossposting');
     echo '</a></div>';
-/*
-    $options = g_crossposting_get_settings();
-
-    // get latest Google+ activities
-    $ch = curl_init("https://www.googleapis.com/plus/v1/people/{$options['gplusid']}/activities/public?alt=json&maxResults={$options['maxactivities']}&key={$options['apikey']}");
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    $activities = curl_exec($ch);
-    curl_close($ch);
-
-$activities = json_decode($activities);
-
-$no_posts = 0;
-$no_shares = 0;
-$no_unknown = 0;
-
-foreach($activities->items as $item) {
-    switch ($item->verb) {
-        case 'post':
-            $no_posts++;
-            break;
-        case 'share':
-            $no_shares++;
-            break;
-        default:
-            $no_unknown++;
-            break;
-    }
-        
-}
-print 'Found '.count($activities->items).' public activities on your Google+ account.<br />';
-print 'You got '.$no_posts.' posts.<br />';
-print 'You got '.$no_shares.' shares.<br />';
-print 'You got '.$no_unknown.' unknown activities.<br />';
-
-print '<pre>';
-foreach($activities->items as $item) {
-print '----------------new item---------------\n';
-var_dump($item);
-}
-print '</pre>';
-*/
-
+
+    echo '<div id="g-crossposting-manual-import-all"><strong>';
+    _e('Manual mass import ALL:', 'g-crossposting');
+    echo '</strong> <a href="?page=g-crossposting-key-config&amp;g_crossposting_manual_import_all=true">';
+    _e('manually check for ALL activities and import them', 'g-crossposting');
+    echo '</a></div>';
     echo '</div>';
 }

g-crossposting/trunk/g-crossposting.php

@@ -4 +4 @@
     Plugin URI: http://wordpress.org/extend/plugins/g-crossposting/
     Description: Imports your public Google+ activities in your Wordpress blog.
-    Version: 1.5.0
+    Version: 1.6.0
     Author: Sebastian Stein
     Author URI: http://sebstein.hpfsc.de/
@@ -144 +144 @@
 
 /**
- *  checks Google+ for new activities and posts them
+ *  checks Google+ for new activities and post them
  */
 function g_crossposting_update() {
@@ -174 +174 @@
     // 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) {
+    if (g_crossposting_api_activities_list($options['gplusid'], $options['apikey'], 1, "") == null) {
         // either settings are wrong or gplus is offline
 
@@ -215 +215 @@
  *  @return array with activities or null
  */
-function g_crossposting_api_activities_list($p_gplusid, $p_apikey, $p_maxactivities) {
+function g_crossposting_api_activities_list($p_gplusid, $p_apikey, $p_maxactivities, $p_pagetoken) {
     // 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}");
+    $ch = curl_init("https://www.googleapis.com/plus/v1/people/{$p_gplusid}/activities/public?alt=json&maxResults={$p_maxactivities}&key={$p_apikey}&pageToken={$p_pagetoken}");
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     $activities = curl_exec($ch);
@@ -245 +245 @@
     // get activities from Google+
     $activities = g_crossposting_api_activities_list($options['gplusid'],
-                            $options['apikey'], $options['maxactivities']);
+                            $options['apikey'], $options['maxactivities'], "");
     if ($activities == null) {
         return null;
@@ -277 +277 @@
     // go through all given activities and post them
     $latest_activity_id = null;
+    $posts_updated = 0;
     foreach ($activities as $activity) {
         // store ID of latest activity so that we know what was posted already
@@ -299 +300 @@
             continue;
         }
+
+        // we found a new post, so let's increment our counter
+        $posts_updated++;
 
         // get options to configure way how activities get imported
@@ -415 +419 @@
         }
     }
+    return $posts_updated;
 }
 
@@ -506 +511 @@
     return FALSE;
 }
+
+/**
+*  checks Google+ for all activities and posts them
+*/
+function g_crossposting_update_all() {
+    // first check if all settings are in place
+    if (! g_crossposting_is_enabled()) {
+        return;
+    }
+
+    // get all activities
+    $all_activities = array();
+    $all_activities = g_crossposting_get_all_activities();
+    if ($all_activities == null) {
+        return;
+    }
+
+    // post new activities on blog
+    $new_activities_count = g_crossposting_post_new($all_activities);
+    return $new_activities_count.' out of '.count($all_activities);
+}
+
+/**
+*  returns all activities
+*
+*  @return array of all activities found on Google+
+*/
+function g_crossposting_get_all_activities() {
+    // load options
+    $options = g_crossposting_get_settings();
+
+    // go through all activities
+    $all_activities = array();
+    $nextPageToken = null;
+    do
+    {
+        $activities = g_crossposting_api_activities_list($options['gplusid'],
+                            $options['apikey'], $options['maxactivities'], $nextPageToken);
+        if ($activities == null) {
+            return null;
+        }
+
+        $nextPageToken = $activities->nextPageToken;
+        foreach ($activities->items as $activity)
+        {
+            $all_activities[] = $activity;
+        }
+    }
+    while($nextPageToken != null);
+
+    if (count($all_activities) > 0) {
+        return $all_activities;
+    } else {
+        return null;
+    }
+}

g-crossposting/trunk/lang/g-crossposting-de_DE.po

@@ -95 +95 @@
 msgstr "Änderungen speichern"
 
-#: admin.php:257
+#: admin.php:256
 #@ g-crossposting
 msgid "Manual mass import:"
@@ -101 +101 @@
 
 #: admin.php:54
+#@ g-crossposting
 msgid "Authentication Settings"
 msgstr "Anmeldeinformationen für Google+"
 
 #: admin.php:55
+#@ g-crossposting
 msgid "Setup Options"
 msgstr "Verhalten des Plugins"
 
-#: admin.php:259
+#: admin.php:258
 #@ g-crossposting
 msgid "manually check for new activities and import them"
 msgstr "auf neue Aktivitäten prüfen und diese sofort importieren"
+
+#: admin.php:262
+#@ g-crossposting
+msgid "Manual mass import ALL:"
+msgstr "Manueller Massenimport aller Aktivitäten:"
+
+#: admin.php:264
+#@ g-crossposting
+msgid "manually check for ALL activities and import them"
+msgstr "manuellen Import aller Aktivitäten anstoßen"
 
 #: g-crossposting.php:89
@@ -141 +153 @@
 
 #. Author URI of the plugin/theme
+#@ g-crossposting
 msgid "http://sebstein.hpfsc.de/"
 msgstr "http://sebstein.hpfsc.de/"

g-crossposting/trunk/lang/g-crossposting.pot

@@ -87 +87 @@
 msgstr ""
 
-#: admin.php:257
+#: admin.php:256
 msgid "Manual mass import:"
 msgstr ""
 
-#: admin.php:259
+#: admin.php:258
 msgid "manually check for new activities and import them"
+msgstr ""
+
+#: admin.php:262
+msgid "Manual mass import ALL:"
+msgstr ""
+
+#: admin.php:264
+msgid "manually check for ALL activities and import them"
 msgstr ""
 

g-crossposting/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.0
 Tested up to: 4.0
-Stable tag: 1.5.0
+Stable tag: 1.6.0
 
 Imports your public Google+ activities in your Wordpress blog.
@@ -127 +127 @@
 == Changelog ==
 
+= 1.6.0 =
+
+* Plugin settings now provide a link to manually import ALL Google+ activities.
+  Many thanks to krischel for providing this patch!
+
 = 1.5.0 =