From b99cb511ca665bad0022de2ca43b5de78b3ffdbf Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Jan 2012 16:38:24 -0800 Subject: comment preview --- mod/item.php | 2 +- mod/photos.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/item.php b/mod/item.php index d4d337584..069f1393c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -588,7 +588,7 @@ function item_post(&$a) { if($preview) { $b = prepare_body($datarray,true); require_once('include/conversation.php'); - $o = conversation(&$a,array(array_merge($datarray,$contact_record)),'search',false); + $o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true); $json = array('preview' => $o); echo json_encode($json); killme(); diff --git a/mod/photos.php b/mod/photos.php index bf3299de0..d2f45652f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1203,6 +1203,7 @@ function photos_content(&$a) { '$myphoto' => $contact['thumb'], '$comment' => t('Comment'), '$submit' => t('Submit'), + '$preview' => t('Preview'), '$ww' => '' )); } -- cgit v1.2.3 From b265334c9ee55cf2270926148a094ecae2f68e54 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Jan 2012 16:47:47 -0800 Subject: added citations back into ping - lost somehow --- mod/ping.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mod') diff --git a/mod/ping.php b/mod/ping.php index df07cb768..35f6c53ae 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -190,6 +190,12 @@ function ping_init(&$a) { }; } + if (count($cit)){ + foreach ($cit as $i) { + echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), t("{0} mentioned you in a post") ); + }; + } + echo " "; } echo " "; -- cgit v1.2.3 From 291a82c4a465c6c3b1db7087682cb050d1943a08 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Jan 2012 18:11:53 -0800 Subject: backend for per-network streams --- mod/item.php | 4 +--- mod/network.php | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'mod') diff --git a/mod/item.php b/mod/item.php index 069f1393c..6b294b93e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -586,11 +586,9 @@ function item_post(&$a) { // preview mode - prepare the body for display and send it via json if($preview) { - $b = prepare_body($datarray,true); require_once('include/conversation.php'); $o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true); - $json = array('preview' => $o); - echo json_encode($json); + echo json_encode(array('preview' => $o)); killme(); } diff --git a/mod/network.php b/mod/network.php index 397a701da..76c7bb5e6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -52,7 +52,8 @@ function saved_searches($search) { . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '') - . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : ''); + . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '') + . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : ''); $o = ''; @@ -203,7 +204,7 @@ function network_content(&$a, $update = 0) { $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment'); $liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0); $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); - + $nets = ((x($_GET,'nets')) ? $_GET['nets'] : ''); if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -259,10 +260,12 @@ function network_content(&$a, $update = 0) { // that belongs to you, hence you can see all of it. We will filter by group if // desired. - + $sql_options = (($star) ? " and starred = 1 " : ''); $sql_options .= (($bmark) ? " and bookmark = 1 " : ''); + $sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : ''); + // We'll need the following line if starred/bookmarks are allowed in comments in the future // $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) "; @@ -336,6 +339,7 @@ function network_content(&$a, $update = 0) { . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') . ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '') . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') + . ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') . "'; var profile_page = " . $a->pager['page'] . "; \r\n"; } @@ -374,7 +378,7 @@ function network_content(&$a, $update = 0) { WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra2 - $sql_extra ", + $sql_extra $sql_nets ", intval($_SESSION['uid']) ); @@ -399,7 +403,7 @@ function network_content(&$a, $update = 0) { $simple_update AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra + $sql_extra $sql_nets ORDER BY `item`.`received` DESC $pager_sql ", intval($_SESSION['uid']) ); @@ -423,7 +427,7 @@ function network_content(&$a, $update = 0) { WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`unseen` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra ", + $sql_extra $sql_nets ", intval(local_user()) ); } @@ -433,7 +437,7 @@ function network_content(&$a, $update = 0) { WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`parent` = `item`.`id` - $sql_extra + $sql_extra $sql_nets ORDER BY `item`.$ordering DESC $pager_sql ", intval(local_user()) ); @@ -459,7 +463,7 @@ function network_content(&$a, $update = 0) { AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`parent` IN ( %s ) - $sql_extra ", + $sql_extra $sql_nets", intval(local_user()), dbesc($parents_str) ); -- cgit v1.2.3 From c3ada095f4156bba01e77d2d250d5821ba5e859e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Jan 2012 20:40:48 -0800 Subject: network select widget --- mod/network.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mod') diff --git a/mod/network.php b/mod/network.php index 76c7bb5e6..9318d20ca 100644 --- a/mod/network.php +++ b/mod/network.php @@ -10,6 +10,8 @@ function network_init(&$a) { $group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0); require_once('include/group.php'); + require_once('include/contact_widgets.php'); + if(! x($a->page,'aside')) $a->page['aside'] = ''; @@ -42,6 +44,7 @@ function network_init(&$a) { } $a->page['aside'] .= group_side('network','network',true,$group_id); + $a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : '')); $a->page['aside'] .= saved_searches($search); } -- cgit v1.2.3