From 2e14dc242e552629cac5914e85096d423e6fd43c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 Aug 2013 17:18:13 -0700 Subject: if changing primary hub during an import operation - remove the old xchan and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size. --- mod/import.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'mod') diff --git a/mod/import.php b/mod/import.php index c98f4d2eb..08311013a 100644 --- a/mod/import.php +++ b/mod/import.php @@ -206,10 +206,35 @@ function import_post(&$a) { // import xchans and contact photos + if($seize) { + + // replace our existing xchan if we're seizing control + + $r = q("delete from xchan where xchan_hash = '%s' limit 1", + dbesc($channel['channel_hash']) + ); + + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", + dbesc($channel['channel_hash']), + dbesc($channel['channel_guid']), + dbesc($channel['channel_guid_sig']), + dbesc($channel['channel_pubkey']), + dbesc($a->get_baseurl() . "/photo/profile/l/" . $channel['channel_id']), + dbesc($a->get_baseurl() . "/photo/profile/m/" . $channel['channel_id']), + dbesc($a->get_baseurl() . "/photo/profile/s/" . $channel['channel_id']), + dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), + dbesc(z_root() . '/channel/' . $channel['channel_address']), + dbesc($channel['channel_name']), + dbesc('zot'), + dbesc(datetime_convert()), + dbesc(datetime_convert()) + ); + } $xchans = $data['xchan']; if($xchans) { foreach($xchans as $xchan) { + $r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", dbesc($xchan['xchan_hash']) ); -- cgit v1.2.3 From b9314935e6f85bb0098c651d021ce9bdc2753ecb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 Aug 2013 19:05:11 -0700 Subject: localize_item() thinks all likes on posts are likes on comments because we didn't pass any info in the activity object to distinguish them from each other. --- mod/like.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod') diff --git a/mod/like.php b/mod/like.php index f617391a1..90005eca3 100755 --- a/mod/like.php +++ b/mod/like.php @@ -110,6 +110,7 @@ function like_content(&$a) { $obj = json_encode(array( 'type' => $objtype, 'id' => $item['mid'], + 'parent' => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']), 'link' => $links, 'title' => $item['title'], 'content' => $item['body'], -- cgit v1.2.3 From cd5fdbcb48a2e05198bb9daaf0753e8218ea4285 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 Aug 2013 21:19:39 -0700 Subject: email attachments (and fix email photos) --- mod/message.php | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) (limited to 'mod') diff --git a/mod/message.php b/mod/message.php index 9c6cf75a6..f5a60b73b 100644 --- a/mod/message.php +++ b/mod/message.php @@ -249,7 +249,7 @@ function message_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$nickname' => $channel['channel_addr'], + '$nickname' => $channel['channel_address'], '$linkurl' => t('Please enter a link URL:') )); @@ -293,6 +293,7 @@ function message_content(&$a) { '$select' => $select, '$parent' => '', '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), '$insert' => t('Insert web link'), '$wait' => t('Please wait'), '$submit' => t('Submit') @@ -371,10 +372,39 @@ function message_content(&$a) { foreach($messages as $message) { -// FIXME -// $extracted = item_extract_images($message['body']); -// if($extracted['images']) -// $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']); + $s = $arr = ''; + + if($message['attach']) + $arr = json_decode_plus($message['attach']); + if($arr) { + $s .= '
'; + foreach($arr as $r) { + $matches = false; + $icon = ''; + $icontype = substr($r['type'],0,strpos($r['type'],'/')); + + switch($icontype) { + case 'video': + case 'audio': + case 'image': + case 'text': + $icon = '
'; + break; + default: + $icon = '
'; + break; + } + + $title = htmlentities($r['title'], ENT_COMPAT,'UTF-8'); + if(! $title) + $title = t('unknown.???'); + $title .= ' ' . $r['length'] . ' ' . t('bytes'); + + $url = $a->get_baseurl() . '/magic?f=&hash=' . $message['from_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision']; + $s .= '' . $icon . ''; + } + $s .= '
'; + } $mails[] = array( 'id' => $message['id'], @@ -385,7 +415,7 @@ function message_content(&$a) { 'to_url' => chanlink_hash($message['to_xchan']), 'to_photo' => $message['to']['xchan_photo_m'], 'subject' => $message['title'], - 'body' => smilies(bbcode($message['body'])), + 'body' => smilies(bbcode($message['body']) . $s), 'delete' => t('Delete message'), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), ); @@ -425,6 +455,7 @@ function message_content(&$a) { '$select' => $select, '$parent' => $parent, '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), '$insert' => t('Insert web link'), '$submit' => t('Submit'), '$wait' => t('Please wait') -- cgit v1.2.3