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

Messages added

Browse Source
This commit is contained in:
Faustin 2022-09-27 11:09:09 +02:00
parent f7d345fcb8
commit 1ba48092ae
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/oauth.php
View File

@ -115,7 +115,7 @@ if ($action == 'confirm_delete') {
$globalkey = empty($provider) ? $label : $label.'-'.$provider; $globalkey = empty($provider) ? $label : $label.'-'.$provider;
if (getDolGlobalString($globalkey.'_ID') && getDolGlobalString($globalkey.'_SECRET')) { if (getDolGlobalString($globalkey.'_ID') && getDolGlobalString($globalkey.'_SECRET')) { // If ID and secret exist, we delete first the token
$backtourl = DOL_URL_ROOT.'/admin/oauth.php?action=delete_entry&provider='.$provider.'&label='.$label.'&token='.newToken(); $backtourl = DOL_URL_ROOT.'/admin/oauth.php?action=delete_entry&provider='.$provider.'&label='.$label.'&token='.newToken();
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
@ -145,10 +145,10 @@ if ($action == 'delete_entry') {
$globalkey = empty($provider) ? $label : $label.'-'.$provider; $globalkey = empty($provider) ? $label : $label.'-'.$provider;
if (!dolibarr_del_const($db, $globalkey.'_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SECRET', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SCOPE', $conf->entity)) { if (!dolibarr_del_const($db, $globalkey.'_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SECRET', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey.'_SCOPE', $conf->entity)) {
setEventMessage("Error in entry deletion", 'errors'); setEventMessages($langs->trans("ErrorInEntryDeletion"), null, 'errors');
$error++; $error++;
} else { } else {
setEventMessage("Entry deleted", 'mesgs'); setEventMessages($langs->trans("EntryDeleted"), null);
} }
} }
@ -162,7 +162,7 @@ $form = new Form($db);
// Confirmation of action process // Confirmation of action process
if ($action == 'delete') { if ($action == 'delete') {
$formquestion = array(); $formquestion = array();
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?provider='.GETPOST('provider').'&label='.GETPOST('label'), $langs->trans('OAuthServiceConfirmDelete'), $langs->trans('OAuthServiceConfirmDelete'), 'confirm_delete', $formquestion, 0, 1, 220); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?provider='.GETPOST('provider').'&label='.GETPOST('label'), $langs->trans('OAuthServiceConfirmDeleteTitle'), $langs->trans('OAuthServiceConfirmDeleteMessage'), 'confirm_delete', $formquestion, 0, 1, 220);
} }
// Print form confirm // Print form confirm

4
htdocs/langs/en_US/admin.lang
View File

@ -1081,6 +1081,10 @@ DictionaryAssetDisposalType=Type of disposal of assets
TypeOfUnit=Type of unit TypeOfUnit=Type of unit
SetupSaved=Setup saved SetupSaved=Setup saved
SetupNotSaved=Setup not saved SetupNotSaved=Setup not saved
OAuthServiceConfirmDeleteTitle=Delete OAuth entry
OAuthServiceConfirmDeleteMessage=Are you sure you want to delete this OAuth entry ? All existing tokens for it will also be deleted.
ErrorInEntryDeletion=Error in entry deletion
EntryDeleted=Entry deleted
BackToModuleList=Back to Module list BackToModuleList=Back to Module list
BackToDictionaryList=Back to Dictionaries list BackToDictionaryList=Back to Dictionaries list
TypeOfRevenueStamp=Type of tax stamp TypeOfRevenueStamp=Type of tax stamp

4
htdocs/langs/fr_FR/admin.lang
View File

@ -1081,6 +1081,10 @@ DictionaryAssetDisposalType=Type de cession d'actifs
TypeOfUnit=Type d'unité TypeOfUnit=Type d'unité
SetupSaved=Configuration sauvegardée SetupSaved=Configuration sauvegardée
SetupNotSaved=Configuration non enregistrée SetupNotSaved=Configuration non enregistrée
OAuthServiceConfirmDeleteTitle=Suprresion d'entrée OAuth
OAuthServiceConfirmDeleteMessage=Êtes vous sur de vouloir supprimer cette entrée OAuth? Tous les jetons existants associés seront supprimés.
ErrorInEntryDeletion=Erreur dans la suppression
EntryDeleted=Entrée supprimée
BackToModuleList=Retour liste des modules BackToModuleList=Retour liste des modules
BackToDictionaryList=Retour liste des dictionnaires BackToDictionaryList=Retour liste des dictionnaires
TypeOfRevenueStamp=Type de timbre fiscal TypeOfRevenueStamp=Type de timbre fiscal