merged with Mariano's branch (inlucdes better debug.py and ace editor

This commit is contained in:
Massimo DiPierro
2012-03-13 21:15:04 -05:00
parent 80e36aec6a
commit f75a4cbe45
46 changed files with 990 additions and 34 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
import os, time
import base64, os, time
from gluon import portalocker
from gluon.admin import apath
from gluon.fileutils import read_file
@@ -125,7 +125,7 @@ if request.controller == "webservices":
if not basic or not basic[:6].lower() == 'basic ':
raise HTTP(401,"Wrong credentials")
(username, password) = base64.b64decode(basic[6:]).split(':')
if not verify_password(password) or not is_manager():
if not verify_password(password) or MULTI_USER_MODE:
time.sleep(10)
raise HTTP(403,"Not authorized")
elif not session.authorized and not \