diff --git a/htdocs/admin/openid_connect.php b/htdocs/admin/openid_connect.php index 3ddaaa5a4d4..9c7200dd1ed 100644 --- a/htdocs/admin/openid_connect.php +++ b/htdocs/admin/openid_connect.php @@ -24,10 +24,10 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/openid_connect.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/openid_connect.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/openid_connect.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/openid_connect.lib.php'; /** * @var Conf $conf @@ -133,14 +133,14 @@ llxHeader('', $langs->trans("Miscellaneous"), $wikihelp, '', 0, 0, '', '', '', ' print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print ''.$langs->trans("OpenIDDesc")."
\n"; +print '' . $langs->trans("OpenIDDesc") . "
\n"; print "
\n"; $head = security_prepare_head(); print dol_get_fiche_head($head, 'openid', '', -1); -$urlforwikidoc = img_picto('', 'url', 'class="pictofixedwidth"').''; +$urlforwikidoc = img_picto('', 'url', 'class="pictofixedwidth"') . ''; $urlforwikidoc .= $langs->trans("SeeHere"); $urlforwikidoc .= ''; /* @@ -156,9 +156,9 @@ if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff('MAIN_AUTHENTICATION_OIDC_ON', array(), null, 0, 0, 1); } else { if (!getDolGlobalString('MAIN_AUTHENTICATION_OIDC_ON')) { - print ''.img_picto($langs->trans("Disabled"), 'off').''; + print '' . img_picto($langs->trans("Disabled"), 'off') . ''; } else { - print ''.img_picto($langs->trans("Enabled"), 'on').''; + print '' . img_picto($langs->trans("Enabled"), 'on') . ''; } } @@ -168,111 +168,129 @@ print '

'; if (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_ON')) { if (!preg_match('/openid_connect/', $dolibarr_main_authentication)) { $langs->load("errors"); - print info_admin($langs->trans("ErrorOpenIDSetupConfNotComplete").': '.$urlforwikidoc, 0, 0, 1, 'warning'); + print info_admin($langs->trans("ErrorOpenIDSetupConfNotComplete") . ': ' . $urlforwikidoc, 0, 0, 1, 'warning'); } else { - print info_admin('In conf.php file: dolibarr_main_authentication is '.$dolibarr_main_authentication); + print info_admin('In conf.php file: dolibarr_main_authentication is ' . $dolibarr_main_authentication); } print '
'; - print '
'; - print ''; + print '
'; + print ''; + print ''; + print '' . "\n"; + print "\n"; + + print '' . "\n"; + print '' . "\n"; + print '' . "\n"; + print '
' . $langs->trans("Parameters") . '
' . $langs->trans("MainAuthenticationOidcAutofillWithWellknowUrl") . '' . "\n"; + print ''; + print '' . "\n"; + print '
' . "\n"; + print '
'; + + print '
'; + + print ''; + print ''; print ''; print '
'; print ''; print ''; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; + print '' . "\n"; print "\n"; // MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_CLIENT_ID print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_SCOPES print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_TOKEN_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_USERINFO_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // MAIN_AUTHENTICATION_OIDC_LOGOUT_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // REDIRECT_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; // LOGOUT_URL print '' . "\n"; - print ''."\n"; - print ''."\n"; + print '' . "\n"; + print '' . "\n"; print ''; + print ''; print '' . "\n"; - print '
'.$langs->trans("Parameters").'' . $langs->trans("Parameters") . '
'.$langs->trans("MainAuthenticationOidcLoginClaimName").''.$langs->trans("MainAuthenticationOidcLoginClaimDesc").'' . $langs->trans("MainAuthenticationOidcLoginClaimName") . '' . $langs->trans("MainAuthenticationOidcLoginClaimDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcClientIdName").''.$langs->trans("MainAuthenticationOidcClientIdDesc").'' . $langs->trans("MainAuthenticationOidcClientIdName") . '' . $langs->trans("MainAuthenticationOidcClientIdDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcClientSecretName").''.$langs->trans("MainAuthenticationOidcClientSecretDesc").'' . $langs->trans("MainAuthenticationOidcClientSecretName") . '' . $langs->trans("MainAuthenticationOidcClientSecretDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcScopesName").''.$langs->trans("MainAuthenticationOidcScopesDesc").'' . $langs->trans("MainAuthenticationOidcScopesName") . '' . $langs->trans("MainAuthenticationOidcScopesDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcAuthorizeUrlName").''.$langs->trans("MainAuthenticationOidcAuthorizeUrlDesc").'' . $langs->trans("MainAuthenticationOidcAuthorizeUrlName") . '' . $langs->trans("MainAuthenticationOidcAuthorizeUrlDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcTokenUrlName").''.$langs->trans("MainAuthenticationOidcTokenUrlDesc").'' . $langs->trans("MainAuthenticationOidcTokenUrlName") . '' . $langs->trans("MainAuthenticationOidcTokenUrlDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcUserinfoUrlName").''.$langs->trans("MainAuthenticationOidcUserinfoUrlDesc").'' . $langs->trans("MainAuthenticationOidcUserinfoUrlName") . '' . $langs->trans("MainAuthenticationOidcUserinfoUrlDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcLogoutUrlName").''.$langs->trans("MainAuthenticationOidcLogoutUrlDesc").'' . $langs->trans("MainAuthenticationOidcLogoutUrlName") . '' . $langs->trans("MainAuthenticationOidcLogoutUrlDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcRedirectUrlName").''.$langs->trans("MainAuthenticationOidcRedirectUrlDesc").'' . $langs->trans("MainAuthenticationOidcRedirectUrlName") . '' . $langs->trans("MainAuthenticationOidcRedirectUrlDesc") . '' . "\n"; - print '
'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlName").''.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlDesc").'' . $langs->trans("MainAuthenticationOidcLogoutRedirectUrlName") . '' . $langs->trans("MainAuthenticationOidcLogoutRedirectUrlDesc") . '' . "\n"; - print '
'."\n"; + print '' . "\n"; print '
'; print '
'; print '
'; - print ''; + print ''; print '
'; print '
'; @@ -282,3 +300,41 @@ print '
'; llxFooter(); $db->close(); +?> + diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c9e572914bb..b1875d80d16 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2640,6 +2640,8 @@ MainAuthenticationOidcLogoutRedirectUrlName=Dolibarr logout URL MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on the OpenID provider side MainAuthenticationOidcLoginClaimName=Login claim MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email +MainAuthenticationOidcAutofillWithWellknowUrl=Base URL of your OpenID Connect provider or realm. The well-known OpenID configuration will be fetched automatically (e.g., https://provider-domain/realms/your-realm) +MainAuthenticationOidcAutofillButton=Populate from well-known URL BlackListWords=Blacklist of words BlackListWordsHelp=List of words that will be completely removed from any answer. Words must be separated by a coma (",") BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests