aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-28 20:58:23 -0800
committerFriendika <info@friendika.com>2010-11-28 20:58:23 -0800
commit62bb471ba0bf8d996e4548b835cd23fa3da92696 (patch)
tree55b9839eaad40bf7dac0ddba94c27da7f7dec015 /include
parent34a8fb935d9619c5114981862dfe2949a90f09bb (diff)
downloadvolse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.tar.gz
volse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.tar.bz2
volse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.zip
localise login template, allow openid to be disabled
Diffstat (limited to 'include')
-rw-r--r--include/auth.php4
1 files changed, 3 insertions, 1 deletions
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());