harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configurable visual alerts/notifications

Browse Source
This commit is contained in:
friendica
2014-11-04 15:24:24 -08:00
parent 8163230e77
commit ba7f1bb8ee
5 changed files with 204 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
boot.php
View File

@@ -377,6 +377,22 @@ define ( 'NOTIFY_POKE', 0x0200 );
define ( 'NOTIFY_SYSTEM', 0x8000 ); define ( 'NOTIFY_SYSTEM', 0x8000 );
/**
* visual notification options
*/
define ( 'VNOTIFY_NETWORK', 0x0001 );
define ( 'VNOTIFY_CHANNEL', 0x0002 );
define ( 'VNOTIFY_MAIL', 0x0004 );
define ( 'VNOTIFY_EVENT', 0x0008 );
define ( 'VNOTIFY_EVENTTODAY', 0x0010 );
define ( 'VNOTIFY_BIRTHDAY', 0x0020 );
define ( 'VNOTIFY_SYSTEM', 0x0040 );
define ( 'VNOTIFY_INFO', 0x0080 );
define ( 'VNOTIFY_ALERT', 0x0100 );
define ( 'VNOTIFY_INTRO', 0x0200 );
define ( 'VNOTIFY_REGISTER', 0x0400 );
// We need a flag to designate that a site is a // We need a flag to designate that a site is a
// global directory mirror, but probably doesn't // global directory mirror, but probably doesn't

180
mod/ping.php
View File

@@ -41,6 +41,19 @@ function ping_init(&$a) {
header("content-type: application/json"); header("content-type: application/json");
$vnotify = false;
if(local_user()) {
$vnotify = get_pconfig(local_user(),'system','vnotify');
$evdays = intval(get_pconfig(local_user(),'system','evdays'));
}
// if unset show all visual notification types
if($vnotify === false)
$vnotify = (-1);
if($evdays < 1)
$evdays = 3;
/** /**
* If you have several windows open to this site and switch to a different channel * If you have several windows open to this site and switch to a different channel
* in one of them, the others may get into a confused state showing you a page or options * in one of them, the others may get into a confused state showing you a page or options
@@ -71,6 +84,11 @@ function ping_init(&$a) {
} }
unset($_SESSION['sysmsg_info']); unset($_SESSION['sysmsg_info']);
} }
if(! ($vnotify & VNOTIFY_INFO))
$result['info'] = array();
if(! ($vnotify & VNOTIFY_ALERT))
$result['notice'] = array();
if($a->install) { if($a->install) {
echo json_encode($result); echo json_encode($result);
@@ -303,7 +321,7 @@ function ping_init(&$a) {
WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
ORDER BY `start` DESC ", ORDER BY `start` DESC ",
intval(local_user()), intval(local_user()),
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
); );
@@ -341,101 +359,125 @@ function ping_init(&$a) {
* Normal ping - just the counts, no detail * Normal ping - just the counts, no detail
*/ */
$t = q("select count(*) as total from notify where uid = %d and seen = 0", if($vnotify & VNOTIFY_SYSTEM) {
intval(local_user()) $t = q("select count(*) as total from notify where uid = %d and seen = 0",
); intval(local_user())
if($t) );
$result['notify'] = intval($t[0]['total']); if($t)
$result['notify'] = intval($t[0]['total']);
}
$t1 = dba_timer(); $t1 = dba_timer();
$r = q("SELECT id, item_restrict, item_flags FROM item if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
WHERE (item_restrict = %d) and ( item_flags & %d ) and uid = %d", $r = q("SELECT id, item_restrict, item_flags FROM item
intval(ITEM_VISIBLE), WHERE (item_restrict = %d) and ( item_flags & %d ) and uid = %d",
intval(ITEM_UNSEEN), intval(ITEM_VISIBLE),
intval(local_user()) intval(ITEM_UNSEEN),
); intval(local_user())
);
if(count($r)) { if($r) {
$arr = array('items' => $r); $arr = array('items' => $r);
call_hooks('network_ping', $arr); call_hooks('network_ping', $arr);
foreach ($r as $it) { foreach ($r as $it) {
if($it['item_flags'] & ITEM_WALL) if($it['item_flags'] & ITEM_WALL)
$result['home'] ++; $result['home'] ++;
else else
$result['network'] ++; $result['network'] ++;
}
} }
} }
if(! ($vnotify & VNOTIFY_NETWORK))
$result['network'] = 0;
if(! ($vnotify & VNOTIFY_CHANNEL))
$result['home'] = 0;
$t2 = dba_timer(); $t2 = dba_timer();
$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))", if($vnotify & VNOTIFY_INTRO) {
intval(local_user()), $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
intval(ABOOK_FLAG_PENDING), intval(local_user()),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(ABOOK_FLAG_PENDING),
intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
); intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
);
$t3 = dba_timer(); $t3 = dba_timer();
if($intr) if($intr)
$result['intros'] = intval($intr[0]['total']); $result['intros'] = intval($intr[0]['total']);
}
$t4 = dba_timer(); $t4 = dba_timer();
$channel = get_app()->get_channel(); $channel = get_app()->get_channel();
$mails = q("SELECT count(id) as total from mail if($vnotify & VNOTIFY_MAIL) {
WHERE channel_id = %d AND not (mail_flags & %d) and from_xchan != '%s' ", $mails = q("SELECT count(id) as total from mail
intval(local_user()), WHERE channel_id = %d AND not (mail_flags & %d) and from_xchan != '%s' ",
intval(MAIL_SEEN), intval(local_user()),
dbesc($channel['channel_hash']) intval(MAIL_SEEN),
); dbesc($channel['channel_hash'])
if($mails)
$result['mail'] = intval($mails[0]['total']);
if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
$regs = q("SELECT count(account_id) as total from account where (account_flags & %d)",
intval(ACCOUNT_PENDING)
); );
if($regs) if($mails)
$result['register'] = intval($regs[0]['total']); $result['mail'] = intval($mails[0]['total']);
}
if($vnotify & VNOTIFY_REGISTER) {
if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
$regs = q("SELECT count(account_id) as total from account where (account_flags & %d)",
intval(ACCOUNT_PENDING)
);
if($regs)
$result['register'] = intval($regs[0]['total']);
}
} }
$t5 = dba_timer(); $t5 = dba_timer();
$events = q("SELECT type, start, adjust FROM `event` if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) {
WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 $events = q("SELECT type, start, adjust FROM `event`
ORDER BY `start` ASC ", WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
intval(local_user()), ORDER BY `start` ASC ",
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), intval(local_user()),
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
); dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
);
if($events) { if($events) {
$result['all_events'] = count($events); $result['all_events'] = count($events);
if($result['all_events']) { if($result['all_events']) {
$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
foreach($events as $x) { foreach($events as $x) {
$bd = false; $bd = false;
if($x['type'] === 'birthday') { if($x['type'] === 'birthday') {
$result['birthdays'] ++; $result['birthdays'] ++;
$bd = true; $bd = true;
} }
else { else {
$result['events'] ++; $result['events'] ++;
} }
if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) { if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
$result['all_events_today'] ++; $result['all_events_today'] ++;
if($bd) if($bd)
$result['birthdays_today'] ++; $result['birthdays_today'] ++;
else else
$result['events_today'] ++; $result['events_today'] ++;
}
} }
} }
} }
} }
if(! ($vnotify & VNOTIFY_EVENT))
$result['all_events'] = $result['events'] = 0;
if(! ($vnotify & VNOTIFY_EVENTTODAY))
$result['all_events_today'] = $result['events_today'] = 0;
if(! ($vnotify & VNOTIFY_BIRTHDAY))
$result['birthdays'] = 0;
$x = json_encode($result); $x = json_encode($result);

