mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 18:48:51 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # core/config.class.inc.php # datamodels/2.x/installation.xml # datamodels/2.x/itop-oauth-client/assets/img/icons8-adjust.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-administrative-tools.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-application-window.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-apps-tab.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-archive-folder.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-audit.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-automatic.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-bandage.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-book-error.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-calendar.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-cassette.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-change-approved.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-change-emergency.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-change-normal.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-change-routine.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-change.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-checkmark.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-cloud-file.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-conflict.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-contract.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-customer.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-database-custom.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-database.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-delete.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-department.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-desktop.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-discussion-forum.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-documents.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-electrical.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-electricity.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-electronics.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-enclosure-for-servers.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-export-csv.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-faq.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-farm.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-file.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-cable.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-fiber.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-wire.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-hdd.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-hierarchy.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-hypervisor.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-import-csv.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-important-book.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-in-transit.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-laptop.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-licence.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-map-as-drive.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-map-marker.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-mobile.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-music-robot.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-nas.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-network.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-new-item.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-note.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-office-phone.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-old-vmware-logo.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-organization.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-person-female.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-phone.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-plug-socket.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-power-plant.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-print.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-process-improvement.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-puzzle.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-rack.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-server-custom.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-server-storage.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-server.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-service.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-services.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-smartphone-tablet.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-software-instance.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-software-license.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-software-other.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-software.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-solve.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-stack.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-switch-san.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-switch.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-tape-library.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-tasklist.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-team.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-telephone.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-time-limit.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-virtual-machine.svg # datamodels/2.x/itop-oauth-client/assets/img/icons8-web.svg # datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml # dictionaries/cs.dictionary.itop.ui.php # dictionaries/da.dictionary.itop.ui.php # dictionaries/de.dictionary.itop.ui.php # dictionaries/en.dictionary.itop.ui.php # dictionaries/es_cr.dictionary.itop.ui.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/ja.dictionary.itop.ui.php # dictionaries/nl.dictionary.itop.ui.php # dictionaries/pt_br.dictionary.itop.ui.php # dictionaries/ru.dictionary.itop.ui.php # dictionaries/sk.dictionary.itop.ui.php # dictionaries/tr.dictionary.itop.ui.php # dictionaries/zh_cn.dictionary.itop.ui.php # js/wizardhelper.js # lib/composer/autoload_classmap.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php # templates/pages/backoffice/oauth/Wizard.html.twig
This commit is contained in:
Benjamin Dalsass
@@ -20,6 +20,9 @@
|
||||
/**
|
||||
* Wizard to configure and initialize the iTop application
|
||||
*/
|
||||
|
||||
use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory;
|
||||
|
||||
require_once('../approot.inc.php');
|
||||
require_once(APPROOT.'/application/utils.inc.php');
|
||||
require_once(APPROOT.'/core/email.class.inc.php');
|
||||
@@ -133,13 +136,20 @@ function CheckEmailSetting($oP)
|
||||
$sDisplayEncryption = empty($sEncryption) ? '<em>no encryption</em> ' : $sEncryption;
|
||||
$sUserName = MetaModel::GetConfig()->Get('email_transport_smtp.username');
|
||||
$sDisplayUserName = empty($sUserName) ? '<em>no user</em> ' : $sUserName;
|
||||
$sProvider = MetaModel::GetConfig()->Get('email_transport_smtp.oauth.provider');
|
||||
$sDisplayProvider = empty($sProvider) ? '<em>no Provider</em> ' : $sProvider;
|
||||
$sClientID = MetaModel::GetConfig()->Get('email_transport_smtp.oauth.client_id');
|
||||
$sDisplayClientID = empty($sClientID) ? '<em>no password</em> ' : $sClientID;
|
||||
$oP->info("SMTP configuration (from config-itop.php): host: $sHost, port: $sPort, provider: $sDisplayProvider, user: $sDisplayUserName, client id: $sDisplayClientID, encryption: $sDisplayEncryption.");
|
||||
if (($sHost == 'localhost') && ($sPort == '25') && ($sUserName == '') && ($sClientID == '') && ($sProvider == '')) {
|
||||
$oP->warning("The default settings may not be suitable for your environment. You may want to adjust these values by editing iTop's configuration file (".utils::GetConfigFilePathRelative().').');
|
||||
try {
|
||||
$oRemoteAuthentOAuth = OAuthClientProviderFactory::GetOAuthClientForSMTP();
|
||||
$sLink = MetaModel::GetHyperLink(get_class($oRemoteAuthentOAuth), $oRemoteAuthentOAuth->GetKey());
|
||||
$oP->info("The connection used is: $sLink");
|
||||
$sProvider = $oRemoteAuthentOAuth->Get('provider');
|
||||
$sDisplayProvider = empty($sProvider) ? '<em>no Provider</em> ' : $sProvider;
|
||||
$sClientID = $oRemoteAuthentOAuth->Get('client_id');
|
||||
$oP->info("SMTP configuration (from config-itop.php): host: $sHost, port: $sPort, provider: $sDisplayProvider, user: $sDisplayUserName, encryption: $sDisplayEncryption.");
|
||||
if (($sHost == 'localhost') && ($sPort == '25') && ($sUserName == '') && ($sClientID == '') && ($sProvider == '')) {
|
||||
$oP->warning("The default settings may not be suitable for your environment. You may want to adjust these values by editing iTop's configuration file (".utils::GetConfigFilePathRelative().').');
|
||||
}
|
||||
} catch (CoreException $e) {
|
||||
$bRet = false;
|
||||
$oP->error($e->getMessage());
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -194,9 +204,10 @@ function DisplayStep1(SetupPage $oP)
|
||||
'input' => "<input id=\"to\" type=\"text\" name=\"to\" value=\"\">",
|
||||
'help' => ' email address (e.g. john.foo@worldcompany.com)',
|
||||
);
|
||||
$sDefaultFrom = MetaModel::GetConfig()->Get('email_transport_smtp.username');
|
||||
$aForm[] = array(
|
||||
'label' => "From:",
|
||||
'input' => "<input id=\"from\" type=\"text\" name=\"from\" value=\"\">",
|
||||
'input' => "<input id=\"from\" type=\"text\" name=\"from\" value=\"$sDefaultFrom\">",
|
||||
'help' => ' defaults to the configuration param "email_default_sender_address" or "To" field.',
|
||||
);
|
||||
$oP->form($aForm);
|
||||
@@ -298,4 +309,4 @@ catch(CoreException $e)
|
||||
$oP->error("Error: '".$e->getHtmlDesc()."'");
|
||||
}
|
||||
$oP->output();
|
||||
?>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user