From: Manuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Date: Thu, 7 Feb 2013 20:14:13 +0000 (+0100)
Subject: Resolved Port Forwarding Conflict
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e9c43bbf352ce514d7be8910d7e5a02cced723b6;p=daqtools.git

Resolved Port Forwarding Conflict
---

diff --git a/web/htdocs/cts.pl b/web/htdocs/cts.pl
index 9827e1d..d25697c 100755
--- a/web/htdocs/cts.pl
+++ b/web/htdocs/cts.pl
@@ -78,7 +78,8 @@ if ($query eq "init") {
    printHeader;
    print JSON_BIND->new->allow_blessed->convert_blessed->encode({
       'registers' => $cts->getRegisters,
-      'properties' => $cts->getProperties
+      'properties' => $cts->getProperties,
+      'server' => {'port' => $ENV{'SERVER_PORT'}}
    });
    
 } elsif ($query =~ /^(format|read),([\w\d_,]+)$/) {
@@ -134,5 +135,4 @@ if ($query eq "init") {
 
    print(commandDump($cts, $mode));
 }
-   
 1;
diff --git a/web/htdocs/scripts/base.js b/web/htdocs/scripts/base.js
index 810f9b9..69254b9 100644
--- a/web/htdocs/scripts/base.js
+++ b/web/htdocs/scripts/base.js
@@ -71,7 +71,7 @@ var CTS = new Class({
    
    initialize: function(defs) {
       this.defs = defs;
-      this.monitorPrefix = 'monitor-' + window.location.port + '/';
+      this.monitorPrefix = 'monitor-' + this.defs.server.port + '/';
 
       this.renderTriggerChannels();
       this.renderTriggerInputs();