yeah - that's what I'm going to do. we'll just keep system notifications. If somebody wants web pages for the others we'll start fresh. It's easier than starting with curfty friendica code that doesn't work anymore and will never work without starting over.
This commit is contained in:
friendica
parent
90fff1de1c
commit
5382f607d9
@ -147,16 +147,13 @@ EOT;
|
|||||||
if(local_user()) {
|
if(local_user()) {
|
||||||
|
|
||||||
$nav['network'] = array('network', t('Matrix'), "", t('Your matrix'));
|
$nav['network'] = array('network', t('Matrix'), "", t('Your matrix'));
|
||||||
$nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", "");
|
|
||||||
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
|
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
|
||||||
|
|
||||||
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'));
|
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'));
|
||||||
$nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", "");
|
|
||||||
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
|
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
|
||||||
|
|
||||||
|
|
||||||
$nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections'));
|
$nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections'));
|
||||||
$nav['intros']['all']=array('notifications/intros', t('See all channel introductions'), "", "");
|
|
||||||
|
|
||||||
|
|
||||||
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));
|
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));
|
||||||
|
|||||||
@ -71,157 +71,6 @@ function notifications_content(&$a) {
|
|||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
$tabs = array(
|
|
||||||
array(
|
|
||||||
'label' => t('System'),
|
|
||||||
'url'=>$a->get_baseurl(true) . '/notifications/system',
|
|
||||||
'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
|
|
||||||
),
|
|
||||||
// array(
|
|
||||||
// 'label' => t('Network'),
|
|
||||||
// 'url'=>$a->get_baseurl(true) . '/notifications/network',
|
|
||||||
// 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
|
|
||||||
// ),
|
|
||||||
array(
|
|
||||||
'label' => t('Personal'),
|
|
||||||
'url'=>$a->get_baseurl(true) . '/notifications/personal',
|
|
||||||
'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
|
|
||||||
),
|
|
||||||
// array(
|
|
||||||
// 'label' => t('Home'),
|
|
||||||
// 'url' => $a->get_baseurl(true) . '/notifications/home',
|
|
||||||
// 'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
|
|
||||||
// ),
|
|
||||||
array(
|
|
||||||
'label' => t('Introductions'),
|
|
||||||
'url' => $a->get_baseurl(true) . '/connections/pending',
|
|
||||||
'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
|
|
||||||
),
|
|
||||||
array(
|
|
||||||
'label' => t('Messages'),
|
|
||||||
'url' => $a->get_baseurl(true) . '/message',
|
|
||||||
'sel'=> '',
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
$o = "";
|
|
||||||
|
|
||||||
|
|
||||||
if((argc() > 1) && (argv(1) == 'intros')) {
|
|
||||||
nav_set_selected('introductions');
|
|
||||||
|
|
||||||
$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where uid = %d and (abook_flags & %d) and not (abook_flags & %d)",
|
|
||||||
intval(local_user()),
|
|
||||||
intval(ABOOK_FLAG_PENDING),
|
|
||||||
intval(ABOOK_FLAG_IGNORED)
|
|
||||||
);
|
|
||||||
|
|
||||||
if($r) {
|
|
||||||
// FIXME finish this
|
|
||||||
foreach($r as $rr) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
info( t('No introductions.') . EOL);
|
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
|
||||||
'$notif_header' => t('Notifications'),
|
|
||||||
'$tabs' => $tabs,
|
|
||||||
'$notif_content' => $notif_content,
|
|
||||||
));
|
|
||||||
|
|
||||||
// $o .= paginate($a);
|
|
||||||
return $o;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
|
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
|
||||||
|
|
||||||
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
|
|
||||||
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
|
|
||||||
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
|
|
||||||
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
|
|
||||||
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
|
|
||||||
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
|
|
||||||
intval(local_user())
|
|
||||||
);
|
|
||||||
|
|
||||||
$tpl_item_likes = get_markup_template('notifications_likes_item.tpl');
|
|
||||||
$tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
|
|
||||||
$tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
|
|
||||||
$tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
|
|
||||||
$tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
|
|
||||||
|
|
||||||
$notif_content = '';
|
|
||||||
|
|
||||||
if (count($r) > 0) {
|
|
||||||
|
|
||||||
foreach ($r as $it) {
|
|
||||||
switch($it['verb']){
|
|
||||||
case ACTIVITY_LIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_likes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ACTIVITY_DISLIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_dislikes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ACTIVITY_FRIEND:
|
|
||||||
|
|
||||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
|
||||||
$obj = parse_xml_string($xmlhead.$it['object']);
|
|
||||||
$it['fname'] = $obj->title;
|
|
||||||
|
|
||||||
$notif_content .= replace_macros($tpl_item_friends,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
$item_text = (($it['id'] == $it['parent'])
|
|
||||||
? sprintf( t("%s created a new post"), $it['author-name'])
|
|
||||||
: sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']));
|
|
||||||
$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
|
|
||||||
|
|
||||||
$notif_content .= replace_macros($tpl,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => $item_text,
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$notif_content = t('No more network notifications.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
|
||||||
'$notif_header' => t('Network Notifications'),
|
|
||||||
'$tabs' => $tabs,
|
|
||||||
'$notif_content' => $notif_content,
|
|
||||||
));
|
|
||||||
|
|
||||||
} else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
|
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
$notif_tpl = get_markup_template('notifications.tpl');
|
||||||
|
|
||||||
$not_tpl = get_markup_template('notify.tpl');
|
$not_tpl = get_markup_template('notify.tpl');
|
||||||
@ -246,183 +95,8 @@ function notifications_content(&$a) {
|
|||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
$o .= replace_macros($notif_tpl,array(
|
||||||
'$notif_header' => t('System Notifications'),
|
'$notif_header' => t('System Notifications'),
|
||||||
'$tabs' => $tabs,
|
|
||||||
'$notif_content' => $notif_content,
|
'$notif_content' => $notif_content,
|
||||||
));
|
));
|
||||||
|
|
||||||
} else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
|
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
|
||||||
|
|
||||||
$myurl = $a->get_baseurl(true) . '/channel/'. $a->user['nickname'];
|
|
||||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
|
||||||
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
|
||||||
$diasp_url = str_replace('/channel/','/u/',$myurl);
|
|
||||||
$sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
|
|
||||||
dbesc($myurl . '$'),
|
|
||||||
dbesc($myurl . '\\]'),
|
|
||||||
dbesc($diasp_url . '\\]')
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
|
|
||||||
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
|
|
||||||
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
|
|
||||||
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
|
|
||||||
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1
|
|
||||||
$sql_extra
|
|
||||||
AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
|
|
||||||
intval(local_user())
|
|
||||||
);
|
|
||||||
|
|
||||||
$tpl_item_likes = get_markup_template('notifications_likes_item.tpl');
|
|
||||||
$tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
|
|
||||||
$tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
|
|
||||||
$tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
|
|
||||||
$tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
|
|
||||||
|
|
||||||
$notif_content = '';
|
|
||||||
|
|
||||||
if (count($r) > 0) {
|
|
||||||
|
|
||||||
foreach ($r as $it) {
|
|
||||||
switch($it['verb']){
|
|
||||||
case ACTIVITY_LIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_likes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ACTIVITY_DISLIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_dislikes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ACTIVITY_FRIEND:
|
|
||||||
|
|
||||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
|
||||||
$obj = parse_xml_string($xmlhead.$it['object']);
|
|
||||||
$it['fname'] = $obj->title;
|
|
||||||
|
|
||||||
$notif_content .= replace_macros($tpl_item_friends,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
$item_text = (($it['id'] == $it['parent'])
|
|
||||||
? sprintf( t("%s created a new post"), $it['author-name'])
|
|
||||||
: sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']));
|
|
||||||
$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
|
|
||||||
|
|
||||||
$notif_content .= replace_macros($tpl,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => $item_text,
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$notif_content = t('No more personal notifications.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
|
||||||
'$notif_header' => t('Personal Notifications'),
|
|
||||||
'$tabs' => $tabs,
|
|
||||||
'$notif_content' => $notif_content,
|
|
||||||
));
|
|
||||||
|
|
||||||
|
|
||||||
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
|
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
|
||||||
|
|
||||||
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
|
|
||||||
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
|
|
||||||
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
|
|
||||||
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
|
|
||||||
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
|
|
||||||
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC",
|
|
||||||
intval(local_user())
|
|
||||||
);
|
|
||||||
|
|
||||||
$tpl_item_likes = get_markup_template('notifications_likes_item.tpl');
|
|
||||||
$tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
|
|
||||||
$tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
|
|
||||||
$tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
|
|
||||||
|
|
||||||
$notif_content = '';
|
|
||||||
|
|
||||||
if (count($r) > 0) {
|
|
||||||
|
|
||||||
foreach ($r as $it) {
|
|
||||||
switch($it['verb']){
|
|
||||||
case ACTIVITY_LIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_likes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
|
|
||||||
break;
|
|
||||||
case ACTIVITY_DISLIKE:
|
|
||||||
$notif_content .= replace_macros($tpl_item_dislikes,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
|
|
||||||
break;
|
|
||||||
case ACTIVITY_FRIEND:
|
|
||||||
|
|
||||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
|
||||||
$obj = parse_xml_string($xmlhead.$it['object']);
|
|
||||||
$it['fname'] = $obj->title;
|
|
||||||
|
|
||||||
$notif_content .= replace_macros($tpl_item_friends,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$notif_content .= replace_macros($tpl_item_comments,array(
|
|
||||||
'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
|
|
||||||
'$item_image' => $it['author-avatar'],
|
|
||||||
'$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']),
|
|
||||||
'$item_when' => relative_date($it['created'])
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$notif_content = t('No more home notifications.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl,array(
|
|
||||||
'$notif_header' => t('Home Notifications'),
|
|
||||||
'$tabs' => $tabs,
|
|
||||||
'$notif_content' => $notif_content,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= paginate($a);
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|||||||
7178
util/messages.po
7178
util/messages.po
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user