X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=894ac48ed67e3554d7265841b27f5a34b7540ad5;hb=bbebb4c2a050f22e9aa51cb123359b169bcb3b3c;hp=8f65475db18f3c52f1597e0e4a2f276ddbae1626;hpb=a5144518aa0a3ce8440358dcce5d7c5a9fb5797d;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
old mode 100644
new mode 100755
index 8f65475db1..894ac48ed6
--- a/mod/network.php
+++ b/mod/network.php
@@ -10,19 +10,13 @@ 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'] = '';
 
 	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
 
-	// We need a better way of managing a growing argument list
-
-	// moved into savedsearches()
-	// $srchurl = '/network' 
-	// 		. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
-	// 		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
-	// 		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
-	
 	if(x($_GET,'save')) {
 		$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
 			intval(local_user()),
@@ -46,14 +40,11 @@ function network_init(&$a) {
 	
 	// search terms header
 	if(x($_GET,'search')) {
-		$a->page['content'] .= '<h2>Search Results For: '  . $search . '</h2>';
+		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
 	}
 	
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
-	
-	// moved to saved searches to have it in the same div
-	//$a->page['aside'] .= search($search,'netsearch-box',$srchurl,true);
-
+	$a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
 
 }
@@ -64,7 +55,10 @@ 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'] : '')
+		. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
+		. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
 	
 	$o = '';
 
@@ -104,8 +98,10 @@ function network_content(&$a, $update = 0) {
 
 	require_once('include/conversation.php');
 
-	if(! local_user())
+	if(! local_user()) {
+		$_SESSION['return_url'] = $a->query_string;
     	return login(false);
+	}
 
 	$o = '';
 
@@ -119,6 +115,7 @@ function network_content(&$a, $update = 0) {
 	$all_active = '';
 	$search_active = '';
 	$conv_active = '';
+	$spam_active = '';
 
 	if(($a->argc > 1 && $a->argv[1] === 'new') 
 		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
@@ -141,12 +138,17 @@ function network_content(&$a, $update = 0) {
 		$conv_active = 'active';
 	}
 
+	if($_GET['spam']) {
+		$spam_active = 'active';
+	}
+
 	
 	if (($new_active == '') 
 		&& ($starred_active == '') 
 		&& ($bookmarked_active == '')
 		&& ($conv_active == '')
-		&& ($search_active == '')) {
+		&& ($search_active == '')
+		&& ($spam_active == '')) {
 			$all_active = 'active';
 	}
 
@@ -157,9 +159,7 @@ function network_content(&$a, $update = 0) {
 		$all_active = '';
 		$postord_active = 'active';
 	}
-			 
-
-	
+			 	
 	// tabs
 	$tabs = array(
 		array(
@@ -193,6 +193,13 @@ function network_content(&$a, $update = 0) {
 			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
 			'sel'=>$bookmarked_active,
 		),	
+//		array(
+//			'label' => t('Spam'),
+//			'url'=>$a->get_baseurl() . '/network?f=&spam=1'
+//			'sel'=> $spam_active,
+//		),	
+
+
 	);
 	$tpl = get_markup_template('common_tabs.tpl');
 	$o .= replace_macros($tpl, array('$tabs'=>$tabs));
@@ -215,7 +222,10 @@ 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);
-
+	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
+	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
+	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
 
 	if(($a->argc > 2) && $a->argv[2] === 'new')
 		$nouveau = true;
@@ -246,14 +256,14 @@ function network_content(&$a, $update = 0) {
 
 		nav_set_selected('network');
 
-		$_SESSION['return_url'] = $a->cmd;
+		$_SESSION['return_url'] = $a->query_string;
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default_location'],
+			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
 			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
 			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
@@ -271,12 +281,13 @@ function network_content(&$a, $update = 0) {
 	// that belongs to you, hence you can see all of it. We will filter by group if
 	// desired. 
 
-	$star_sql = (($star) ?  " AND `starred` = 1 " : '');
+	
+	$sql_options  = (($star) ? " and starred = 1 " : '');
+	$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
 
-	if($bmark)
-		$star_sql .= " AND `bookmark` = 1 ";
+	$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
 
-	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) ";
+	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
 	if($group) {
 		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -300,7 +311,7 @@ function network_content(&$a, $update = 0) {
 				info( t('Group is empty'));
 		}
 
-		$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+		$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' ) and deleted = 0 ) ";
 		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
 	}
 	elseif($cid) {
@@ -310,7 +321,7 @@ function network_content(&$a, $update = 0) {
 			intval($cid)
 		);
 		if(count($r)) {
-			$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND `contact-id` = " . intval($cid) . " ) ";
+			$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) ";
 			$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
 			if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
 				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
@@ -338,13 +349,18 @@ function network_content(&$a, $update = 0) {
 		$o .= "<script> var profile_uid = " . $_SESSION['uid'] 
 			. "; var netargs = '" . substr($a->cmd,8)
 			. '?f='
-			. ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
+			. ((x($_GET,'cid'))    ? '&cid='    . $_GET['cid']    : '')
 			. ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
-			. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
-			. ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') 
-			. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') 
-			. ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '') 
-			. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') 
+			. ((x($_GET,'star'))   ? '&star='   . $_GET['star']   : '') 
+			. ((x($_GET,'order'))  ? '&order='  . $_GET['order']  : '') 
+			. ((x($_GET,'bmark'))  ? '&bmark='  . $_GET['bmark']  : '') 
+			. ((x($_GET,'liked'))  ? '&liked='  . $_GET['liked']  : '') 
+			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
+			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
+			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
+			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
+			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
+
 			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
 
@@ -383,7 +399,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'])
 		);
 
@@ -404,11 +420,12 @@ function network_content(&$a, $update = 0) {
 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 
+			AND `item`.`deleted` = 0 and `item`.`moderated` = 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'])
 		);
@@ -427,12 +444,12 @@ function network_content(&$a, $update = 0) {
 		// Fetch a page full of parent items for this page
 
 		if($update) {
-			$r = q("SELECT distinct(`parent`) AS `item_id`, `contact`.`uid` AS `contact_uid`
+			$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-				and `item`.`parent` in ( select parent from item where unseen = 1 )
+				and `item`.`moderated` = 0 and `item`.`unseen` = 1
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				$sql_extra ",
+				$sql_extra $sql_nets ",
 				intval(local_user())
 			);
 		}
@@ -440,9 +457,9 @@ function network_content(&$a, $update = 0) {
 			$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				AND `item`.`moderated` = 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())
 			);
@@ -455,23 +472,26 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			foreach($r as $rr)
-				$parents_arr[] = $rr['item_id'];
+				if(! array_key_exists($rr['item_id'],$parents_arr))
+					$parents_arr[] = $rr['item_id'];
 			$parents_str = implode(', ', $parents_arr);
 
 			$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-				FROM `item`, (SELECT `p`.`id`,`p`.`created`,`p`.`commented` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
+				FROM `item`, `contact`
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-				AND `contact`.`id` = `item`.`contact-id`
+				AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id`
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
-				$sql_extra
-				ORDER BY `parentitem`.$ordering DESC, `parentitem`.`id` ASC, `item`.`gravity` ASC, `item`.`created` ASC ",
+				AND `item`.`parent` IN ( %s )
+				$sql_extra ",
 				intval(local_user()),
 				dbesc($parents_str)
 			);
+
+			$items = conv_sort($items,$ordering);
+
 		}	
 	}