[X2Go-Commits] x2gobroker.git - master-inai (branch) updated: 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf
X2Go dev team
git-admin at x2go.org
Tue Apr 23 21:08:24 CEST 2013
The branch, master-inai has been updated
via 5b273ab1ecaf19c40ce1ea3de05290d5a7fc46cf (commit)
from 6dfb975d5022d3124329fb01e6cf2bb00be7228b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2gobroker/web/plain.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index cc93fc9..36afe63 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -69,8 +69,8 @@ class X2GoBrokerWebPlain:
except AttributeError: authid = ''
try: task = data.task
except AttributeError: task = ''
- try: profile_name = data.sid
- except AttributeError: profile_name = ''
+ try: profile_id = data.sid
+ except AttributeError: profile_id = ''
try: new_password = data.newpass
except AttributeError: new_password = ''
@@ -128,12 +128,15 @@ class X2GoBrokerWebPlain:
elif task == 'selectsession':
- if profile_name:
+ if profile_id:
- profile_info = broker_backend.select_profile(profile_name=profile_name)
+ profile_info = broker_backend.select_session(profile_id=profile_id)
if profile_info.has_key('server'):
output += "SERVER:"
- output += profile_info['server'] + "\n"
+ output += profile_info['server']
+ if profile_info.has_key('port'):
+ output += ":{port}".format(port=profile_info['port'])
+ output += "\n"
if profile_info.has_key('authentication_key'):
output += ""
if profile_info.has_key('session_info'):
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list