diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php new file mode 100644 index 00000000000..5551f2194f0 --- /dev/null +++ b/htdocs/admin/mails.php @@ -0,0 +1,126 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + * $Source$ + */ + +/** + \file htdocs/admin/mails.php + \brief Page de configuration des emails + \version $Revision$ +*/ + +require("./pre.inc.php"); + +$langs->load("companies"); +$langs->load("products"); +$langs->load("admin"); + +if (!$user->admin) + accessforbidden(); + + +if (isset($_POST["action"]) && $_POST["action"] == 'update') +{ + dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", $_POST["MAIN_MAIL_SMTP_PORT"]); + dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", $_POST["MAIN_MAIL_SMTP_SERVER"]); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", $_POST["MAIN_MAIL_EMAIL_FROM"]); + dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", $_POST["MAIN_DISABLE_ALL_MAILS"]); + + $_SESSION["mainmenu"]=""; // Le gestionnaire de menu a pu changer + + Header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup"); + exit; +} + + +llxHeader(); + +print_fiche_titre($langs->trans("GUISetup"),'','setup'); + +print $langs->trans("DisplayDesc")."
\n"; +print "
\n"; + + +if (isset($_GET["action"]) && $_GET["action"] == 'edit') +{ + $html=new Form($db); + + print '
'; + print ''; + + clearstatcache(); + $var=true; + + print ''; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("MAIN_MAIL_SMTP_PORT").'
'.$langs->trans("MAIN_MAIL_SMTP_SERVER").'
'.$langs->trans("MAIN_MAIL_EMAIL_FROM").'
'.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; + print $html->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1); + print '
'; + + print '
'; + print ''; + print '
'; + + print '
'; + print '
'; +} +else +{ + $var=true; + + print ''; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("MAIN_MAIL_SMTP_PORT").''.$conf->global->MAIN_MAIL_SMTP_PORT.'
'.$langs->trans("MAIN_MAIL_SMTP_SERVER").''.$conf->global->MAIN_MAIL_SMTP_SERVER.'
'.$langs->trans("MAIN_MAIL_EMAIL_FROM").''.$conf->global->MAIN_MAIL_EMAIL_FROM.'
'.$langs->trans("MAIN_DISABLE_ALL_MAILS").''.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'

'; + + print '
'; + print ''.$langs->trans("Edit").''; + print '
'; +} + + +$db->close(); + +llxFooter('$Date$ - $Revision$'); +?> diff --git a/mysql/data/data.sql b/mysql/data/data.sql index b139987bc8e..1a7abae749f 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -61,6 +61,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTA insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',1); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',1); +insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',1); insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0); @@ -160,10 +161,6 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_CARD_ -- insert into llx_const (name, value, type, note, visible) values ('OSC_DB_HOST','localhost','chaine', 'Host for OSC database for OSCommerce module 1', 0); --- --- Notification --- -insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',1); -- -- Modeles de numerotation et generation document diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 80d5a208636..d9586722657 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -29,6 +29,8 @@ delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES'; update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM'; +update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM'); + delete from llx_adherent_type where libelle IS NULL; alter table llx_adherent_type modify libelle varchar(50) NOT NULL;