Logged In: YES 
user_id=6405

The first part of the patch is applied. 

The second part of the patch is a problem though when the
"now" calculation happens over a day boundary. I've modified
the patch to at least handle time values a little better.
The day boundary problem is extraordinarily unlikely, but
would be messy ;)

ps. in the future, please supply context diffs (diff -c) so
I know which parts of the code you're adding your code to :)

pps. this ain't a bug, really ;)