Partially revert 4da58a5

This won't work as inteded, as both agendas AND alarms can set $user.
This was causing non-admin users to have 'busy' appear as the alarm
title in place of the actual event title.

kronolith/lib/Event.php

@@ -2583,9 +2583,8 @@ public function boundExceptions($flat = true)
      * Returns whether the event should be considered private.
      *
      * The event's private flag can be overriden if the current user
-     * is an administrator and the code is run from command line, and no
-     * $user parameter was passed. This is to allow full event notifications in
-     * alarm messages (agendas know the user the agenda is being prepared for).
+     * is an administrator and the code is run from command line. This is to
+     * allow full event notifications in alarm messages.
      *
      * @param string $user  The current user. If omitted, uses the current user.
      *
@@ -2595,21 +2594,20 @@ public function isPrivate($user = null)
     {
         global $registry;
 
-        $haveNullUser = false;
         if ($user === null) {
             $user = $registry->getAuth();
-            $haveNullUser = true;
         }
 
         if (!(Horde_Cli::runningFromCLI() && $registry->isAdmin()) &&
             $this->private && $this->creator != $user) {
             return true;
         }
 
-        if (($registry->isAdmin() && $haveNullUser) ||
+        if ($registry->isAdmin() ||
              $this->hasPermission(Horde_Perms::READ, $user)) {
             return false;
         }
+
         return true;
     }