Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy

1 files changed, 37 insertions, 12 deletions

diff --git a/mod/network.php b/mod/network.php
index 75775ba50..28e540283 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -7,13 +7,14 @@ function network_init(&$a) {
 		return;
 	}
   
-  
+	$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
+		  
 	require_once('include/group.php');
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 
 	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
-	$srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '');
+	$srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '');
 
 
 	$a->page['aside'] .= search($search,'netsearch-box',$srchurl);
@@ -21,15 +22,33 @@ function network_init(&$a) {
 	$a->page['aside'] .= '<div id="network-new-link">';
 
 
-
+	$a->page['aside'] .= '<div id="network-view-link">';
 	if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search'))
-		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('Normal View') . '</a>';
-	else 
-		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('New Item View') . '</a>';
+		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>';
+	else { 
+		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>';
+
+		if(x($_GET,'star'))
+			$a->page['aside'] .= '<div id="network-star-link">'
+				. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd 
+				. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' 
+				. t('View Any Items') . '</a>' 
+				. '<span class="network-star icon starred"></span>' 
+				. '<span class="network-star icon unstarred"></span>' 
+				. '<div class="clear"></div></div>';
+		else
+			$a->page['aside'] .= '<div id="network-star-link">'
+				. '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd 
+				. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >' 
+				. t('View Starred Items') . '</a>'
+				. '<span class="network-star icon starred"></span>' 
+				. '<div class="clear"></div></div>';
+
+	}
 
 	$a->page['aside'] .= '</div>';
 
-	$a->page['aside'] .= group_side('network','network',true);
+	$a->page['aside'] .= group_side('network','network',true,$group_id);
 }
 
 
@@ -50,6 +69,7 @@ function network_content(&$a, $update = 0) {
 	require_once('include/acl_selectors.php');
 
 	$cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0);
+	$star = ((x($_GET['star'])) ? intval($_GET['star']) : 0);
 
 	if(($a->argc > 2) && $a->argv[2] === 'new')
 		$nouveau = true;
@@ -108,6 +128,7 @@ function network_content(&$a, $update = 0) {
 				. "; var netargs = '" . substr($a->cmd,8) 
 				. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
 				. ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '') 
+				. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') 
 				. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
 	}
@@ -116,7 +137,7 @@ function network_content(&$a, $update = 0) {
 	// level which items you've seen and which you haven't. If you're looking
 	// at the top level network page just mark everything seen. 
 	
-	if((! $group) && (! $cid)) {
+	if((! $group) && (! $cid) && (! $star)) {
 		$r = q("UPDATE `item` SET `unseen` = 0 
 			WHERE `unseen` = 1 AND `uid` = %d",
 			intval($_SESSION['uid'])
@@ -127,7 +148,9 @@ 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_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+	$star_sql = (($star) ?  " AND `starred` = 1 " : '');
+
+	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) ";
 
 	if($group) {
 		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -151,7 +174,8 @@ function network_content(&$a, $update = 0) {
 				info( t('Group is empty'));
 		}
 
-		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+
+		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
 		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
 	}
 	elseif($cid) {
@@ -161,7 +185,7 @@ function network_content(&$a, $update = 0) {
 			intval($cid)
 		);
 		if(count($r)) {
-			$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( " . intval($cid) . " )) ";
+			$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND `contact-id` IN ( " . intval($cid) . " )) ";
 			$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
 			if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
 				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
@@ -183,6 +207,7 @@ function network_content(&$a, $update = 0) {
 	if(x($_GET,'search'))
 		$sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
 
+	
 
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -212,7 +237,7 @@ function network_content(&$a, $update = 0) {
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			$sql_extra
-			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
 			intval($_SESSION['uid']),
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])