Added *REQUIRED* call compileConfigInVariables(), added missing config entry 'node_id'

diff --git a/application/hub/config.php b/application/hub/config.php
index b204990208a774eb360eb8ceca57b206158a0f5b..9a86fcda7ff1bb64314c9af8a7283df6008f7780 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -558,6 +558,9 @@ $cfg->setConfigEntry('udp_connect_retry_max', 5);
 // CFG: NODE-STATE-CHECKED-PACKAGE-CLASS
 $cfg->setConfigEntry('node_state_checked_package_class', 'NewConnectionNodeState');
 
+// CFG: NODE-ID
+$cfg->setConfigEntry('node_id', '');
+
 // CFG: SESSION-ID
 $cfg->setConfigEntry('session_id', '');
 

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index db4055a12360926d62f62b52b84354308972dbcb..1ba56ca42e3dacb73d502a9cba8c16ac0de41776 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -433,6 +433,9 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                // Load the descriptor (XML) file
                $helperInstance->loadDescriptorXml();
 
+               // Compile all variables
+               $helperInstance->getTemplateInstance()->compileConfigInVariables();
+
                // And send the package away
                $helperInstance->sendPackage($this);
 

diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
index 0908b9e7fa918c48faa2028a0c6d0435b48d22cf..a80245dda0c4a3c9de1220fc5708fafb81c58537 100644 (file)
--- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
+++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
@@ -258,8 +258,10 @@ class XmlSelfConnectTemplateEngine extends BaseTemplateEngine implements Compile
                        return false;
                } // END - if
 
-               // Assign the found characters to variable and use the last entry from
-               // stack as the name
+               /*
+                * Assign the found characters to variable and use the last entry from
+                * stack as the name
+                */
                parent::assignVariable($this->getStackerInstance()->getNamed('self_connect'), $characters);
        }