- 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')
- WHERE u.perms IN ('admin', 'user')
- LIMIT 1""" %( PLATAL_DOMAIN, mbox ) )
+ res = mysql_fetchone("""SELECT CONCAT(f.alias, '@%s'), a.full_name
+ FROM accounts AS a
+ INNER JOIN aliases AS f ON (f.uid = a.uid AND f.type = 'a_vie')
+ INNER JOIN aliases AS aa ON (aa.uid = a.uid AND aa.alias = '%s'
+ AND a.type != 'homonyme')
+ WHERE a.state = 'active'
+ LIMIT 1""" \
+ % (PLATAL_DOMAIN, mbox))