localise login template, allow openid to be disabled

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index 7f45c6d585a757eeb15ab7929e6fe917fd16b958..d82bc84d18062e4a864219f3956fe8525497724c 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -72,6 +72,8 @@ else {
        else {
                if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
 
+                       $noid = get_config('system','no_openid');
+
                        $openid_url = trim($_POST['openid_url']);
 
                        // validate_url alters the calling parameter
@@ -80,7 +82,7 @@ else {
 
                        // if it's an email address or doesn't resolve to a URL, fail.
 
-                       if((strpos($temp_string,'@')) || (! validate_url($temp_string))) {
+                       if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
                                $a = get_app();
                                notice( t('Login failed.') . EOL);
                                goaway($a->get_baseurl());