[inc/Util] Add types, move error printing functions to their own class

1 files changed, 12 insertions, 12 deletions

diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php
index fadc649a..269146d3 100644
--- a/modules-available/sysconfig/inc/configmodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule.inc.php
@@ -68,15 +68,15 @@ abstract class ConfigModule
 	public static function registerModule($id, $title, $description, $group, $unique, $sortOrder = 0)
 	{
 		if (isset(self::$moduleTypes[$id])) {
-			Util::traceError("Config Module $id already registered!");
+			ErrorHandler::traceError("Config Module $id already registered!");
 		}
 		$moduleClass = 'ConfigModule_' . $id;
 		$wizardClass = $id . '_Start';
 		if (!class_exists($moduleClass)) {
-			Util::traceError("Class $moduleClass does not exist!");
+			ErrorHandler::traceError("Class $moduleClass does not exist!");
 		}
 		if (!is_subclass_of($moduleClass, 'ConfigModule')) {
-			Util::traceError("$moduleClass does not have ConfigModule as its parent!");
+			ErrorHandler::traceError("$moduleClass does not have ConfigModule as its parent!");
 		}
 		self::$moduleTypes[$id] = array(
 			'title' => $title,
@@ -277,10 +277,10 @@ abstract class ConfigModule
 	{
 		$name = get_class($this);
 		if ($name === false)
-			Util::traceError('ConfigModule::moduleType: get_class($this) returned false!');
+			ErrorHandler::traceError('ConfigModule::moduleType: get_class($this) returned false!');
 		// ConfigModule_*
 		if (!preg_match('/^ConfigModule_(\w+)$/', $name, $out))
-			Util::traceError('ConfigModule::moduleType: get_class($this) returned "' . $name . '"');
+			ErrorHandler::traceError('ConfigModule::moduleType: get_class($this) returned "' . $name . '"');
 		return $out[1];
 	}
 
@@ -295,7 +295,7 @@ abstract class ConfigModule
 	public final function insert($title)
 	{
 		if ($this->moduleId !== 0)
-			Util::traceError('ConfigModule::insert called when moduleId != 0');
+			ErrorHandler::traceError('ConfigModule::insert called when moduleId != 0');
 		if (!$this->validateConfig())
 			return false;
 		$this->moduleTitle = $title;
@@ -311,7 +311,7 @@ abstract class ConfigModule
 		));
 		$this->moduleId = Database::lastInsertId();
 		if (!is_numeric($this->moduleId))
-			Util::traceError('Inserting new config module into DB did not yield a numeric insert id');
+			ErrorHandler::traceError('Inserting new config module into DB did not yield a numeric insert id');
 		$this->moduleArchive = $this->createFileName();
 		Database::exec("UPDATE configtgz_module SET filepath = :path WHERE moduleid = :moduleid LIMIT 1", array(
 			'path' => $this->moduleArchive,
@@ -329,7 +329,7 @@ abstract class ConfigModule
 	public final function update($title = '')
 	{
 		if ($this->moduleId === 0)
-			Util::traceError('ConfigModule::update called when moduleId == 0');
+			ErrorHandler::traceError('ConfigModule::update called when moduleId == 0');
 		if (!empty($title)) {
 			$this->moduleTitle = $title;
 		}
@@ -362,7 +362,7 @@ abstract class ConfigModule
 	public final function generate($deleteOnError, $parent = NULL, $timeoutMs = 0)
 	{
 		if ($this->moduleId === 0 || $this->moduleTitle === false)
-			Util::traceError('ConfigModule::generateAsync called on uninitialized/uninserted module!');
+			ErrorHandler::traceError('ConfigModule::generateAsync called on uninitialized/uninserted module!');
 		$tmpTgz = '/tmp/bwlp-id-' . $this->moduleId . '_' . mt_rand() . '_' . time() . '.tgz';
 		$ret = $this->generateInternal($tmpTgz, $parent);
 		// Wait for generation if requested
@@ -398,7 +398,7 @@ abstract class ConfigModule
 	public final function delete()
 	{
 		if ($this->moduleId === 0)
-			Util::traceError('ConfigModule::delete called with invalid module id!');
+			ErrorHandler::traceError('ConfigModule::delete called with invalid module id!');
 		$ret = Database::exec("DELETE FROM configtgz_module WHERE moduleid = :moduleid LIMIT 1", array(
 				'moduleid' => $this->moduleId
 			), true) !== false;
@@ -416,7 +416,7 @@ abstract class ConfigModule
 	private final function markUpdated($tmpTgz)
 	{
 		if ($this->moduleId === 0)
-			Util::traceError('ConfigModule::markUpdated called with invalid module id!');
+			ErrorHandler::traceError('ConfigModule::markUpdated called with invalid module id!');
 		if ($this->moduleArchive === false)
 			$this->moduleArchive = $this->createFileName();
 		// Move file
@@ -463,7 +463,7 @@ abstract class ConfigModule
 	private final function markFailed()
 	{
 		if ($this->moduleId === 0)
-			Util::traceError('ConfigModule::markFailed called with invalid module id!');
+			ErrorHandler::traceError('ConfigModule::markFailed called with invalid module id!');
 		if ($this->moduleArchive === false)
 			$this->moduleArchive = $this->createFileName();
 		if (!file_exists($this->moduleArchive))