diff --git a/htdocs/blockedlog/admin/registration.php b/htdocs/blockedlog/admin/registration.php index 017900e882d..f58221fc68f 100644 --- a/htdocs/blockedlog/admin/registration.php +++ b/htdocs/blockedlog/admin/registration.php @@ -47,6 +47,7 @@ $langs->loadLangs(array('admin', 'blockedlog', 'other')); // Get Parameters $action = GETPOST('action', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); +$cancel = GETPOST('cancel'); $withtab = GETPOSTISSET('withtab') ? GETPOSTINT('withtab') : 1; $origin = GETPOST('origin'); @@ -62,6 +63,11 @@ if (!$user->admin) { * Actions */ +if ($cancel && $origin == 'initmodule') { + header("Location: ".DOL_URL_ROOT."/admin/modules.php"); + exit(0); +} + if ($action == 'update') { $error = 0; $db->begin(); @@ -264,12 +270,26 @@ if (in_array($mysoc->country_code, array('FR'))) { print info_admin($infotoshow, 0, 0, 'info'); } - $htmltext = $langs->trans("UnalterableLogToolRegistrationFR").'
'; + if ((!isRegistrationDataSavedAndPushed() || !isModEnabled('blockedlog')) && $mode != "forceregistration") { + print '
'.$langs->trans("RegistrationRequired").'
'; + } + + $htmltext = ""; + $htmltext .= $langs->trans("UnalterableLogToolRegistrationFR").'
'; $htmltext .= $langs->trans("InformationWillBePublishedTo"); $htmltext .= '
'.$langs->trans("InformationWillBePublishedTo2", $organization_for_ping, $dataprivacy_url); - $htmltext .= '
'.$langs->trans("InformationWillBePublishedTo3"); + if (!isRegistrationDataSavedAndPushed() || !isModEnabled('blockedlog')) { + $htmltext .= '
'.$langs->trans("InformationWillBePublishedTo3"); + $color = 'warning'; + } else { + $color = 'info'; + } - print info_admin($htmltext, 0, 0, 'warning'); + print info_admin($htmltext, 0, 0, $color); + + if (isRegistrationDataSavedAndPushed() && isModEnabled('blockedlog') && $mode != "forceregistration") { + print '

'.$langs->trans("ApplicationHasBeenRegistered").'

'; + } } else { $htmltext = ($infotoshow ? $infotoshow.'
' : ''); $htmltext .= $langs->trans("ApplicationHasBeenRegistered").'
'; @@ -448,9 +468,10 @@ if (empty($mode)) { $formSetup->htmlButtonLabel = 'SaveUpdate'; } else { $formSetup->htmlButtonLabel = 'SaveAndEnableModule'; + $formSetup->htmlButton2Label = ''; } - print $formSetup->generateOutput(true, true, '', ''); + print $formSetup->generateOutput(2, true, '', ''); } if ($withtab) { diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php index d60da626c18..0f563c0ac99 100644 --- a/htdocs/blockedlog/lib/blockedlog.lib.php +++ b/htdocs/blockedlog/lib/blockedlog.lib.php @@ -38,7 +38,7 @@ function blockedlogadmin_prepare_head($withtabsetup) $param = ''; $param .= ($withtabsetup? "?withtab=".$withtabsetup : ""); - $param .= (GETPOST('origin') ? ($param ? '&' : '').'origin='.GETPOST('origin') : ''); + $param .= (GETPOST('origin') ? ($param ? '&' : '?').'origin='.GETPOST('origin') : ''); $h = 0; $head = array(); diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index 493ccd0726a..8ab7b5db7db 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -145,11 +145,11 @@ class FormSetup /** * Generate the form (in read or edit mode depending on $editMode) * - * @param bool $editMode True will display output on edit mod - * @param bool $hideTitle True to hide the first title line - * @param string $title Title of first line - * @param string $cssfirstcolumn CSS first column - * @return string Html output + * @param int|bool $editMode True will display output on edit mod + * @param bool $hideTitle True to hide the first title line + * @param string $title Title of first line + * @param string $cssfirstcolumn CSS first column + * @return string Html output */ public function generateOutput($editMode = false, $hideTitle = false, $title = '', $cssfirstcolumn = '') { @@ -184,7 +184,7 @@ class FormSetup } // generate output table - $out .= $this->generateTableOutput($editMode, $hideTitle, $title, $cssfirstcolumn); + $out .= $this->generateTableOutput((bool) $editMode, $hideTitle, $title, $cssfirstcolumn); $reshook = $hookmanager->executeHooks('formSetupBeforeGenerateOutputButton', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks @@ -197,10 +197,12 @@ class FormSetup } elseif ($editMode) { $out .= '
'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes $out .= $this->htmlOutputMoreButton; - $out .= ''; // Todo fix dolibarr style for
'; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c38a847823c..bd48827e7f0 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1338,7 +1338,7 @@ MoreNetworksAvailableWithModule=More social networks may be available by enablin Subcontractors=Subcontractors SubcontractorsDesc=If the management of your application is subcontracted to external service providers (an accountant/bookkeeper and/or an IT service provider), you can enter here their information so it won't be lost in case of a substition of the administrator. AccountingProvider=Accounting service provider -ITProvider=IT service prodiver +ITProvider=IT supplier AccountantFileNumber=Accountant code DisplayDesc=Parameters affecting the look and presentation of the application can be modified here. AvailableModules=Available app/modules diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index 3adb170dbb4..95a8b7e06ec 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -75,14 +75,14 @@ BLOCKEDLOG_REGISTRATION_ADDRESS=Company address BLOCKEDLOG_REGISTRATION_STATE=Company state/province BLOCKEDLOG_REGISTRATION_ZIP=Company zip BLOCKEDLOG_REGISTRATION_TOWN=Company town -MAIN_INFO_ITPROVIDER_NAME=IT service provider name -MAIN_INFO_ITPROVIDER_MAIL=IT service provider email -MAIN_INFO_ITPROVIDER_COUNTRY=IT service provider country -MAIN_INFO_ITPROVIDER_IDPROF1=IT service provider Prof Id 1 (SIREN) -MAIN_INFO_ITPROVIDER_ADDRESS=IT service provider address -MAIN_INFO_ITPROVIDER_STATE=IT service provider state/province -MAIN_INFO_ITPROVIDER_ZIP=IT service provider zip -MAIN_INFO_ITPROVIDER_TOWN=IT service provider town +MAIN_INFO_ITPROVIDER_NAME=IT supplier name +MAIN_INFO_ITPROVIDER_MAIL=IT supplier email +MAIN_INFO_ITPROVIDER_COUNTRY=IT supplier country +MAIN_INFO_ITPROVIDER_IDPROF1=IT supplier Prof Id 1 (SIREN) +MAIN_INFO_ITPROVIDER_ADDRESS=IT supplier address +MAIN_INFO_ITPROVIDER_STATE=IT supplier state/province +MAIN_INFO_ITPROVIDER_ZIP=IT supplier zip +MAIN_INFO_ITPROVIDER_TOWN=IT supplier town RegistrationDoneAndModuleEnabled=The new registration information have been saved and registered. The module %s is enabled. UserRegistration=User registration RegistrationRequired=Registration expected