webinterface.git

@@ -112,13 +112,11 @@ function create_mailaccount($arr)

 function get_mailaccount_id($accountname)

 {

   list($local, $domain) = explode('@', $accountname, 2);

-  if ($domain == 'schokokeks.org')

-    $domain = '';

   $local = mysql_real_escape_string($local);

-  $domain = maybe_null($domain);

+  $domain = mysql_real_escape_string($domain);

-  $result = db_query("SELECT acc.id FROM mail.mailaccounts AS acc LEFT JOIN mail.v_domains AS dom ON (dom.id=acc.domain) WHERE local='{$local}' AND dom.domainname={$domain}");

+  $result = db_query("SELECT acc.id FROM mail.mailaccounts AS acc LEFT JOIN mail.v_domains AS dom ON (dom.id=acc.domain) WHERE local='{$local}' AND dom.domainname='{$domain}'");

   if (mysql_num_rows($result) != 1)

     system_failure('account nicht eindeutig');

   $acc = mysql_fetch_assoc($result);

@@ -37,12 +37,12 @@ function find_role($login, $password, $i_am_admin = False)

         $role = $role | ROLE_CUSTOMER;

       if ($entry->admin)

         $role = $role | ROLE_SYSADMIN;

-      logger("session/checkuser.php", "login", "logged in systemuser »{$username}«.");

+      logger("session/checkuser.php", "login", "logged in systemuser »{$login}«.");

       return $role;

     }

-    logger("session/checkuser.php", "login", "wrong password for existing useraccount »{$username}«.");

+    logger("session/checkuser.php", "login", "wrong password for existing useraccount »{$login}«.");

   } else {

-    logger("session/checkuser.php", "login", "did not find useraccount »{$username}«. trying other roles...");

+    logger("session/checkuser.php", "login", "did not find useraccount »{$login}«. trying other roles...");

   }

   // Customer?