Enable the 'wspta' module and default settings.

[platal.git] / classes / xorgsession.php

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 8578a61..815ad81 100644 (file)
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -81,11 +81,10 @@ class XorgSession extends PlSession
     {
         if ($login_type == 'alias') {
             $res = XDB::query('SELECT  a.uid, a.password
-                                 FROM  accounts              AS a
-                           INNER JOIN  email_source_account  AS e ON (e.uid = a.uid)
-                           INNER JOIN  email_virtual_domains AS d ON (e.domain = d.id)
-                                WHERE  e.email = {?} AND d.name = {?}',
-                              $login, Platal::globals()->mail->domain);
+                                 FROM  accounts             AS a
+                           INNER JOIN  email_source_account AS e ON (e.uid = a.uid)
+                                WHERE  e.email = {?}',
+                              $login);
         } else {
             $res = XDB::query('SELECT  uid, password
                                  FROM  accounts
@@ -145,14 +144,22 @@ class XorgSession extends PlSession
             $uname = Post::v('username');
             if (Post::s('domain') == "alias") {
                 $login = XDB::fetchOneCell('SELECT  uid
-                                              FROM  email_source_account  AS e
-                                        INNER JOIN  email_virtual_domains AS d ON (e.domain = d.id)
-                                             WHERE  e.email = {?} AND d.name = {?}',
-                                           $uname, Platal::globals()->mail->alias_dom);
+                                              FROM  email_source_account
+                                             WHERE  email = {?} AND type = \'alias_aux\'',
+                                           $uname);
                 $loginType = 'uid';
-            } else if (Post::s('domain') == "ax") {
+            } else if (Post::s('domain') == 'hruid') {
                 $login = $uname;
                 $loginType = 'hruid';
+            } else if ((Post::s('domain') == 'email')) {
+                $login = XDB::fetchOneCell('SELECT  SQL_CALC_FOUND_ROWS uid
+                                              FROM  accounts
+                                             WHERE  email = {?}',
+                                           $uname);
+                if (!(XDB::fetchOneCell('SELECT FOUND_ROWS()') == 1)) {
+                    $login =null;
+                }
+                $loginType = 'uid';
             } else {
                 $login = $uname;
                 $loginType = is_numeric($uname) ? 'uid' : 'alias';