Unneeded require_once

diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php
index 86cff9a..723184d 100644 (file)
--- a/nag/lib/Driver.php
+++ b/nag/lib/Driver.php
@@ -245,7 +245,6 @@ class Nag_Driver
             $alarm = $task->toAlarm();
             if ($alarm) {
                 $alarm['start'] = new Horde_Date($alarm['start']);
-                require_once 'Horde/Alarm.php';
                 $horde_alarm = Horde_Alarm::factory();
                 $horde_alarm->set($alarm);
             }
@@ -303,7 +302,6 @@ class Nag_Driver
 
         /* Update alarm if necessary. */
         if (!empty($GLOBALS['conf']['alarms']['driver'])) {
-            require_once 'Horde/Alarm.php';
             $horde_alarm = Horde_Alarm::factory();
             if (empty($alarm) || $completed) {
                 $horde_alarm->delete($task->uid);
@@ -411,7 +409,6 @@ class Nag_Driver
         /* Delete alarm if necessary. */
         if (!empty($GLOBALS['conf']['alarms']['driver']) &&
             !empty($task->alarm)) {
-            require_once 'Horde/Alarm.php';
             $horde_alarm = Horde_Alarm::factory();
             $horde_alarm->delete($task->uid);
         }

diff --git a/nag/lib/Driver/Sql.php b/nag/lib/Driver/Sql.php
index 300df78..aa66f60 100644 (file)
--- a/nag/lib/Driver/Sql.php
+++ b/nag/lib/Driver/Sql.php
@@ -593,7 +593,6 @@ class Nag_Driver_Sql extends Nag_Driver {
         }
 
         /* Connect to the SQL server using the supplied parameters. */
-        require_once 'DB.php';
         $this->_write_db = DB::connect($this->_params,
                                        array('persistent' => !empty($this->_params['persistent']),
                                              'ssl' => !empty($this->_params['ssl'])));

diff --git a/nag/lib/Forms/task.php b/nag/lib/Forms/task.php
index 7bd94b5..94202b7 100644 (file)
--- a/nag/lib/Forms/task.php
+++ b/nag/lib/Forms/task.php
@@ -50,7 +50,7 @@ class Nag_TaskForm extends Horde_Form {
             $groups = $share->listGroups(Horde_Perms::READ);
             if (count($groups)) {
                 require_once 'Horde/Group.php';
-                $horde_group = &Group::singleton();
+                $horde_group = Group::singleton();
                 foreach ($groups as $group) {
                     $users = array_merge($users,
                                          $horde_group->listAllUsers($group));