10 files changed, 12 insertions, 10 deletions

diff --git a/lib/phplib/CT_Cache.class.php b/lib/phplib/CT_Cache.php
index 311b27c..d4eccfa 100644
--- a/lib/phplib/CT_Cache.class.php
+++ b/lib/phplib/CT_Cache.php
@@ -14,7 +14,7 @@ class CT_Cache
 
     public function ac_start()
     {
-        $this->cache = StudipCacheFactory::getCache();
+        $this->cache = \Studip\Cache\Factory::getCache();
     }
 
     public function ac_get_lock()
diff --git a/lib/phplib/CT_Sql.class.php b/lib/phplib/CT_Sql.php
index 220af22..220af22 100644
--- a/lib/phplib/CT_Sql.class.php
+++ b/lib/phplib/CT_Sql.php
diff --git a/lib/phplib/DB_Sql.class.php b/lib/phplib/DB_Sql.php
index 1a61703..1a61703 100644
--- a/lib/phplib/DB_Sql.class.php
+++ b/lib/phplib/DB_Sql.php
diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.php
index 0a566d1..950be8a 100644
--- a/lib/phplib/Seminar_Auth.class.php
+++ b/lib/phplib/Seminar_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Auth.class.php
+ * Seminar_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -326,7 +326,7 @@ class Seminar_Auth
         // load the default set of plugins
         PluginEngine::loadPlugins();
 
-        if (Request::get('loginname') && !$_COOKIE[get_class($GLOBALS['sess'])]) {
+        if (Request::get('loginname') && empty($_COOKIE[get_class($GLOBALS['sess'])])) {
             $login_template = $GLOBALS['template_factory']->open('nocookies');
         } else if (isset($this->need_email_activation)) {
             $this->unauth();
@@ -336,7 +336,9 @@ class Seminar_Auth
         } else {
             unset($_SESSION['semi_logged_in']); // used by email activation
             $login_template = $GLOBALS['template_factory']->open('loginform');
-            $login_template->set_attribute('loginerror', (isset($this->auth["uname"]) && $this->error_msg));
+            if (isset($this->auth['uname']) && $this->error_msg) {
+                PageLayout::postException(_('Bei der Anmeldung trat ein Fehler auf!'), $this->error_msg);
+            }
             $login_template->set_attribute('error_msg', $this->error_msg);
             $login_template->set_attribute('uname', (isset($this->auth["uname"]) ? $this->auth["uname"] : Request::username('loginname')));
             $login_template->set_attribute('self_registration_activated', Config::get()->ENABLE_SELF_REGISTRATION);
diff --git a/lib/phplib/Seminar_Default_Auth.class.php b/lib/phplib/Seminar_Default_Auth.php
index 6d0e46c..146c588 100644
--- a/lib/phplib/Seminar_Default_Auth.class.php
+++ b/lib/phplib/Seminar_Default_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Default_Auth.class.php
+ * Seminar_Default_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -16,4 +16,4 @@
 class Seminar_Default_Auth extends Seminar_Auth
 {
     protected $nobody = true;
-}
\ No newline at end of file
+}
diff --git a/lib/phplib/Seminar_Perm.class.php b/lib/phplib/Seminar_Perm.php
index a116938..1c3a85e 100644
--- a/lib/phplib/Seminar_Perm.class.php
+++ b/lib/phplib/Seminar_Perm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Perm.class.php
+ * Seminar_Perm.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Register_Auth.class.php b/lib/phplib/Seminar_Register_Auth.php
index f2a272e..5bf10f1 100644
--- a/lib/phplib/Seminar_Register_Auth.class.php
+++ b/lib/phplib/Seminar_Register_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Register_Auth.class.php
+ * Seminar_Register_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Session.class.php b/lib/phplib/Seminar_Session.php
index 8324062..8324062 100644
--- a/lib/phplib/Seminar_Session.class.php
+++ b/lib/phplib/Seminar_Session.php
diff --git a/lib/phplib/Seminar_User.class.php b/lib/phplib/Seminar_User.php
index c82d73a..4dd59bc 100644
--- a/lib/phplib/Seminar_User.class.php
+++ b/lib/phplib/Seminar_User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Seminar_User.class.php
+ * Seminar_User.php
  * global object representing current user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/email_validation.class.php b/lib/phplib/email_validation.php
index 070fa02..f825e82 100644
--- a/lib/phplib/email_validation.class.php
+++ b/lib/phplib/email_validation.php
@@ -121,7 +121,7 @@ class email_validation_class
      */
     public function ValidateEmailAddress($email, $domains = '')
     {
-        $converted_email = $this->idna_convert->convert($email);
+        $converted_email = $this->idna_convert->convertEmailAddress($email);
         if (!filter_var($converted_email, FILTER_VALIDATE_EMAIL)) {
             return false;
         }