Fixed bug pointed out by Broder with vmtype default and XHTML.

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

diff --git a/code/main.py b/code/main.py
index b6f7b7f..e119e0e 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -12,7 +12,7 @@ import simplejson
 import sys
 import time
 import urllib
-import os
+import socket
 from StringIO import StringIO
 
 def revertStandardError():
@@ -151,7 +151,7 @@ def parseCreate(username, state, fields):
     kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()])
     validate = validation.Validate(username, state, strict=True, **kws)
     return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory,
-                disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype,
+                disksize=validate.disksize, owner=validate.owner, machine_type=getattr(validate, 'vmtype', Defaults.type),
                 cdrom=getattr(validate, 'cdrom', None),
                 autoinstall=getattr(validate, 'autoinstall', None))
 
@@ -608,7 +608,7 @@ def info(username, state, path, fields):
 def unauthFront(_, _2, _3, fields):
     """Information for unauth'd users."""
     return templates.unauth(searchList=[{'simple' : True, 
-            'hostname' : os.environ['HOSTNAME'] if 'HOSTNAME' in os.environ else 'xvm.mit.edu'}])
+            'hostname' : socket.getfqdn()}])
 
 def admin(username, state, path, fields):
     if path == '':