52
mod/settings.php
View File

@@ -358,6 +358,8 @@ function settings_post(&$a) {
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
$maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
$expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
$evdays = ((x($_POST,'evdays')) ? intval($_POST['evdays']) : 3);
$channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : ''); $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : '');
$expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
@@ -404,6 +406,32 @@ function settings_post(&$a) {
if(x($_POST,'notify8')) if(x($_POST,'notify8'))
$notify += intval($_POST['notify8']); $notify += intval($_POST['notify8']);
$vnotify = 0;
if(x($_POST,'vnotify1'))
$vnotify += intval($_POST['vnotify1']);
if(x($_POST,'vnotify2'))
$vnotify += intval($_POST['vnotify2']);
if(x($_POST,'vnotify3'))
$vnotify += intval($_POST['vnotify3']);
if(x($_POST,'vnotify4'))
$vnotify += intval($_POST['vnotify4']);
if(x($_POST,'vnotify5'))
$vnotify += intval($_POST['vnotify5']);
if(x($_POST,'vnotify6'))
$vnotify += intval($_POST['vnotify6']);
if(x($_POST,'vnotify7'))
$vnotify += intval($_POST['vnotify7']);
if(x($_POST,'vnotify8'))
$vnotify += intval($_POST['vnotify8']);
if(x($_POST,'vnotify9'))
$vnotify += intval($_POST['vnotify9']);
if(x($_POST,'vnotify10'))
$vnotify += intval($_POST['vnotify10']);
if(x($_POST,'vnotify11'))
$vnotify += intval($_POST['vnotify11']);
$channel = $a->get_channel(); $channel = $a->get_channel();
$err = ''; $err = '';
@@ -432,6 +460,8 @@ function settings_post(&$a) {
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
set_pconfig(local_user(),'system','blocktags',$blocktags); set_pconfig(local_user(),'system','blocktags',$blocktags);
set_pconfig(local_user(),'system','channel_menu',$channel_menu); set_pconfig(local_user(),'system','channel_menu',$channel_menu);
set_pconfig(local_user(),'system','vnotify',$vnotify);
set_pconfig(local_user(),'system','evdays',$evdays);
$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d limit 1", $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d limit 1",
dbesc($username), dbesc($username),
@@ -929,9 +959,15 @@ function settings_content(&$a) {
} }
} }
$evdays = get_pconfig(local_user(),'system','evdays');
if(! $evdays)
$evdays = 3;
$permissions_role = get_pconfig(local_user(),'system','permissions_role'); $permissions_role = get_pconfig(local_user(),'system','permissions_role');
$permissions_set = (($permissions_role && $permissions_role != 'custom') ? true : false); $permissions_set = (($permissions_role && $permissions_role != 'custom') ? true : false);
$vnotify = get_pconfig(local_user(),'system','vnotify');
if($vnotify === false)
$vnotify = (-1);
$o .= replace_macros($stpl,array( $o .= replace_macros($stpl,array(
'$ptitle' => t('Channel Settings'), '$ptitle' => t('Channel Settings'),
@@ -1002,6 +1038,22 @@ function settings_content(&$a) {
'$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''), '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
'$lbl_vnot' => t('Show visual notifications including:'),
'$vnotify1' => array('vnotify1', t('Unseen matrix activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, ''),
'$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, ''),
'$vnotify3' => array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended')),
'$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, ''),
'$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, ''),
'$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes')),
'$vnotify7' => array('vnotify7', t('Personal conversation updates'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, ''),
'$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended')),
'$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended')),
'$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended')),
'$vnotify11' => array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, ''),
'$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')),
'$h_advn' => t('Advanced Account/Page Type Settings'), '$h_advn' => t('Advanced Account/Page Type Settings'),
'$h_descadvn' => t('Change the behaviour of this account for special situations'), '$h_descadvn' => t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype, '$pagetype' => $pagetype,

