refactored all error handler includes into load.php

src/inc/load.php

@@ -33,6 +33,7 @@
 require_once(dirname(__FILE__) . "/notifications/Notification.class.php");
 require_once(dirname(__FILE__) . "/api/APIBasic.class.php");
 require_once(dirname(__FILE__) . "/user-api/UserAPIBasic.class.php");
+require_once(dirname(__FILE__) . "/apiv2/common/ErrorHandler.class.php");
 $directories = array('handlers', 'api', 'defines', 'utils', 'notifications', 'user-api');
 foreach ($directories as $directory) {
   $dir = scandir(dirname(__FILE__) . "/$directory/");

src/inc/utils/AccessControlUtils.class.php

@@ -5,7 +5,6 @@
 use DBA\RightGroup;
 use DBA\Factory;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class AccessControlUtils {
   /**
    * @param int $groupId
@@ -130,4 +129,4 @@ public static function getGroup($groupId) {
     }
     return $group;
   }
-}
+}

src/inc/utils/AccessGroupUtils.class.php

@@ -12,7 +12,6 @@
 use DBA\Factory;
 use DBA\File;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class AccessGroupUtils {
   /**
    * @param int $groupId

src/inc/utils/AgentUtils.class.php

@@ -19,7 +19,6 @@
 use DBA\HealthCheckAgent;
 use DBA\Speed;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class AgentUtils {
   /**
    * @param AgentStat $deviceUtil

src/inc/utils/CrackerUtils.class.php

@@ -8,7 +8,6 @@
 use DBA\Factory;
 use DBA\Pretask;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class CrackerUtils {
   /**
    * @param CrackerBinaryType $cracker
@@ -154,4 +153,4 @@ public static function getBinary($binaryId) {
     }
     return $binary;
   }
-}
+}

src/inc/utils/FileUtils.class.php

@@ -12,7 +12,6 @@
 use DBA\ContainFilter;
 use DBA\FileDelete;
 use DBA\Factory;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class FileUtils {
   /**
@@ -364,4 +363,4 @@ public static function fileCountLines($fileId) {
       Factory::getFileFactory()->set($file, File::LINE_COUNT, $count);
     }
   }
-}
+}

src/inc/utils/HashlistUtils.class.php

@@ -23,7 +23,6 @@
 use DBA\AgentZap;
 use DBA\Factory;
 use DBA\Speed;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class HashlistUtils {
   /**

src/inc/utils/HashtypeUtils.class.php

@@ -6,7 +6,6 @@
 use DBA\QueryFilter;
 use DBA\Factory;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class HashtypeUtils {
   /**
    * @param int $hashtypeId
@@ -63,4 +62,4 @@ public static function addHashtype(int $hashtypeId, string $description, int $is
     Util::createLogEntry("User", $user->getId(), DLogEntry::INFO, "New Hashtype added: " . $hashtype->getDescription());
     return $hashtype;
   }
-}
+}

src/inc/utils/HealthUtils.class.php

@@ -6,7 +6,6 @@
 use DBA\Factory;
 use DBA\HealthCheck;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class HealthUtils {
   /**
    * @param int $checkAgentId
@@ -224,4 +223,4 @@ public static function deleteHealthCheck($healthCheckId) {
     Factory::getHealthCheckAgentFactory()->massDeletion([Factory::FILTER => $qF]);
     Factory::getHealthCheckFactory()->delete($healthCheck);
   }
-}
+}

src/inc/utils/NotificationUtils.class.php

@@ -4,7 +4,6 @@
 use DBA\User;
 use DBA\Factory;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class NotificationUtils {
   /**
    * @param string $actionType
@@ -125,4 +124,4 @@ public static function getNotification($notification) {
     }
     return $notification;
   }
-}
+}

src/inc/utils/PreprocessorUtils.class.php

@@ -4,7 +4,6 @@
 use DBA\Preprocessor;
 use DBA\QueryFilter;
 use DBA\Task;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class PreprocessorUtils {
 
@@ -235,4 +234,4 @@ public static function editPreprocessor($preprocessorId, $name, $binaryName, $ur
       ]
     );
   }
-}
+}

src/inc/utils/PretaskUtils.class.php

@@ -9,7 +9,6 @@
 use DBA\SupertaskPretask;
 use DBA\Factory;
 
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 class PretaskUtils {
   /**
    * @param int $pretaskId

src/inc/utils/SupertaskUtils.class.php

@@ -13,7 +13,6 @@
 use DBA\Factory;
 use DBA\File;
 use DBA\FilePretask;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class SupertaskUtils {
   /**

src/inc/utils/TaskUtils.class.php

@@ -27,7 +27,6 @@
 use DBA\Factory;
 use DBA\Speed;
 use DBA\Aggregation;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class TaskUtils {
   /**

src/inc/utils/TaskwrapperUtils.class.php

@@ -4,7 +4,6 @@
 use DBA\Task;
 use DBA\QueryFilter;
 use DBA\JoinFilter;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class TaskwrapperUtils {
 
@@ -45,4 +44,4 @@ public static function updatePriority($taskWrapperId, $priority, $user) {
         assert(False, "Internal Error: taskType not recognized");
     }
   }
-}
+}

src/inc/utils/UserUtils.class.php

@@ -8,7 +8,6 @@
 use DBA\NotificationSetting;
 use DBA\Agent;
 use DBA\Factory;
-require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php';
 
 class UserUtils {
   /**
@@ -238,4 +237,4 @@ public static function getUser($userId) {
     }
     return $user;
   }
-}
+}