diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/openid.php | 4 | ||||
| -rw-r--r-- | mod/register.php | 22 | ||||
| -rw-r--r-- | mod/settings.php | 12 |
3 files changed, 35 insertions, 3 deletions
diff --git a/mod/openid.php b/mod/openid.php index 94f08c430..84d4bf4bf 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -6,6 +6,10 @@ require_once('library/openid.php'); function openid_content(&$a) { + $noid = get_config('system','no_openid'); + if($noid) + goaway($a->get_baseurl()); + if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) { $openid = new LightOpenID; diff --git a/mod/register.php b/mod/register.php index 57a15c008..9f2f236b7 100644 --- a/mod/register.php +++ b/mod/register.php @@ -345,15 +345,31 @@ function register_content(&$a) { $nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : '')); $photo = ((x($_POST,'photo')) ? $_POST['photo'] : ((x($_GET,'photo')) ? hex2bin($_GET['photo']) : '')); + $noid = get_config('system','no_openid'); + + if($noid) { + $oidhtml = ''; + $fillwith = ''; + $fillext = ''; + $oidlabel = ''; + } + else { + $oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >'; + $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); + $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); + $oidlabel = t("Your OpenID \x28optional\x29: "); + } + $o = load_view_file("view/register.tpl"); $o = replace_macros($o, array( + '$oidhtml' => $oidhtml, '$regtitle' => t('Registration'), '$registertext' =>((x($a->config,'register_text')) ? '<div class="error-message">' . $a->config['register_text'] . '</div>' : "" ), - '$fillwith' => t('You may ' . "\x28" . 'optionally' . "\x29" . ' fill in this form via OpenID by supplying your OpenID and clicking ') . "'" . t('Register') . "'", - '$fillext' => t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'), - '$oidlabel' => t('Your OpenID ' . "\x28" . 'optional' . "\x29" . ': '), + '$fillwith' => $fillwith, + '$fillext' => $fillext, + '$oidlabel' => $oidlabel, '$openid' => $openid_url, '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '), '$addrlabel' => t('Your Email Address: '), diff --git a/mod/settings.php b/mod/settings.php index 47743759d..7ed7ad32e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -196,6 +196,17 @@ function settings_content(&$a) { '$page_freelove' => PAGE_FREELOVE )); + $noid = get_config('system','no_openid'); + + if($noid) { + $oidhtml = ''; + } + else { + $oidhtml = '<label id="settings-openid-label" for="settings-openid" >' . t('OpenID: ') . '</label><input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />' . t(" \x28Optional\x29 Allow this OpenID to login to this account."); + } + + + $opt_tpl = load_view_file("view/profile-in-directory.tpl"); $profile_in_dir = replace_macros($opt_tpl,array( @@ -260,6 +271,7 @@ function settings_content(&$a) { $o .= replace_macros($stpl,array( '$baseurl' => $a->get_baseurl(), + '$oidhtml' => $oidhtml, '$uid' => local_user(), '$username' => $username, '$openid' => $openid, |