The title for the settings now contain the words "import, "export" or "Mirror" accord...

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 8d60472cbd3b96dc7be7518c0a47741ba38c65d6..852f1fc6b27dc7a4c73ddb98fb26f90c3161cb60 100755 (executable)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger') . '</h3>';
+    $s .= '<h3>' . t('Blogger Export') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger') . '</h3>';
+    $s .= '<h3>' . t('Blogger Export') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blogger-enable-wrapper">';

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index ef8ff51b633c3a80d06c4021c0aafacc98db5612..c9eb337d2a1c6699b8f04fab4bad408ecc6830d7 100755 (executable)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -144,11 +144,11 @@ function diaspora_settings(&$a,&$s) {
        /* Add some HTML to the existing form */
 
        $s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-       $s .= '<h3>' . t('Diaspora') . '</h3>';
+       $s .= '<h3>' . t('Diaspora Export') . '</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-       $s .= '<h3>' . t('Diaspora') . '</h3>';
+       $s .= '<h3>' . t('Diaspora Export') . '</h3>';
        $s .= '</span>';
 
        if ($status) {

diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index dac6cd2ef6daa779faf75ec4ebe1fa2d868b38f0..d05d6e427feb1d0ad56e870ebd8739890573aa28 100644 (file)
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -322,7 +322,7 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
        }
 
        if ($content)
-               $postarray["body"] .= "\n\n";
+               $postarray["body"] .= "\n";
 
        if ($type)
                $postarray["body"] .= "[class=type-".$type."]";

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index ecdf7656942c77208b4a9d054cfa0e9b28b4281c..ca26ce2b1e190964431ede20c1a23ead074c0aad 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -34,11 +34,11 @@ function fromgplus_addon_settings(&$a,&$s) {
        $account = get_pconfig(local_user(),'fromgplus','account');
 
        $s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-       $s .= '<h3>' . t('Google+ Mirroring').'</h3>';
+       $s .= '<h3>' . t('Google+ Mirror').'</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-       $s .= '<h3>' . t('Google+ Mirroring').'</h3>';
+       $s .= '<h3>' . t('Google+ Mirror').'</h3>';
        $s .= '</span>';
 
        $s .= '<div id="fromgplus-wrapper">';
@@ -263,7 +263,7 @@ function fromgplus_handleattachments($item, $displaytext) {
                                break;
 
                        case "article":
-                               $post .= "\n\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+                               $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
                                //if ($images["preview"] != "")

diff --git a/libertree/libertree.php b/libertree/libertree.php
index dec85ddb95c834ef9bb02de2d95c53811f53e504..b064c6bc2bb7d925eeef40ff9e21e2e086bcfe80 100755 (executable)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree') . '</h3>';
+    $s .= '<h3>' . t('libertree Export') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree') . '</h3>';
+    $s .= '<h3>' . t('libertree Export') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="libertree-enable-wrapper">';

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 1fa6c5e6557762045b5cb262bdd57822ea83d8dc..b7c8fc7a97bf127efd91958332ada54df6269bd2 100644 (file)
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -288,11 +288,11 @@ function privacy_image_cache_img_cb($matches) {
 
        // if the picture seems to be from another picture cache then take the original source
        $queryvar = privacy_image_cache_parse_query($matches[2]);
-       if ($queryvar['url'] != "")
+       if (($queryvar['url'] != "") AND (substr($queryvar['url'], 0, 4) == "http"))
                $matches[2] = urldecode($queryvar['url']);
 
        // if fetching facebook pictures don't fetch the thumbnail but the big one
-       if (strpos($matches[2], ".fbcdn.net/") and (substr($matches[2], -6) == "_s.jpg"))
+       if (((strpos($matches[2], ".fbcdn.net/") OR strpos($matches[2], "/fbcdn-photos-"))) and (substr($matches[2], -6) == "_s.jpg"))
                $matches[2] = substr($matches[2], 0, -6)."_n.jpg";
 
        // following line changed per bug #431

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 0280b5170940c707a55fd6eac359011487accf1c..1575f14b2d067ac05d898f296e81a617901d97db 100755 (executable)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io') . '</h3>';
+    $s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io') . '</h3>';
+    $s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 114fcc5b2367941bb39827a7eeb6ac4f06d4126b..06da4393fb3a15b96110e6f96078312dc61f5d64 100755 (executable)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr') . '</h3>';
+    $s .= '<h3>' . t('Tumblr Export') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr') . '</h3>';
+    $s .= '<h3>' . t('Tumblr Export') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 3c7c17b10012579d9bdd984d5d15900d046a592b..ac85662313295a383c2c814b6eff7c9112a939b9 100755 (executable)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress') . '</h3>';
+    $s .= '<h3>' . t('WordPress Export') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress') . '</h3>';
+    $s .= '<h3>' . t('WordPress Export') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';