Index: sentry_server/sentry_server.module
===================================================================
--- sentry_server/sentry_server.module	(revision 2850)
+++ sentry_server/sentry_server.module	(working copy)
@@ -261,7 +261,7 @@
   // Load the basic site information information
   $sentry_site = db_fetch_object(db_query('SELECT hostname, core_status, plugins, update_period, last_updated, cron_key FROM {sentry_sites} WHERE nid = %d', $node->nid));
 
-  if (!empty($sentry_server->hostname)) {
+  if (!empty($sentry_site->hostname)) {
     $site->hostname = $sentry_site->hostname;
     $site->sentry_last_updated = $sentry_site->last_updated;
     $site->sentry_update_period = $sentry_site->update_period;
@@ -349,7 +349,7 @@
     $enabled_plugins = $node->plugins;
     foreach ($enabled_plugins as $key => $plugin) {
       // If plugin declares an xmlrpc callback it uses we call it, handle errors.
-      if (isset($available_plugins[$key]['xmlrpc_callback'])) { 
+      if (isset($available_plugins[$key]['xmlrpc_callback'])) {
         sentry_xmlrpc_call($key, $available_plugins[$key], $node);
       }
       else { // Just call handler with the node as argument.
@@ -384,7 +384,7 @@
     if ($error->code <= 0 && !isset($error->message)) {
       $error->message = t('Outgoing HTTP request failed because the socket could not be opened.');
     }
-    watchdog('sentry server', '%plugin XML-RPC call for %node failed, error: %message (@code).', 
+    watchdog('sentry server', '%plugin XML-RPC call for %node failed, error: %message (@code).',
       array(
         '%plugin' => $plugin,
         '%node' => $node->title,
@@ -517,7 +517,7 @@
  * @param $node
  *   The node we want to create a report about.
  * @return
- *   A keyed array of requirements. Each requirement is itself an array with the following items: 
+ *   A keyed array of requirements. Each requirement is itself an array with the following items:
  *   - 'title': the name of the requirement.
  *   - 'value': the current value (e.g. version, time, level, ...). During install phase, this should only be used for version numbers, do not set it if not applicable.
  *   - 'description': description of the requirement/status.
@@ -525,7 +525,7 @@
  *     o REQUIREMENT_INFO: For info only.
  *     o REQUIREMENT_OK: The requirement is satisfied.
  *     o REQUIREMENT_WARNING: The requirement failed with a warning.
- *     o REQUIREMENT_ERROR: The requirement failed with an error. 
+ *     o REQUIREMENT_ERROR: The requirement failed with an error.
  */
 function sentry_server_sentry_report($node, $check_plugin = NULL) {
   $plugins = sentry_server_plugin_info();
@@ -599,7 +599,7 @@
  */
 function sentry_server_http_report($node, $plugin_info) {
   $max = 10;
-  $result = db_query_range('SELECT code, delay FROM {sentry_http_history} WHERE nid = %d ORDER BY timestamp DESC', $node->nid, 0, $max); 
+  $result = db_query_range('SELECT code, delay FROM {sentry_http_history} WHERE nid = %d ORDER BY timestamp DESC', $node->nid, 0, $max);
 
   $http = array();
   $count = 0;
@@ -701,12 +701,13 @@
   if (!isset($node_cache[$node->nid])) {
     // First of all lets find out which modules implement the plugin.
     $return = array();
+    $args = array();
     foreach (module_implements('plugin_info') as $module) {
       $function = $module .'_plugin_info';
       $return[$module] = call_user_func_array($function, $args);
     }
 
-    // Certain node has $node->plugins enabled. We need to find out which module 
+    // Certain node has $node->plugins enabled. We need to find out which module
     // implements these.
     foreach ($return as $module => $plugins) {
       foreach ($node->plugins as $key => $plugin) {