Updates to PHP 5/Horde 4 coding standards.

diff --git a/framework/SessionHandler/lib/Horde/SessionHandler.php b/framework/SessionHandler/lib/Horde/SessionHandler.php
index 7258b83..ef8431b 100644 (file)
--- a/framework/SessionHandler/lib/Horde/SessionHandler.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler.php
@@ -332,8 +332,8 @@ class Horde_SessionHandler
      * Returns a list of authenticated users and data about their session.
      *
      * @return array  For authenticated users, the sessionid as a key and the
-     *                information returned from Horde_Auth::readSessionData() as
-     *                values.
+     *                information returned from Horde_Auth::readSessionData()
+     *                as values.
      * @throws Horde_Exception
      */
     public function getSessionsInfo()

diff --git a/framework/SessionHandler/scripts/Horde/SessionHandler/horde-active-sessions.php b/framework/SessionHandler/scripts/Horde/SessionHandler/horde-active-sessions.php
index c6832a4..9782793 100755 (executable)
--- a/framework/SessionHandler/scripts/Horde/SessionHandler/horde-active-sessions.php
+++ b/framework/SessionHandler/scripts/Horde/SessionHandler/horde-active-sessions.php
@@ -7,8 +7,6 @@
  *   '-l'   List the username of active authenticated users
  *   '-ll'  List the username and login time of active authenticated users
  *
- * $Horde: framework/SessionHandler/scripts/horde-active-sessions.php,v 1.7 2008/09/22 03:50:58 slusarz Exp $
- *
  * @package Horde_SessionHandler
  */
 
@@ -48,9 +46,6 @@ if ($type == 'external') {
 }
 
 $sessions = $GLOBALS['horde_sessionhandler']->getSessionsInfo();
-if (is_a($sessions, 'PEAR_Error')) {
-    throw new Horde_Exception($sessions);
-}
 
 if (($argc < 2) || (($argv[1] != '-l') && ($argv[1] != '-ll'))) {
     $cli->writeln(count($sessions));