Fix 2 typos in the web code

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index 452a285..70e8912 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -36,12 +36,13 @@ import templates
 from Cheetah.Template import Template
 import validation
 import cache_acls
 from Cheetah.Template import Template
 import validation
 import cache_acls

-from webcommon import InvalidInput, CodeError, State
+from webcommon import State

 import controls
 from getafsgroups import getAfsGroupMembers
 from invirt import database
 from invirt.database import Machine, CDROM, session, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
 import controls
 from getafsgroups import getAfsGroupMembers
 from invirt import database
 from invirt.database import Machine, CDROM, session, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config

+from invirt.common import InvalidInput, CodeError

 
 def pathSplit(path):
     if path.startswith('/'):
 
 def pathSplit(path):
     if path.startswith('/'):

@@ -245,7 +246,7 @@ def vnc(username, state, path, fields):
     """
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 
     """
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 

-    token = controls.remctl('control', machine.name, 'vnctoken')
+    token = controls.vnctoken(machine)

     host = controls.listHost(machine)
     if host:
         port = 10003 + [h.hostname for h in config.hosts].index(host)
     host = controls.listHost(machine)
     if host:
         port = 10003 + [h.hostname for h in config.hosts].index(host)