Merge branch '1.0.x' into schema-x

[quix0rs-gnu-social.git] / plugins / OpenID / openidadminpanel.php

diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php
index 0633063662f7095c566d420d599d1bb56d18c004..38df183fef2cbb67f930cdf7cff4a2228d000e82 100644 (file)
--- a/plugins/OpenID/openidadminpanel.php
+++ b/plugins/OpenID/openidadminpanel.php
@@ -91,6 +91,7 @@ class OpenidadminpanelAction extends AdminPanelAction
         );
 
         static $booleans = array(
+            'openid' => array('append_username'),
             'site' => array('openidonly')
         );
 
@@ -222,6 +223,15 @@ class OpenIDAdminPanelForm extends AdminForm
         );
         $this->unli();
 
+        $this->li();
+        $this->out->checkbox(
+            'append_username', _m('Append a username to base URL'),
+            (bool) $this->value('append_username', 'openid'),
+            _m('Login form will show the base URL and prompt for a username to add at the end. Use when OpenID provider URL should be the profile page for individual users.'),
+            'true'
+        );
+        $this->unli();
+
         $this->li();
         $this->input(
             'required_team',
@@ -247,7 +257,7 @@ class OpenIDAdminPanelForm extends AdminForm
         $this->out->checkbox(
             'openidonly', _m('Enable OpenID-only mode'),
             (bool) $this->value('openidonly', 'site'),
-            _m('Require all users to login via OpenID. WARNING: disables password authentication for all users!'),
+            _m('Require all users to login via OpenID. Warning: disables password authentication for all users!'),
             'true'
         );
         $this->unli();