--- /usr/share/rainloop/rainloop/v/1.6.8.151/app/libraries/RainLoop/Actions.php 2014-07-18 16:10:26.664813000 +0200
+++ Actions.php 2014-07-23 21:28:56.200416001 +0200
@@ -1034,6 +1034,7 @@
                        'CustomLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
                        'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
                        'DetermineUserLanguage' => (bool) $oConfig->Get('login', 'determine_user_language', true),
+                       'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
                        'ContactsIsAllowed' => false,
                        'ChangePasswordIsAllowed' => false,
                        'JsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
@@ -1448,11 +1449,20 @@
                $this->Plugins()->RunHook('filter.login-credentials-first', array(&$sEmail, &$sPassword));

                $sEmail = \MailSo\Base\Utils::StrToLowerIfAscii($sEmail);
+
                if (false === \strpos($sEmail, '@') && 0 < \strlen(\trim($this->Config()->Get('login', 'default_domain', ''))))
                {
                        $sEmail = $sEmail.'@'.\trim(\trim($this->Config()->Get('login', 'default_domain', '')), ' @');
                }

+               if (false === \strpos($sEmail, '@') && $this->Config()->Get('login', 'determine_user_domain', false))
+               {
+                       $sHttpHost = $_SERVER['HTTP_HOST'];
+                       $sDeterminedDomain = substr($sHttpHost, strrpos($sHttpHost, '.', -(strlen($sHttpHost) - strrpos($sHttpHost, '.') + 1)) + 1);
+                       file_put_contents('/tmp/prv', $sDeterminedDomain);
+                       $sEmail = $sEmail.'@'.\trim($sDeterminedDomain, ' @');
+               }
+
                if (false === \strpos($sEmail, '@') || 0 === \strlen($sPassword))
                {
                        throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument);
@@ -2220,6 +2230,7 @@
                $this->setCapaFromParams($oConfig, 'CapaThemes', \RainLoop\Enumerations\Capa::THEMES);

                $this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
+               $this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');

                if ($this->GetCapa(true, \RainLoop\Enumerations\Capa::PREM))
                {