diff -r eb92dc5d9fb4 -r e2f6e3af9959 htdocs/privacy.php --- a/htdocs/privacy.php Sat Nov 15 14:59:51 2008 -0500 +++ b/htdocs/privacy.php Sat Nov 15 15:00:52 2008 -0500 @@ -13,20 +13,24 @@
is designed to collect IRC statistics. It does this by recording raw data and then letting the frontend (index.php and a - few backend functions in stats-fe.php) look at the data and draw graphs and measurements based on it.
+is designed to collect IRC statistics. It does this by recording raw data and then letting the frontend (index.php and the + backend access abstraction in stats-fe.php) look at the data and draw graphs and measurements based on it.
The only information collects is
In addition, knows whether users currently have permissions such as operator and voice, but this information isn't logged (it's used to determine who can do what). This means that the web interface never knows for sure who is in the channel.
also gives you the ability to disable recording statistics about you. To clear all your past statistics, type in any channel:
!deluser
-You can also prevent yourself from being logged in the future with:
+(Moderators can also type:
+!deluser | SomeNick
+to remove statistics for a flooder or spammer)
+You can prevent yourself from being logged in the future with:
/msg anonymize
+You'll be asked if you want to anonymize your past statistics as well.
Remove yourself from the anonymization list with:
/msg denonymize
-Want to know more about the numbers collects? Download 's data file yourself (in JSON format).
+Want to know more about the numbers collects? Download a dump of 's database yourself.
diff -r eb92dc5d9fb4 -r e2f6e3af9959 modules/memberlist.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/memberlist.php Sat Nov 15 15:00:52 2008 -0500 @@ -0,0 +1,123 @@ + '@', + 'v' => '+' +); + +eb_hook('event_self_join', 'mlist_init_channel($this);'); +eb_hook('event_raw_message', 'mlist_process_message($chan, $message);'); +eb_hook('snippet_dynamic', 'if ( $snippet === "memberlist" ) return mlist_list_members($chan, $message);'); +eb_hook('event_other', 'mlist_handle_other_event($message);'); + +function mlist_init_channel(&$chan) +{ + global $eb_memberlist, $userflags; + + $channel_name = $chan->get_channel_name(); + $eb_memberlist[$channel_name] = array(); + $prefixes_regexp = '/^([' . preg_quote(implode('', $userflags)) . '])+/'; + $prefixes_flipped = array_flip($userflags); + $prefixes_regexp_notlist = '/[^' . preg_quote(implode('', $prefixes_flipped)) . ']/'; + + // read list of members from channel + @stream_set_timeout($chan->parent->sock, 3); + while ( $msg = $chan->parent->get() ) + { + if ( $ml = strstr($msg, ' 353 ') ) + { + $memberlist = trim(substr(strstr($ml, ':'), 1)); + $eb_memberlist[$channel_name] = explode(' ', $memberlist); + $eb_memberlist[$channel_name] = array_flip($eb_memberlist[$channel_name]); + foreach ( $eb_memberlist[$channel_name] as $nick => $_ ) + { + $eb_memberlist[$channel_name][$nick] = ''; + while ( preg_match($prefixes_regexp, $nick) ) + { + $prefix = substr($nick, 0, 1); + $add = preg_replace($prefixes_regexp_notlist, '', strval($eb_memberlist[$channel_name][$nick])); + unset($eb_memberlist[$channel_name][$nick]); + $nick = substr($nick, 1); + $eb_memberlist[$channel_name][$nick] = $prefixes_flipped[$prefix] . $add; + } + } + break; + } + } +} + +function mlist_process_message(&$chan, $message) +{ + global $eb_memberlist; + $channel_name = $chan->get_channel_name(); + if ( !isset($eb_memberlist[$channel_name]) ) + { + return false; + } + + $ml =& $eb_memberlist[$channel_name]; + + // we need to change statistics accordingly depending on the event + if ( $message['action'] == 'JOIN' ) + { + // member joined - init their flags and up the member count by one + $ml[$message['nick']] = ''; + } + else if ( $message['action'] == 'PART' ) + { + // member left - clear flags and decrement the total member count + unset($ml[$message['nick']]); + } + else if ( $message['action'] == 'MODE' ) + { + // update member list (not sure why this would be useful, but export it anyway - display scripts might find it useful) + list($mode, $target) = explode(' ', $message['message']); + $action = substr($mode, 0, 1); + + global $userflags; + $ml[$target] = str_replace(substr($mode, 1), '', $ml[$target]); + if ( $action == '+' ) + { + $ml[$target] .= substr($mode, 1); + } + } +} + +function mlist_list_members(&$chan, &$message) +{ + global $eb_memberlist; + $channel_name = $chan->get_channel_name(); + if ( !isset($eb_memberlist[$channel_name]) ) + { + return false; + } + + $ml =& $eb_memberlist[$channel_name]; + + $mlt = implode("\n", str_split(str_replace("\n", ' ', print_r($ml, true)), 400)); + $chan->parent->privmsg($message['nick'], "memberlist:\n" . $mlt); + + return true; +} + +function mlist_handle_other_event(&$message) +{ + global $eb_memberlist; + + if ( $message['action'] == 'NICK' ) + { + // we have a nick change; go through all channels and replace the old nick with the new + foreach ( $eb_memberlist as &$ml ) + { + if ( isset($ml[$message['nick']]) ) + { + $ml[$message['message']] = $ml[$message['nick']]; + unset($ml[$message['nick']]); + } + } + } +} + diff -r eb92dc5d9fb4 -r e2f6e3af9959 modules/stats.php --- a/modules/stats.php Sat Nov 15 14:59:51 2008 -0500 +++ b/modules/stats.php Sat Nov 15 15:00:52 2008 -0500 @@ -1,272 +1,6 @@ '@', - 'v' => '+' -); -$stats_data = array('anonymous' => array(), 'messages' => array()); -$stats_day = gmdate('Ymd'); -@include("./stats/stats-data-$stats_day.php"); -unset($stats_data['members']); -$stats_data['members'] =& $stats_memberlist; - -eb_hook('event_self_join', 'stats_init_channel($this);'); -eb_hook('event_raw_message', 'stats_process_message($chan, $message);'); -eb_hook('snippet_dynamic', 'if ( $snippet === "memberlist" ) return stats_list_members($chan, $message); if ( $snippet === "deluser" ) return stats_del_user($chan, $message);'); -eb_hook('event_other', 'stats_handle_other_event($message);'); -eb_hook('event_privmsg', 'stats_handle_privmsg($message);'); - -function stats_init_channel(&$chan) -{ - global $stats_memberlist, $stats_prefixes, $stats_data; - - $channel_name = $chan->get_channel_name(); - $stats_memberlist[$channel_name] = array(); - $prefixes_regexp = '/^([' . preg_quote(implode('', $stats_prefixes)) . '])+/'; - $prefixes_flipped = array_flip($stats_prefixes); - $prefixes_regexp_notlist = '/[^' . preg_quote(implode('', $prefixes_flipped)) . ']/'; - - if ( !isset($stats_data['messages'][$channel_name]) ) - { - $stats_data['messages'][$channel_name] = array(); - } - - // read list of members from channel - @stream_set_timeout($chan->parent->sock, 3); - while ( $msg = $chan->parent->get() ) - { - if ( $ml = strstr($msg, ' 353 ') ) - { - $memberlist = trim(substr(strstr($ml, ':'), 1)); - $stats_memberlist[$channel_name] = explode(' ', $memberlist); - $stats_memberlist[$channel_name] = array_flip($stats_memberlist[$channel_name]); - foreach ( $stats_memberlist[$channel_name] as $nick => $_ ) - { - $stats_memberlist[$channel_name][$nick] = ''; - while ( preg_match($prefixes_regexp, $nick) ) - { - $prefix = substr($nick, 0, 1); - $add = preg_replace($prefixes_regexp_notlist, '', strval($stats_memberlist[$channel_name][$nick])); - unset($stats_memberlist[$channel_name][$nick]); - $nick = substr($nick, 1); - $stats_memberlist[$channel_name][$nick] = $prefixes_flipped[$prefix] . $add; - } - } - break; - } - } -} - -function stats_process_message(&$chan, $message) -{ - global $stats_memberlist, $stats_data; - $channel_name = $chan->get_channel_name(); - if ( !isset($stats_memberlist[$channel_name]) ) - { - return false; - } - - $ml =& $stats_memberlist[$channel_name]; - - // we need to change statistics accordingly depending on the event - if ( $message['action'] == 'JOIN' ) - { - // member joined - init their flags and up the member count by one - $ml[$message['nick']] = ''; - } - else if ( $message['action'] == 'PART' ) - { - // member left - clear flags and decrement the total member count - unset($ml[$message['nick']]); - $ml = array_values($ml); - } - else if ( $message['action'] == 'MODE' ) - { - // update member list (not sure why this would be useful, but export it anyway - display scripts might find it useful) - list($mode, $target) = explode(' ', $message['message']); - $action = substr($mode, 0, 1); - - global $stats_prefixes; - $ml[$target] = str_replace(substr($mode, 1), '', $ml[$target]); - if ( $action == '+' ) - { - $ml[$target] .= substr($mode, 1); - } - } - else if ( $message['action'] == 'PRIVMSG' ) - { - // private message into $channel_name - mark the user active and log the message time - if ( isset($stats_data['anonymous'][$message['nick']]) ) - $message['nick'] = 'Anonymous'; - - $messages =& $stats_data['messages'][$channel_name]; - - $messages[] = array( - 'time' => time(), - 'nick' => $message['nick'] - ); - } - - stats_cron(); -} - -function stats_list_members(&$chan, &$message) -{ - global $stats_memberlist; - $channel_name = $chan->get_channel_name(); - if ( !isset($stats_memberlist[$channel_name]) ) - { - return false; - } - - $ml =& $stats_memberlist[$channel_name]; - - $chan->parent->privmsg($message['nick'], "memberlist:\n" . str_replace("\n", ' ', print_r($ml, true))); - - return true; -} +require('statsincludes/stats_core.php'); +require('statsincludes/stats_logger.php'); +require('statsincludes/stats_frontend.php'); -function stats_del_user(&$chan, &$message) -{ - global $stats_memberlist, $privileged_list, $irc, $stats_data; - - // remove a user from the DB - $targetuser = trim(substr(strstr($message['message'], '|'), 1)); - if ( empty($targetuser) ) - $targetuser = $message['nick']; - - if ( $targetuser != $message['nick'] && !in_array($message['nick'], $privileged_list) ) - { - $irc->privmsg($message['nick'], "Sorry, you need to be a moderator to delete statistics for users other than yourself."); - return true; - } - - // we should be good - delete the user - foreach ( $stats_data['messages'] as $channel => &$messages ) - { - foreach ( $messages as $i => &$currentmessage ) - { - if ( $currentmessage['nick'] == $targetuser ) - { - unset($messages[$i]); - } - } - $messages = array_values($messages); - } - unset($users, $currentmessage, $messages); - - global $nick; - $greeting = ( $targetuser == $message['nick'] ) ? "All of your statistics data" : "All of {$targetuser}'s statistic data"; - $irc->privmsg($message['nick'], "$greeting has been removed from the database for all channels. The changes will show up in the next commit to disk, which is usually no more than once every two minutes."); - $irc->privmsg($message['nick'], "Want your stats to be anonymized in the future? Type /msg $nick anonymize to make me keep all your stats anonymous in the future. This only applies to your current nick though - for example if you change your nick to \"{$message['nick']}|sleep\" or similar your information will not be anonymous."); - $irc->privmsg($message['nick'], "You can't clear your logs if you're anonymous. Type /msg $nick denonymize to remove yourself from the anonymization list. Anonymized logs can't be converted back to their original nicks."); - - return true; -} - -function stats_handle_privmsg(&$message) -{ - global $irc, $stats_data, $nick; - static $poll_list = array(); - - $message['message'] = strtolower($message['message']); - - if ( trim($message['message']) === 'anonymize' ) - { - $stats_data['anonymous'][$message['nick']] = true; - $poll_list[$message['nick']] = true; - $irc->privmsg($message['nick'], "Anonymization complete. Any further statistics recorded about you will be anonymous."); - $irc->privmsg($message['nick'], "Do you want to also anonymize any past statistics about you? (type \"yes\" or \"no\")"); - } - else if ( trim($message['message']) === 'denonymize' ) - { - $stats_data['anonymous'][$message['nick']] = false; - unset($stats_data['anonymous'][$message['nick']]); - $irc->privmsg($message['nick'], "Denonymization complete. Any further statistics recorded about you will bear your nick. Remember that you can always change this with /msg $nick anonymize."); - } - else if ( trim($message['message']) === 'yes' && isset($poll_list[$message['nick']]) ) - { - // anonymize logs for this user - // we should be good - delete the user - $targetuser = $message['nick']; - - foreach ( $stats_data['messages'] as $channel => &$messages ) - { - foreach ( $messages as $i => &$currentmessage ) - { - if ( $currentmessage['nick'] == $targetuser ) - { - $currentmessage['nick'] = 'Anonymous'; - } - } - $messages = array_values($messages); - } - unset($users, $currentmessage, $messages); - $irc->privmsg($message['nick'], "Anonymization complete. All past statistics on your nick are now anonymous."); - - unset($poll_list[$message['nick']]); - } - stats_cron(); -} - -function stats_handle_other_event(&$message) -{ - global $stats_memberlist; - - if ( $message['action'] == 'NICK' ) - { - // we have a nick change; go through all channels and replace the old nick with the new - foreach ( $stats_memberlist as &$ml ) - { - if ( isset($ml[$message['nick']]) ) - { - $ml[$message['message']] = $ml[$message['nick']]; - unset($ml[$message['nick']]); - } - } - } - stats_cron(); -} - -function stats_cron() -{ - static $commit_time = 0; - $now = time(); - // commit to disk every 1 minute - if ( $commit_time + 60 < $now ) - { - $commit_time = $now; - stats_commit(); - } -} - -function stats_commit() -{ - global $stats_data, $stats_day; - - ob_start(); - var_export($stats_data); - $stats_data_exported = ob_get_contents(); - ob_end_clean(); - - $fp = @fopen("./stats/stats-data-$stats_day.php", 'w'); - if ( !$fp ) - return false; - fwrite($fp, " */ -$stats_merged_data = array('counts' => array(), 'messages' => array()); -$stats_data =& $stats_merged_data; - define('ENANOBOT_ROOT', dirname(__FILE__)); define('NOW', time()); +require(ENANOBOT_ROOT . '/config.php'); +require(ENANOBOT_ROOT . '/hooks.php'); +require(ENANOBOT_ROOT . '/database.php'); + +mysql_reconnect(); + +/** + * Gets ths list of channels. + * @return array + */ + +function stats_channel_list() +{ + return $GLOBALS['channels']; +} + /** * Gets the number of messages posted in IRC in the last X minutes. * @param string Channel @@ -23,26 +36,32 @@ function stats_message_count($channel, $mins = 10, $base = NOW) { - global $stats_merged_data; - + $channel = db_escape($channel); $time_min = $base - ( $mins * 60 ); - $time_max = $base; - - if ( !isset($stats_merged_data['messages'][$channel]) ) + $time_max =& $base; + if ( $q = eb_mysql_query("SELECT message_count FROM stats_count_cache WHERE time_min = $time_min AND time_max = $time_max AND channel = '$channel';") ) { - return 0; + if ( mysql_num_rows($q) > 0 ) + { + $row = mysql_fetch_assoc($q); + mysql_free_result($q); + return intval($row['message_count']); + } + mysql_free_result($q); } - - $count = 0; - foreach ( $stats_merged_data['messages'][$channel] as $message ) + if ( $q = eb_mysql_query("SELECT COUNT(message_id) FROM stats_messages WHERE channel = '$channel' AND time >= $time_min AND time <= $time_max;") ) { - if ( $message['time'] >= $time_min && $message['time'] <= $time_max ) + $row = mysql_fetch_row($q); + $count = $row[0]; + mysql_free_result($q); + // avoid caching future queries + if ( $base <= NOW ) { - $count++; + eb_mysql_query("INSERT INTO stats_count_cache(channel, time_min, time_max, message_count) VALUES('$channel', $time_min, $time_max, $count);"); } + return $count; } - - return $count; + return false; } /** @@ -55,50 +74,34 @@ function stats_activity_percent($channel, $mins = 10, $base = NOW) { - global $stats_merged_data; - if ( !($total = stats_message_count($channel, $mins, $base)) ) - { - return array(); - } - $results = array(); - $usercounts = array(); + $channel = db_escape($channel); $time_min = $base - ( $mins * 60 ); - $time_max = $base; - foreach ( $stats_merged_data['messages'][$channel] as $message ) + $time_max =& $base; + + if ( $q = eb_mysql_query("SELECT nick FROM stats_messages WHERE channel = '$channel' AND time >= $time_min AND time <= $time_max;") ) { - if ( $message['time'] >= $time_min && $message['time'] <= $time_max ) + $userdata = array(); + while ( $row = @mysql_fetch_assoc($q) ) { - if ( !isset($usercounts[$message['nick']]) ) - $usercounts[$message['nick']] = 0; - $usercounts[$message['nick']]++; + $total++; + if ( isset($userdata[ $row['nick'] ]) ) + { + $userdata[ $row['nick'] ]++; + } + else + { + $userdata[ $row['nick'] ] = 1; + } } - } - foreach ( $usercounts as $nick => $count ) - { - $results[$nick] = $count / $total; + foreach ( $userdata as &$val ) + { + $val = $val / $total; + } + mysql_free_result($q); + arsort($userdata); + return $userdata; } - arsort($results); - return $results; -} - -/** - * Loads X days of statistics, minimum. - * @param int Days to load, default is 1 - */ - -function load_stats_data($days = 1) -{ - $days++; - for ( $i = 0; $i < $days; $i++ ) - { - $day = NOW - ( $i * 86400 ); - $day = gmdate('Ymd', $day); - if ( file_exists(ENANOBOT_ROOT . "/stats/stats-data-$day.php") ) - { - require(ENANOBOT_ROOT . "/stats/stats-data-$day.php"); - stats_merge($stats_data); - } - } + return false; } /** @@ -108,59 +111,8 @@ function stats_last_updated() { - $day = gmdate('Ymd'); - $file = ENANOBOT_ROOT . "/stats/stats-data-$day.php"; - return ( file_exists($file) ) ? filemtime($file) : 0; + // :-D + return NOW; } -/** - * Merges a newly loaded stats array with the current cache in RAM. - * @param array Data to merge - * @access private - */ -function stats_merge($data) -{ - global $stats_merged_data; - if ( isset($data['counts']) ) - { - foreach ( $data['counts'] as $channel => $chaninfo ) - { - if ( isset($stats_merged_data['counts'][$channel]) ) - { - foreach ( $stats_merged_data['counts'][$channel] as $key => &$value ) - { - if ( is_int($value) ) - { - $value = max($value, $chaninfo[$key]); - } - else if ( is_array($value) ) - { - $value = array_merge($value, $chaninfo[$key]); - } - } - } - else - { - $stats_merged_data['counts'][$channel] = $chaninfo; - } - } - } - foreach ( $data['messages'] as $channel => $chandata ) - { - if ( isset($stats_merged_data['messages'][$channel]) ) - { - foreach ( $chandata as $message ) - { - $stats_merged_data['messages'][$channel][] = $message; - } - } - else - { - $stats_merged_data['messages'][$channel] = $chandata; - } - } -} - -load_stats_data(); - diff -r eb92dc5d9fb4 -r e2f6e3af9959 statsincludes/stats_core.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/statsincludes/stats_core.php Sat Nov 15 15:00:52 2008 -0500 @@ -0,0 +1,85 @@ +privmsg($message['nick'], "Sorry, you need to be a moderator to delete statistics for users other than yourself."); + return true; + } + + // we should be good - delete the user + stats_del_user($chan->get_channel_name(), $targetuser); + + global $nick; + $greeting = ( $targetuser == $message['nick'] ) ? "All of your statistics data" : "All of {$targetuser}'s statistic data"; + $irc->privmsg($message['nick'], "$greeting has been removed from the database for all channels. The changes will show up in the next commit to disk, which is usually no more than once every two minutes."); + $irc->privmsg($message['nick'], "Want your stats to be anonymized in the future? Type /msg $nick anonymize to make me keep all your stats anonymous in the future. This only applies to your current nick though - for example if you change your nick to \"{$message['nick']}|sleep\" or similar your information will not be anonymous."); + $irc->privmsg($message['nick'], "You can't clear your logs if you're anonymous. Type /msg $nick denonymize to remove yourself from the anonymization list. Anonymized logs can't be converted back to their original nicks."); + + return true; +} + +## +## Anonymization +## + +eb_hook('event_privmsg', 'stats_handle_privmsg($message);'); + +function stats_handle_privmsg($message) +{ + global $irc, $stats_data, $nick; + static $poll_list = array(); + + $message['message'] = strtolower($message['message']); + + if ( trim($message['message']) === 'anonymize' ) + { + if ( stats_anonymize_user_now($message['nick']) ) + { + $irc->privmsg($message['nick'], "Anonymization complete. Any further statistics recorded about you will be anonymous."); + $irc->privmsg($message['nick'], "Do you want to also anonymize any past statistics about you? (type \"yes\" or \"no\")"); + $poll_list[$message['nick']] = true; + } + else + { + $irc->privmsg($message['nick'], "You're already marked as anonymous."); + } + } + else if ( trim($message['message']) === 'denonymize' ) + { + if ( stats_denonymize_user($message['nick']) ) + { + $irc->privmsg($message['nick'], "Denonymization complete. Any further statistics recorded about you will bear your nick. Remember that you can always change this with /msg $nick anonymize."); + } + else + { + $irc->privmsg($message['nick'], "You're not marked as anonymous."); + } + } + else if ( trim($message['message']) === 'yes' && isset($poll_list[$message['nick']]) ) + { + // anonymize logs for this user + stats_anonymize_user_past($message['nick']); + $irc->privmsg($message['nick'], "Anonymization complete. All past statistics on your nick are now anonymous."); + + unset($poll_list[$message['nick']]); + } + else if ( isset($poll_list[$message['nick']]) ) + { + unset($poll_list[$message['nick']]); + } +} + diff -r eb92dc5d9fb4 -r e2f6e3af9959 statsincludes/stats_logger.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/statsincludes/stats_logger.php Sat Nov 15 15:00:52 2008 -0500 @@ -0,0 +1,10 @@ +get_channel_name(); + stats_log_message($channel, $message['nick'], time()); +} +