From 62bb471ba0bf8d996e4548b835cd23fa3da92696 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 28 Nov 2010 20:58:23 -0800
Subject: localise login template, allow openid to be disabled

---
 include/auth.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/auth.php')

diff --git a/include/auth.php b/include/auth.php
index 7f45c6d58..d82bc84d1 100644
--- 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());
-- 
cgit v1.2.3