Merge pull request #146 from annando/master

Picture posts for statusnet, picture posts with twitter are working again - and some "fromglus" stuff

diff --git a/fbpost.tgz b/fbpost.tgz
index 823a4f3cb41cf9dc2ceda0728c5a91bb054a124b..7aefd5dbaa73b6da06a0c601077abb322c38d68a 100644 (file)
Binary files a/fbpost.tgz and b/fbpost.tgz differ

diff --git a/fromgplus.tgz b/fromgplus.tgz
index ce6f1b1465346c4902722fe568b26403b6c7444f..4c5fb12301838965c6c6d30ba8624923b14d0e1b 100644 (file)
Binary files a/fromgplus.tgz and b/fromgplus.tgz differ

diff --git a/public_server.tgz b/public_server.tgz
index 8fcf6108322fd8b778b06ee8bbf75ded3556e784..ec9c0177f7e926dfdd3ea96f763bf0469f80cd31 100755 (executable)
Binary files a/public_server.tgz and b/public_server.tgz differ

diff --git a/pumpio.tgz b/pumpio.tgz
index e2492b16167e89b2a699a8fe5fc75f156123c0a3..2441430798781e2cf252d7a95253b4e88aa61502 100644 (file)
Binary files a/pumpio.tgz and b/pumpio.tgz differ

diff --git a/retriever.tgz b/retriever.tgz
index 8e5a03f0f6c1f243e9e8db3ced49cfbcf8ae43b6..a2aae6ef0bce9e7fc6e32d35c8f65a8a8c8eb8e4 100644 (file)
Binary files a/retriever.tgz and b/retriever.tgz differ

diff --git a/retriever/retriever.php b/retriever/retriever.php
index e96324caf85609d97032e0a49d9b3b0579c0b4fc..1090c8b59e67ea97d19ffea55dabe5debf0f1f8c 100644 (file)
--- a/retriever/retriever.php
+++ b/retriever/retriever.php
@@ -445,8 +445,8 @@ function retriever_apply_dom_filter($retriever, &$item, $resource) {
     $item['body'] .= "\n\n" . t('Retrieved') . ' ' . date("Y-m-d") . ': [url=';
     $item['body'] .=  $item['plink'];
     $item['body'] .= ']' . $item['plink'] . '[/url]';
-    q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d",
-      dbesc($item['body']), dbesc(datetime_convert('UTC', 'UTC')), intval($item['id']));
+    q("UPDATE `item` SET `body` = '%s' WHERE `id` = %d",
+      dbesc($item['body']), intval($item['id']));
 }
 
 function retrieve_images(&$item) {
@@ -482,11 +482,11 @@ function retriever_check_item_completed(&$item)
     $item['visible'] = $waiting ? 0 : 1;
     if (($item['id'] > 0) && ($old_visible != $item['visible'])) {
         logger('retriever_check_item_completed: changing visible flag to ' . $item['visible'] . ' and invoking notifier ("edit_post", ' . $item['id'] . ')', LOGGER_DEBUG);
-        q("UPDATE `item` SET `visible` = %d, `edited` = '%s' WHERE `id` = %d",
+        q("UPDATE `item` SET `visible` = %d WHERE `id` = %d",
           intval($item['visible']),
-          dbesc(datetime_convert('UTC', 'UTC')),
           intval($item['id']));
-        proc_run('php', "include/notifier.php", 'edit_post', $item['id']);
+// disable due to possible security issue
+//        proc_run('php', "include/notifier.php", 'edit_post', $item['id']);
     }
 }
 
@@ -586,8 +586,7 @@ function retriever_transform_images(&$item, $resource) {
     }
 
     $item['body'] = $transformed;
-    q("UPDATE `item` SET `edited` = '%s', `body` = '%s' WHERE `plink` = '%s' AND `uid` = %d AND `contact-id` = %d",
-      dbesc(datetime_convert('UTC', 'UTC')),
+    q("UPDATE `item` SET `body` = '%s' WHERE `plink` = '%s' AND `uid` = %d AND `contact-id` = %d",
       dbesc($item['body']),
       dbesc($item['plink']),
       intval($item['uid']),

diff --git a/statusnet.tgz b/statusnet.tgz
index d560e9b5adebc5e7d0838bf4fa9565e595772450..57ce110b98c49c6701784aa47c69c24bb7ee7937 100755 (executable)
Binary files a/statusnet.tgz and b/statusnet.tgz differ

diff --git a/twitter.tgz b/twitter.tgz
old mode 100755 (executable)
new mode 100644 (file)
index 945586c..795a7cd
Binary files a/twitter.tgz and b/twitter.tgz differ

diff --git a/webrtc.tgz b/webrtc.tgz
index 0901c2645c638cd354937c666f9c07b96c333849..44c00da9c5c2adb0140e70edd12486b83f55c77b 100644 (file)
Binary files a/webrtc.tgz and b/webrtc.tgz differ

diff --git a/wppost.tgz b/wppost.tgz
index 404ea13424a62b5f5386aa2ef07ab601ec494d98..710221d8f391df80be5b5e4711fe7ab89e5c9db3 100755 (executable)
Binary files a/wppost.tgz and b/wppost.tgz differ