#!/usr/bin/env python
#***************************************************************************
-#* Copyright (C) 2004-2008 polytechnique.org *
+#* Copyright (C) 2003-2010 Polytechnique.org *
#* http://opensource.polytechnique.org/ *
#* *
#* This program is free software; you can redistribute it and/or modify *
def getUser(self, uid, md5, vhost):
res = mysql_fetchone ("""SELECT CONCAT(u.prenom, ' ', u.nom), a.alias, u.perms
FROM auth_user_md5 AS u
- INNER JOIN aliases AS a ON ( a.id=u.user_id AND a.type='a_vie' )
+ INNER JOIN aliases AS a ON ( a.uid=u.user_id AND a.type='a_vie' )
WHERE u.user_id = '%s' AND u.password = '%s' AND u.perms IN ('admin', 'user')
LIMIT 1""" %( uid, md5 ) )
if res:
if ( fqdn == PLATAL_DOMAIN ) or ( fqdn == PLATAL_DOMAIN2 ):
res = mysql_fetchone("""SELECT CONCAT(f.alias, '@%s'), CONCAT(u.prenom, ' ', u.nom)
FROM auth_user_md5 AS u
- INNER JOIN aliases AS f ON (f.id=u.user_id AND f.type='a_vie')
- INNER JOIN aliases AS a ON (a.id=u.user_id AND a.alias='%s' AND a.type!='homonyme')
+ INNER JOIN aliases AS f ON (f.uid=u.user_id AND f.type='a_vie')
+ INNER JOIN aliases AS a ON (a.uid=u.user_id AND a.alias='%s' AND a.type!='homonyme')
WHERE u.perms IN ('admin', 'user')
LIMIT 1""" %( PLATAL_DOMAIN, mbox ) )
if res: