Completed
Branch develop (5beab4)
by
unknown
25:43
created
htdocs/install/step4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
 	print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
84 84
 	print '<input id="login" name="login" type="text" value="'.(GETPOSTISSET("login") ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').' autofocus></td></tr>';
85 85
 	print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
86
-	print '<input type="password" id="pass" name="pass" autocomplete="new-password" minlength="8" value="'. (isset($force_install_dolibarrpassword) ? $force_install_dolibarrpassword : '').'"'.(@$force_install_noedit == 2 && $force_install_dolibarrpassword !== null ? ' disabled' : '').'></td></tr>';
86
+	print '<input type="password" id="pass" name="pass" autocomplete="new-password" minlength="8" value="'.(isset($force_install_dolibarrpassword) ? $force_install_dolibarrpassword : '').'"'.(@$force_install_noedit == 2 && $force_install_dolibarrpassword !== null ? ' disabled' : '').'></td></tr>';
87 87
 	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordRetype").' :</label></td><td>';
88 88
 	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password" minlength="8" value="'.(isset($force_install_dolibarrpassword) ? $force_install_dolibarrpassword : '').'"'.(@$force_install_noedit == 2 && $force_install_dolibarrpassword !== null ? ' disabled' : '').'></td></tr>';
89 89
 	print '</table>';
Please login to merge, or discard this patch.
htdocs/admin/openid_connect.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
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');
@@ -159,84 +159,84 @@  discard block
 block discarded – undo
159 159
 print "</tr>\n";
160 160
 
161 161
 // MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM
162
-print '<tr class="oddeven">' . "\n";
162
+print '<tr class="oddeven">'."\n";
163 163
 print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimName").'</td>'."\n";
164 164
 print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimDesc").'</td>'."\n";
165
-print '<td align="right">' . "\n";
165
+print '<td align="right">'."\n";
166 166
 print '<input name="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" id="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" class="minwidth400" 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>';
167
-print '</td></tr>' . "\n";
167
+print '</td></tr>'."\n";
168 168
 
169 169
 // MAIN_AUTHENTICATION_OIDC_CLIENT_ID
170
-print '<tr class="oddeven">' . "\n";
170
+print '<tr class="oddeven">'."\n";
171 171
 print '<td>'.$langs->trans("MainAuthenticationOidcClientIdName").'</td>'."\n";
172 172
 print '<td>'.$langs->trans("MainAuthenticationOidcClientIdDesc").'</td>'."\n";
173
-print '<td align="right">' . "\n";
173
+print '<td align="right">'."\n";
174 174
 print '<input name="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" id="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" class="minwidth400" 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>';
175
-print '</td></tr>' . "\n";
175
+print '</td></tr>'."\n";
176 176
 
177 177
 // MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET
178
-print '<tr class="oddeven">' . "\n";
178
+print '<tr class="oddeven">'."\n";
179 179
 print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretName").'</td>'."\n";
180 180
 print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretDesc").'</td>'."\n";
181
-print '<td align="right">' . "\n";
181
+print '<td align="right">'."\n";
182 182
 print '<input type="password" name="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" id="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" class="minwidth400" 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>';
183
-print '</td></tr>' . "\n";
183
+print '</td></tr>'."\n";
184 184
 
185 185
 // MAIN_AUTHENTICATION_OIDC_SCOPES
186
-print '<tr class="oddeven">' . "\n";
186
+print '<tr class="oddeven">'."\n";
187 187
 print '<td>'.$langs->trans("MainAuthenticationOidcScopesName").'</td>'."\n";
188 188
 print '<td>'.$langs->trans("MainAuthenticationOidcScopesDesc").'</td>'."\n";
189
-print '<td align="right">' . "\n";
189
+print '<td align="right">'."\n";
190 190
 print '<input name="MAIN_AUTHENTICATION_OIDC_SCOPES" id="MAIN_AUTHENTICATION_OIDC_SCOPES" class="minwidth400" 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>';
191
-print '</td></tr>' . "\n";
191
+print '</td></tr>'."\n";
192 192
 
193 193
 // MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL
194
-print '<tr class="oddeven">' . "\n";
194
+print '<tr class="oddeven">'."\n";
195 195
 print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlName").'</td>'."\n";
196 196
 print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlDesc").'</td>'."\n";
197
-print '<td align="right">' . "\n";
197
+print '<td align="right">'."\n";
198 198
 print '<input name="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" id="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" class="minwidth400" 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>';
199
-print '</td></tr>' . "\n";
199
+print '</td></tr>'."\n";
200 200
 
201 201
 // MAIN_AUTHENTICATION_OIDC_TOKEN_URL
202
-print '<tr class="oddeven">' . "\n";
202
+print '<tr class="oddeven">'."\n";
203 203
 print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlName").'</td>'."\n";
204 204
 print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlDesc").'</td>'."\n";
205
-print '<td align="right">' . "\n";
205
+print '<td align="right">'."\n";
206 206
 print '<input name="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" id="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" class="minwidth400" 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>';
207
-print '</td></tr>' . "\n";
207
+print '</td></tr>'."\n";
208 208
 
209 209
 // MAIN_AUTHENTICATION_OIDC_USERINFO_URL
210
-print '<tr class="oddeven">' . "\n";
210
+print '<tr class="oddeven">'."\n";
211 211
 print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlName").'</td>'."\n";
212 212
 print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlDesc").'</td>'."\n";
213
-print '<td align="right">' . "\n";
213
+print '<td align="right">'."\n";
214 214
 print '<input name="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" id="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" class="minwidth400" 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>';
215
-print '</td></tr>' . "\n";
215
+print '</td></tr>'."\n";
216 216
 
217 217
 // MAIN_AUTHENTICATION_OIDC_LOGOUT_URL
218
-print '<tr class="oddeven">' . "\n";
218
+print '<tr class="oddeven">'."\n";
219 219
 print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlName").'</td>'."\n";
220 220
 print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlDesc").'</td>'."\n";
221
-print '<td align="right">' . "\n";
221
+print '<td align="right">'."\n";
222 222
 print '<input name="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" id="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" class="minwidth400" 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>';
223
-print '</td></tr>' . "\n";
223
+print '</td></tr>'."\n";
224 224
 
225 225
 // REDIRECT_URL
226
-print '<tr class="oddeven">' . "\n";
226
+print '<tr class="oddeven">'."\n";
227 227
 print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlName").'</td>'."\n";
228 228
 print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlDesc").'</td>'."\n";
229
-print '<td align="right">' . "\n";
229
+print '<td align="right">'."\n";
230 230
 print '<input class="minwidth400" value="'.dol_escape_htmltag(openid_connect_get_redirect_url()).'" disabled></td></tr>';
231
-print '</td></tr>' . "\n";
231
+print '</td></tr>'."\n";
232 232
 
233 233
 // LOGOUT_URL
234
-print '<tr class="oddeven">' . "\n";
234
+print '<tr class="oddeven">'."\n";
235 235
 print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlName").'</td>'."\n";
236 236
 print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlDesc").'</td>'."\n";
237
-print '<td align="right">' . "\n";
238
-print '<input class="minwidth400" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT . "/index.php")).'" disabled></td></tr>';
239
-print '</td></tr>' . "\n";
237
+print '<td align="right">'."\n";
238
+print '<input class="minwidth400" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT."/index.php")).'" disabled></td></tr>';
239
+print '</td></tr>'."\n";
240 240
 
241 241
 print '</table>'."\n";
242 242
 print '</div>';
Please login to merge, or discard this patch.