[FIX] document_ftp: avoid calling res.users.read() with too few arguments (it's broken, pending fix)
bzr revid: odo@openerp.com-20110819144241-9eay9dnqdod7sn6y
This commit is contained in:
parent
4e1bcd16f9
commit
c88c35ce80
|
@ -36,13 +36,13 @@ def get_plain_ftp(timeout=10.0):
|
|||
|
||||
def get_ftp_login(cr, uid, ormobj):
|
||||
ftp = get_plain_ftp()
|
||||
user = ormobj.pool.get('res.users').read(cr, uid, uid)
|
||||
passwd = user.get('password','')
|
||||
user = ormobj.pool.get('res.users').browse(cr, uid, uid)
|
||||
passwd = user.password or ''
|
||||
if passwd.startswith("$1$"):
|
||||
# md5 by base crypt. We cannot decode, wild guess
|
||||
# md5 by base crypt. We cannot decode, wild guess
|
||||
# that passwd = login
|
||||
passwd = user.get('login', '')
|
||||
ftp.login(user.get('login',''), passwd)
|
||||
passwd = user.login
|
||||
ftp.login(user.login, passwd)
|
||||
ftp.cwd("/" + cr.dbname)
|
||||
return ftp
|
||||
|
||||
|
|
Loading…
Reference in New Issue