@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | if ($action != '') { |
| 115 | 115 | if (!$error) { |
| 116 | 116 | setEventMessage($langs->trans("SetupSaved")); |
| 117 | - header("Location: " . $_SERVER["PHP_SELF"]); |
|
| 117 | + header("Location: ".$_SERVER["PHP_SELF"]); |
|
| 118 | 118 | exit; |
| 119 | 119 | } else { |
| 120 | 120 | setEventMessages('', $errors, 'errors'); |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | llxHeader(); |
| 132 | 132 | |
| 133 | -$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; |
|
| 133 | +$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; |
|
| 134 | 134 | print load_fiche_titre($langs->trans("OpenIDconnectSetup"), $linkback, 'title_setup'); |
| 135 | 135 | print "<br>\n"; |
| 136 | 136 | |
@@ -152,84 +152,84 @@ discard block |
||
| 152 | 152 | print "</tr>\n"; |
| 153 | 153 | |
| 154 | 154 | // MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM |
| 155 | -print '<tr class="oddeven">' . "\n"; |
|
| 155 | +print '<tr class="oddeven">'."\n"; |
|
| 156 | 156 | print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimName").'</td>'."\n"; |
| 157 | 157 | print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimDesc").'</td>'."\n"; |
| 158 | -print '<td align="right">' . "\n"; |
|
| 158 | +print '<td align="right">'."\n"; |
|
| 159 | 159 | print '<input name="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" id="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM') ? GETPOST('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM") : ''))).'"></td></tr>'; |
| 160 | -print '</td></tr>' . "\n"; |
|
| 160 | +print '</td></tr>'."\n"; |
|
| 161 | 161 | |
| 162 | 162 | // MAIN_AUTHENTICATION_OIDC_CLIENT_ID |
| 163 | -print '<tr class="oddeven">' . "\n"; |
|
| 163 | +print '<tr class="oddeven">'."\n"; |
|
| 164 | 164 | print '<td>'.$langs->trans("MainAuthenticationOidcClientIdName").'</td>'."\n"; |
| 165 | 165 | print '<td>'.$langs->trans("MainAuthenticationOidcClientIdDesc").'</td>'."\n"; |
| 166 | -print '<td align="right">' . "\n"; |
|
| 166 | +print '<td align="right">'."\n"; |
|
| 167 | 167 | print '<input name="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" id="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_CLIENT_ID') ? GETPOST('MAIN_AUTHENTICATION_OIDC_CLIENT_ID', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_CLIENT_ID) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_CLIENT_ID") : ''))).'"></td></tr>'; |
| 168 | -print '</td></tr>' . "\n"; |
|
| 168 | +print '</td></tr>'."\n"; |
|
| 169 | 169 | |
| 170 | 170 | // MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET |
| 171 | -print '<tr class="oddeven">' . "\n"; |
|
| 171 | +print '<tr class="oddeven">'."\n"; |
|
| 172 | 172 | print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretName").'</td>'."\n"; |
| 173 | 173 | print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretDesc").'</td>'."\n"; |
| 174 | -print '<td align="right">' . "\n"; |
|
| 174 | +print '<td align="right">'."\n"; |
|
| 175 | 175 | print '<input type="password" name="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" id="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET') ? GETPOST('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET") : ''))).'"></td></tr>'; |
| 176 | -print '</td></tr>' . "\n"; |
|
| 176 | +print '</td></tr>'."\n"; |
|
| 177 | 177 | |
| 178 | 178 | // MAIN_AUTHENTICATION_OIDC_SCOPES |
| 179 | -print '<tr class="oddeven">' . "\n"; |
|
| 179 | +print '<tr class="oddeven">'."\n"; |
|
| 180 | 180 | print '<td>'.$langs->trans("MainAuthenticationOidcScopesName").'</td>'."\n"; |
| 181 | 181 | print '<td>'.$langs->trans("MainAuthenticationOidcScopesDesc").'</td>'."\n"; |
| 182 | -print '<td align="right">' . "\n"; |
|
| 182 | +print '<td align="right">'."\n"; |
|
| 183 | 183 | print '<input name="MAIN_AUTHENTICATION_OIDC_SCOPES" id="MAIN_AUTHENTICATION_OIDC_SCOPES" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_SCOPES') ? GETPOST('MAIN_AUTHENTICATION_OIDC_SCOPES', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_SCOPES) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_SCOPES") : ''))).'"></td></tr>'; |
| 184 | -print '</td></tr>' . "\n"; |
|
| 184 | +print '</td></tr>'."\n"; |
|
| 185 | 185 | |
| 186 | 186 | // MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL |
| 187 | -print '<tr class="oddeven">' . "\n"; |
|
| 187 | +print '<tr class="oddeven">'."\n"; |
|
| 188 | 188 | print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlName").'</td>'."\n"; |
| 189 | 189 | print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlDesc").'</td>'."\n"; |
| 190 | -print '<td align="right">' . "\n"; |
|
| 190 | +print '<td align="right">'."\n"; |
|
| 191 | 191 | print '<input name="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" id="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL") : ''))).'"></td></tr>'; |
| 192 | -print '</td></tr>' . "\n"; |
|
| 192 | +print '</td></tr>'."\n"; |
|
| 193 | 193 | |
| 194 | 194 | // MAIN_AUTHENTICATION_OIDC_TOKEN_URL |
| 195 | -print '<tr class="oddeven">' . "\n"; |
|
| 195 | +print '<tr class="oddeven">'."\n"; |
|
| 196 | 196 | print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlName").'</td>'."\n"; |
| 197 | 197 | print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlDesc").'</td>'."\n"; |
| 198 | -print '<td align="right">' . "\n"; |
|
| 198 | +print '<td align="right">'."\n"; |
|
| 199 | 199 | print '<input name="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" id="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_TOKEN_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_TOKEN_URL', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_TOKEN_URL) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_TOKEN_URL") : ''))).'"></td></tr>'; |
| 200 | -print '</td></tr>' . "\n"; |
|
| 200 | +print '</td></tr>'."\n"; |
|
| 201 | 201 | |
| 202 | 202 | // MAIN_AUTHENTICATION_OIDC_USERINFO_URL |
| 203 | -print '<tr class="oddeven">' . "\n"; |
|
| 203 | +print '<tr class="oddeven">'."\n"; |
|
| 204 | 204 | print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlName").'</td>'."\n"; |
| 205 | 205 | print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlDesc").'</td>'."\n"; |
| 206 | -print '<td align="right">' . "\n"; |
|
| 206 | +print '<td align="right">'."\n"; |
|
| 207 | 207 | print '<input name="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" id="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_USERINFO_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_USERINFO_URL', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_USERINFO_URL) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_USERINFO_URL") : ''))).'"></td></tr>'; |
| 208 | -print '</td></tr>' . "\n"; |
|
| 208 | +print '</td></tr>'."\n"; |
|
| 209 | 209 | |
| 210 | 210 | // MAIN_AUTHENTICATION_OIDC_LOGOUT_URL |
| 211 | -print '<tr class="oddeven">' . "\n"; |
|
| 211 | +print '<tr class="oddeven">'."\n"; |
|
| 212 | 212 | print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlName").'</td>'."\n"; |
| 213 | 213 | print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlDesc").'</td>'."\n"; |
| 214 | -print '<td align="right">' . "\n"; |
|
| 214 | +print '<td align="right">'."\n"; |
|
| 215 | 215 | print '<input name="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" id="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL', 'nohtml') : (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_LOGOUT_URL) ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_LOGOUT_URL") : ''))).'"></td></tr>'; |
| 216 | -print '</td></tr>' . "\n"; |
|
| 216 | +print '</td></tr>'."\n"; |
|
| 217 | 217 | |
| 218 | 218 | // REDIRECT_URL |
| 219 | -print '<tr class="oddeven">' . "\n"; |
|
| 219 | +print '<tr class="oddeven">'."\n"; |
|
| 220 | 220 | print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlName").'</td>'."\n"; |
| 221 | 221 | print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlDesc").'</td>'."\n"; |
| 222 | -print '<td align="right">' . "\n"; |
|
| 222 | +print '<td align="right">'."\n"; |
|
| 223 | 223 | print '<input class="minwidth300" value="'.dol_escape_htmltag(openid_connect_get_redirect_url()).'" disabled></td></tr>'; |
| 224 | -print '</td></tr>' . "\n"; |
|
| 224 | +print '</td></tr>'."\n"; |
|
| 225 | 225 | |
| 226 | 226 | // LOGOUT_URL |
| 227 | -print '<tr class="oddeven">' . "\n"; |
|
| 227 | +print '<tr class="oddeven">'."\n"; |
|
| 228 | 228 | print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlName").'</td>'."\n"; |
| 229 | 229 | print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlDesc").'</td>'."\n"; |
| 230 | -print '<td align="right">' . "\n"; |
|
| 231 | -print '<input class="minwidth300" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT . "/index.php")).'" disabled></td></tr>'; |
|
| 232 | -print '</td></tr>' . "\n"; |
|
| 230 | +print '<td align="right">'."\n"; |
|
| 231 | +print '<input class="minwidth300" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT."/index.php")).'" disabled></td></tr>'; |
|
| 232 | +print '</td></tr>'."\n"; |
|
| 233 | 233 | |
| 234 | 234 | print '</table>'."\n"; |
| 235 | 235 | |
@@ -18,13 +18,13 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @var Adherent $object |
|
| 22 | - * @var Canvas $this |
|
| 23 | - * @var Conf $conf |
|
| 24 | - * @var Translate $langs |
|
| 25 | - * |
|
| 26 | - * @var string $canvas |
|
| 27 | - */ |
|
| 21 | + * @var Adherent $object |
|
| 22 | + * @var Canvas $this |
|
| 23 | + * @var Conf $conf |
|
| 24 | + * @var Translate $langs |
|
| 25 | + * |
|
| 26 | + * @var string $canvas |
|
| 27 | + */ |
|
| 28 | 28 | |
| 29 | 29 | // Protection to avoid direct call of template |
| 30 | 30 | if (empty($conf) || !is_object($conf)) { |
@@ -18,14 +18,14 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @var Adherent $object |
|
| 22 | - * @var Canvas $this |
|
| 23 | - * @var Conf $conf |
|
| 24 | - * @var Translate $langs |
|
| 25 | - * @var User $user |
|
| 26 | - * |
|
| 27 | - * @var string $canvas |
|
| 28 | - */ |
|
| 21 | + * @var Adherent $object |
|
| 22 | + * @var Canvas $this |
|
| 23 | + * @var Conf $conf |
|
| 24 | + * @var Translate $langs |
|
| 25 | + * @var User $user |
|
| 26 | + * |
|
| 27 | + * @var string $canvas |
|
| 28 | + */ |
|
| 29 | 29 | |
| 30 | 30 | // Protection to avoid direct call of template |
| 31 | 31 | if (empty($conf) || !is_object($conf)) { |