From 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 26 Sep 2010 09:36:55 -0400
Subject: [PATCH] Merged revisions 1917-2036 from trunk.
---
server/lib/classes/services.inc.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/services.inc.php b/server/lib/classes/services.inc.php
index 3f9e6e4..e53eee0 100644
--- a/server/lib/classes/services.inc.php
+++ b/server/lib/classes/services.inc.php
@@ -41,7 +41,7 @@
if(is_array($this->registered_services[$service_name])) {
$this->delayed_restarts[$service_name] = $action;
} else {
- $app->log("Unable to add a delayed restart for '$service_name'. Service '$service_name' is not registered.",LOGLEVEL_WARNING);
+ $app->log("Unable to add a delayed restart for '$service_name'. Service not registered.",LOGLEVEL_WARNING);
}
}
@@ -51,12 +51,12 @@
global $app;
if(is_array($this->registered_services[$service_name])) {
- $module_name = $this->registered_services[$service_name]["module"];
- $function_name = $this->registered_services[$service_name]["function"];
- $app->log("Call function '$function_name' in module '$module_name'.",LOGLEVEL_DEBUG);
+ $module_name = $this->registered_services[$service_name]['module'];
+ $function_name = $this->registered_services[$service_name]['function'];
+ $app->log("Calling function '$function_name' from module '$module_name'.",LOGLEVEL_DEBUG);
call_user_method($function_name,$app->loaded_modules[$module_name],$action);
} else {
- $app->log("Unable to restart $service_name. Service $service_name is not registered.",LOGLEVEL_WARNING);
+ $app->log("Unable to restart $service_name. Service not registered.",LOGLEVEL_WARNING);
}
}
@@ -77,4 +77,4 @@
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1