2
view/css/mod_settings.css
View File

@@ -45,7 +45,7 @@ ul#settings-privacy-macros {
margin-left: 20px; margin-left: 20px;
width: 330px; width: 330px;
} }
#settings-notify-desc, #settings-activity-desc { #settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc {
font-weight: bold; font-weight: bold;
margin-bottom: 15px; margin-bottom: 15px;
} }

23
view/tpl/settings.tpl
View File

@@ -100,6 +100,27 @@
{{include file="field_intcheckbox.tpl" field=$notify8}} {{include file="field_intcheckbox.tpl" field=$notify8}}
</div> </div>
<div id="settings-vnotify-desc">{{$lbl_vnot}}</div>
<div class="group">
{{include file="field_intcheckbox.tpl" field=$vnotify1}}
{{include file="field_intcheckbox.tpl" field=$vnotify2}}
{{include file="field_intcheckbox.tpl" field=$vnotify3}}
{{include file="field_intcheckbox.tpl" field=$vnotify4}}
{{include file="field_intcheckbox.tpl" field=$vnotify5}}
{{include file="field_intcheckbox.tpl" field=$vnotify6}}
{{include file="field_intcheckbox.tpl" field=$vnotify10}}
{{include file="field_intcheckbox.tpl" field=$vnotify7}}
{{include file="field_intcheckbox.tpl" field=$vnotify8}}
{{include file="field_intcheckbox.tpl" field=$vnotify9}}
{{*include file="field_intcheckbox.tpl" field=$vnotify11*}}
</div>
{{include file="field_input.tpl" field=$evdays}}
</div> </div>
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
@@ -110,6 +131,8 @@
{{if $menus}} {{if $menus}}
<h3 class="settings-heading">{{$lbl_misc}}</h3> <h3 class="settings-heading">{{$lbl_misc}}</h3>
<div id="settings-menu-desc">{{$menu_desc}}</div> <div id="settings-menu-desc">{{$menu_desc}}</div>
<div class="settings-channel-menu-div"> <div class="settings-channel-menu-div">
<select name="channel_menu" class="settings-channel-menu-sel"> <select name="channel_menu" class="settings-channel-menu-sel">