From 3f432a7b82480dd985dbc2a67ae23cfc1ed258c6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 19:36:59 -0700 Subject: share,retweet,relay,forward, whatever --- mod/display.php | 1 + mod/network.php | 1 + mod/photos.php | 3 ++- mod/profile.php | 1 + mod/profile_photo.php | 2 +- mod/share.php | 23 +++++++++++++++++++++++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 mod/share.php (limited to 'mod') diff --git a/mod/display.php b/mod/display.php index 096ea16c9..f919cba64 100644 --- a/mod/display.php +++ b/mod/display.php @@ -155,6 +155,7 @@ function display_content(&$a) { '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), '$wait' => t('Please wait') )); } diff --git a/mod/network.php b/mod/network.php index 32c7216d4..1f92145d1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -364,6 +364,7 @@ function network_content(&$a, $update = 0) { '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), '$wait' => t('Please wait') )); } diff --git a/mod/photos.php b/mod/photos.php index 929d1c971..4bb6e3eab 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1073,7 +1073,7 @@ function photos_content(&$a) { $tpl = load_view_file('view/photo_item.tpl'); $return_url = $a->cmd; - $like_tpl = load_view_file('view/like.tpl'); + $like_tpl = load_view_file('view/lik_noshare.tpl'); $likebuttons = ''; @@ -1082,6 +1082,7 @@ function photos_content(&$a) { '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), '$wait' => t('Please wait') )); } diff --git a/mod/profile.php b/mod/profile.php index 88fc16ebb..3354bc9a3 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -311,6 +311,7 @@ function profile_content(&$a, $update = 0) { '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), '$wait' => t('Please wait') )); } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 0f84a85c9..5365aa3b8 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -87,7 +87,7 @@ function profile_photo_post(&$a) { ); // Update global directory in background - $url = $_SESSION['my_url']; + $url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; if($url && strlen(get_config('system','directory_submit_url'))) proc_run('php',"include/directory.php","$url"); } diff --git a/mod/share.php b/mod/share.php new file mode 100644 index 000000000..8a8229e8a --- /dev/null +++ b/mod/share.php @@ -0,0 +1,23 @@ +argc > 1) ? intval($a->argv[1]) : 0); + if((! $post_id) || (! local_user())) + killme(); + + $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", + intval($post_id) + ); + if(! count($r) || $r[0]['private']) + killme(); + + $o = ''; + + $o .= '♲ ' . $r[0]['author-name'] . '
'; + $o .= prepare_body($r[0]); + echo $o . '
'; + killme(); +} \ No newline at end of file -- cgit v1.2.3 From 8fd989c568f6452ce1a91914cef4a33c5d3b4d76 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 19:57:13 -0700 Subject: protect tags from double expansion during RT --- mod/item.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mod') diff --git a/mod/item.php b/mod/item.php index 90fb546bc..6e6e822d0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -212,6 +212,8 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { + if(strpos($tag,'[url=')) + continue; $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) @@ -220,6 +222,8 @@ function item_post(&$a) { continue; } if(strpos($tag,'@') === 0) { + if(strpos($tag,'[url=')) + continue; $stat = false; $name = substr($tag,1); if((strpos($name,'@')) || (strpos($name,'http://'))) { -- cgit v1.2.3 From 334353e502db5abd7ee248d183a915ff7468de3a Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 21:14:22 -0700 Subject: vorbis audio/video link buttons --- mod/network.php | 2 ++ mod/profile.php | 2 ++ 2 files changed, 4 insertions(+) (limited to 'mod') diff --git a/mod/network.php b/mod/network.php index 1f92145d1..ad028df1f 100644 --- a/mod/network.php +++ b/mod/network.php @@ -92,6 +92,8 @@ function network_content(&$a, $update = 0) { '$upload' => t('Upload photo'), '$weblink' => t('Insert web link'), '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), '$setloc' => t('Set your location'), '$noloc' => t('Clear browser location'), '$wait' => t('Please wait'), diff --git a/mod/profile.php b/mod/profile.php index 3354bc9a3..a464b7c06 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -157,6 +157,8 @@ function profile_content(&$a, $update = 0) { '$upload' => t('Upload photo'), '$weblink' => t('Insert web link'), '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), '$setloc' => t('Set your location'), '$noloc' => t('Clear browser location'), '$wait' => t('Please wait'), -- cgit v1.2.3 From 9d9176f87e6db2f34c85ee098cede766d0744e9b Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 21:49:28 -0700 Subject: no sharing from thread display page --- mod/display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/display.php b/mod/display.php index f919cba64..059952adc 100644 --- a/mod/display.php +++ b/mod/display.php @@ -104,7 +104,7 @@ function display_content(&$a) { $cmnt_tpl = load_view_file('view/comment_item.tpl'); - $like_tpl = load_view_file('view/like.tpl'); + $like_tpl = load_view_file('view/like_noshare.tpl'); $tpl = load_view_file('view/wall_item.tpl'); $wallwall = load_view_file('view/wallwall_item.tpl'); -- cgit v1.2.3 From 47f0abf27e2aa0f5443badd2a43617b922662bba Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 22:04:00 -0700 Subject: no sharing icon for private msgs --- mod/network.php | 3 ++- mod/profile.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/network.php b/mod/network.php index ad028df1f..abdf59c48 100644 --- a/mod/network.php +++ b/mod/network.php @@ -219,6 +219,7 @@ function network_content(&$a, $update = 0) { $cmnt_tpl = load_view_file('view/comment_item.tpl'); $like_tpl = load_view_file('view/like.tpl'); + $noshare_tpl = load_view_file('view/like_noshare.tpl'); $tpl = load_view_file('view/wall_item.tpl'); $wallwall = load_view_file('view/wallwall_item.tpl'); @@ -362,7 +363,7 @@ function network_content(&$a, $update = 0) { $likebuttons = ''; if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array( + $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), diff --git a/mod/profile.php b/mod/profile.php index a464b7c06..c0989bd28 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -267,6 +267,7 @@ function profile_content(&$a, $update = 0) { $cmnt_tpl = load_view_file('view/comment_item.tpl'); $like_tpl = load_view_file('view/like.tpl'); + $noshare_tpl = load_view_file('view/like_noshare.tpl'); $tpl = load_view_file('view/wall_item.tpl'); @@ -309,7 +310,7 @@ function profile_content(&$a, $update = 0) { if(can_write_wall($a,$a->profile['profile_uid'])) { if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array( + $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), -- cgit v1.2.3