lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-10 09:44:22 +02:00
commit 339fa6fbe3
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/oauth.php
View File

@ -91,6 +91,7 @@ print dol_get_fiche_head($head, 'services', '', -1, 'technic');
print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>'; print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>';
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
$i = 0; $i = 0;
@ -145,6 +146,7 @@ foreach ($list as $key) {
} }
print '</table>'."\n"; print '</table>'."\n";
print '</div>';
print dol_get_fiche_end(); print dol_get_fiche_end();

13
htdocs/admin/oauthlogintokens.php
View File

@ -230,7 +230,7 @@ if ($mode == 'setup' && $user->admin) {
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="setconst">'; print '<input type="hidden" name="action" value="setconst">';
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'."\n"; print '<table class="noborder centpercent">'."\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -262,15 +262,15 @@ if ($mode == 'setup' && $user->admin) {
print $langs->trans("NoAccessToken"); print $langs->trans("NoAccessToken");
} }
print '</td>'; print '</td>';
print '<td>'; print '<td width="50%">';
// Links to delete/checks token // Links to delete/checks token
if (is_object($tokenobj)) { if (is_object($tokenobj)) {
//test on $storage->hasAccessToken($OAUTH_SERVICENAME) ? //test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>'; print '<a class="button smallpaddingimp" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
} }
// Request remote token // Request remote token
if ($urltorenew) { if ($urltorenew) {
print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>'; print '<a class="button smallpaddingimp" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
} }
// Check remote access // Check remote access
if ($urltocheckperms) { if ($urltocheckperms) {
@ -330,6 +330,7 @@ if ($mode == 'setup' && $user->admin) {
} }
print '</table>'; print '</table>';
print '</div>';
if (!empty($driver)) { if (!empty($driver)) {
if ($submit_enabled) { if ($submit_enabled) {
@ -345,6 +346,7 @@ if ($mode == 'setup' && $user->admin) {
if ($mode == 'test' && $user->admin) { if ($mode == 'test' && $user->admin) {
print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n"; print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
if (!empty($driver)) { if (!empty($driver)) {
require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
@ -364,11 +366,13 @@ if ($mode == 'test' && $user->admin) {
} }
print '</table>'; print '</table>';
print '</div>';
} }
if ($mode == 'userconf' && $user->admin) { if ($mode == 'userconf' && $user->admin) {
print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n"; print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<th>'.$langs->trans("User").'</th>'; print '<th>'.$langs->trans("User").'</th>';
@ -395,6 +399,7 @@ if ($mode == 'userconf' && $user->admin) {
print "</tr>\n"; print "</tr>\n";
} }
print '</table>'; print '</table>';
print '</div>';
} }
print dol_get_fiche_end(); print dol_get_fiche_end();

16
htdocs/includes/.htaccess Normal file
View File

@ -0,0 +1,16 @@
# htaccess file to clock
# The virtual host must have AllowOverride FileInfo to have this file used.
# You can achieve the same effect by adding a definition to
#
#<Directory /path/to/htdocs/includes>
#RewriteRule \.php$ - [F,L]
#</Directory>
#RewriteRule \.php$ - [F,L]
# If there is no directory with AllowOveride FileInfo, you will get error 500. But
# we got what we want, php file into external libraries can't be executed directly.
<FilesMatch "\.php$">
SetHandler !
</FilesMatch>