diff options
| author | zottel <github@zottel.net> | 2012-06-06 08:08:09 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-06-06 08:08:09 +0200 |
| commit | 2a83ebf77f87037c437f957a471764ad0c817235 (patch) | |
| tree | 69d23ee01f73b3eae42cb9977236612e4e02725c /include | |
| parent | ef6446288ba4b7590cbb770cdf3c84524f96fd34 (diff) | |
| parent | 6c3ab225f72a01a67fab0d896a7ad20f77f7f2b2 (diff) | |
| download | volse-hubzilla-2a83ebf77f87037c437f957a471764ad0c817235.tar.gz volse-hubzilla-2a83ebf77f87037c437f957a471764ad0c817235.tar.bz2 volse-hubzilla-2a83ebf77f87037c437f957a471764ad0c817235.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/Scrape.php | 3 | ||||
| -rw-r--r-- | include/api.php | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/include/Scrape.php b/include/Scrape.php index 227252600..ca8f6e83a 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -435,10 +435,13 @@ function probe_url($url, $mode = PROBE_NORMAL) { $password = ''; openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']); $mbox = email_connect($mailbox,$r[0]['user'],$password); + if(! $mbox) + logger('probe_url: email_connect failed.'); unset($password); } if($mbox) { $msgs = email_poll($mbox,$orig_url); + logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG); if(count($msgs)) { $addr = $orig_url; $network = NETWORK_MAIL; diff --git a/include/api.php b/include/api.php index 5c17b35f5..9925b5766 100644 --- a/include/api.php +++ b/include/api.php @@ -898,7 +898,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_repeat: '.$id); + logger('API: api_statuses_repeat: '.$id); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); @@ -915,13 +915,15 @@ intval($id) ); - $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; - $_REQUEST['profile_uid'] = local_user(); - $_REQUEST['type'] = 'wall'; - $_REQUEST['api_source'] = true; + if ($r[0]['body'] != "") { + $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; + $_REQUEST['profile_uid'] = local_user(); + $_REQUEST['type'] = 'wall'; + $_REQUEST['api_source'] = true; - require_once('mod/item.php'); - item_post($a); + require_once('mod/item.php'); + item_post($a); + } if ($type == 'xml') $ok = "true"; @@ -943,7 +945,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_destroy: '.$id); + logger('API: api_statuses_destroy: '.$id); require_once('include/items.php'); drop_item($id, false); |