X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=894ac48ed67e3554d7265841b27f5a34b7540ad5;hb=bbebb4c2a050f22e9aa51cb123359b169bcb3b3c;hp=9318d20ca01fc9bacfdeb47c0027b8438bd0dc51;hpb=f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872;p=friendica.git
diff --git a/mod/network.php b/mod/network.php
old mode 100644
new mode 100755
index 9318d20ca0..894ac48ed6
--- a/mod/network.php
+++ b/mod/network.php
@@ -56,7 +56,9 @@ function saved_searches($search) {
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
- . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '');
+ . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
+ . ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
+ . ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
$o = '';
@@ -96,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 = '';
@@ -111,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')) {
@@ -133,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';
}
@@ -149,9 +159,7 @@ function network_content(&$a, $update = 0) {
$all_active = '';
$postord_active = 'active';
}
-
-
-
+
// tabs
$tabs = array(
array(
@@ -185,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));
@@ -207,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;
@@ -238,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),
@@ -269,11 +287,7 @@ function network_content(&$a, $update = 0) {
$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 ) ";
-
- // Otherwise, this is a bit faster:
- $sql_extra = $sql_options;
+ $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",
@@ -297,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 $sql_options 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 = '' . t('Group: ') . $r[0]['name'] . '
' . $o;
}
elseif($cid) {
@@ -307,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 $sql_options 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 = '' . t('Contact: ') . $r[0]['name'] . '
' . $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);
@@ -335,14 +349,18 @@ function network_content(&$a, $update = 0) {
$o .= "\r\n";
}
@@ -402,7 +420,8 @@ 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
@@ -428,7 +447,7 @@ function network_content(&$a, $update = 0) {
$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`.`unseen` = 1
+ and `item`.`moderated` = 0 and `item`.`unseen` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra $sql_nets ",
intval(local_user())
@@ -438,7 +457,7 @@ 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_nets
ORDER BY `item`.$ordering DESC $pager_sql ",
@@ -463,10 +482,10 @@ function network_content(&$a, $update = 0) {
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
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` IN ( %s )
- $sql_extra $sql_nets",
+ $sql_extra ",
intval(local_user()),
dbesc($parents_str)
);