From c8a9212503f80029c0c76be3c26da31a9dff9a3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 001/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From 47ae504a9cfe5eb6c240463fa6e33e9e63ba2728 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 002/114] Fix: Typo From 4dc0e24d40e2b055c8c275a09babfa087d82d929 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 003/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From ba2bd1d7ffec26c7895c60a370cf30b32542e308 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 004/114] Do not show residence if not defined. From f964d44fb386af6ecbbb4bd81f8030e20b542f23 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 005/114] Update screenshots From ba4b6299f635061aa46aec71e2284f77f23d803d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 006/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print ''; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From f20a893724482399acb2fd4ec29090fe34ad046a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 007/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 8c4b2f4c83e73117797bc46f1ce2ca90b0880310 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 008/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 962c31964e84bd3d9802206879aaf8b6b7b346b4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 009/114] Fix: Can add empty lines From 64ad517e469d9036ada457a55c9861c4a8bc3a53 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 010/114] Removed useless file From c260bf27f4acf28de977e390f21cf50ab4214c4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 011/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 08c229115925c13fd64c7af84085a89811062bc7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 012/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From 6ad4ac5bcce19c609450d54892e6a4658fe0357c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 013/114] Fix: Typo From 541e7ae748d49ad2ff59271af6ca648b500d1467 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 014/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 0b66920169889470aac87afed8422ed9fb2351c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 015/114] Do not show residence if not defined. From 43aebbad4672b5be31274e35fe6f6a3a335f70ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 016/114] Update screenshots From 1d5a75c77ae3f80a13f1e0ce6fc52ed8327492d8 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 017/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From b09b0a5e4d4b931f2ac7b9f64154573c9f739d2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 018/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 6640f652687f293c21a004c442c4f5d403db805b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 019/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 7263440c537cd5427ced92232e91812e0094febf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 020/114] Fix: Can add empty lines From 00b6913af9cecb3d98c5306bca4c1823d7533923 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 021/114] Removed useless file From 9929d3c3443bd7a530ed3e60fe18dc664598f390 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 022/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 952a3cc1cb6052c3f2b44779584fb3b0408a579e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 023/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From e90ef6dc2c3bb9a8fb91ed046ef31413d34ebc7b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 024/114] Fix: Typo From 58ef9318c959139df034683213b3cd13ab6379ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 025/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From b0b9dd27acfc14bad9e589662d211e980e4f7a65 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 026/114] Do not show residence if not defined. From 1f0cea29f68422c47623bc77b67764b17e95c876 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 027/114] Update screenshots From 4726c7b6f1bc6c45071fcfc0d9dbcaa46f5c5b28 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 028/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From c4befc1498c3d244fd2363e2434a592887f8fe70 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 029/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 751407a6ed145272e5f167006913a5b1389763d0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 030/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From f9269235ee2bd6fc98678fe4a4c4ad2f8c2373a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 031/114] Fix: Can add empty lines From f510b5fdef692ccf9f111067c53c6d2e5e563cb2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 032/114] Removed useless file From db00c615ec8e10eac372a8f313a96b5a82dcc9ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 033/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 8c83728a6552fc1b177e322d0ac5edf4429d31c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 034/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From bb82e839937c5277207df419da564e141acb6633 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 035/114] Fix: Typo From fb0d52e4db6259820ccf13136142de073b23282b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 036/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 0f1409bed5c57b078fd2e1e426e8ae19ecb5864c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 037/114] Do not show residence if not defined. From 9fdb1df66b008dd1cbfcc3ffd4951ca17099f24e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 038/114] Update screenshots From 8bf176bcc63ad396382f24202642b431c8e222f1 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 039/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From 569418c244372015d80e8ec514e02be87898c15d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 040/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 98b6a61f144484d7d890267c4cda0748b9991023 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 041/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 47316ebae79492e4d0a567d8cdf37e71844e5ab9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 042/114] Fix: Can add empty lines From f2442cdb60a45d3a62bf595e26f04d71544464b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 043/114] Removed useless file From 8319ca6e2cb466d62db07b0790c86fc5ca27395d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 044/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From de16ea36318ab85fbca2a850b531d7204d7c3c76 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 045/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From b613f6d1acf188ba3ff5b13b6786a679b1bd22e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 046/114] Fix: Typo From 66e3ba5ccb237704806b3881834a2889f8c54241 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 047/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 179654ae0efb13491fd98a1d57be6b272b2709f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 048/114] Do not show residence if not defined. From ab43eeb472cf3a0eab7ccef278a396ed3149a99b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 049/114] Update screenshots From 96f2dc9524bb529ec6df99d0c036f0dbc11a678e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 050/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From 1717772b38bdc4b2cbff7ef112a87585f734d992 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 051/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 6dcf609850349488782b8a8379335041aa4d54f4 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 052/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From f46417968e80ec53a21c02d3f44c83df9a918b9c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 053/114] Fix: Can add empty lines From 3435266f83240c22521271ba1b7caac12debe152 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 054/114] Removed useless file From 7b312c836ed7faa2de00ee529158289c06705760 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 055/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 7c891c7756f7cd3cbb5a2a1ae5373aadccb75be9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 056/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From 5056db9fb24c60860babe579937b36c72cdc8532 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 057/114] Fix: Typo From d177381fb5709f78ccd68d529ba05b8e3d18a353 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 058/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 1f7552b73e23fe92584f053c8a081ff05903fd00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 059/114] Do not show residence if not defined. From 77c6de324e19c534d48fb3b0f3552f3e1f57aa2f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 060/114] Update screenshots From c509b1cef94f4b357e081335a17a87e192b114d3 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 061/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From ee1d409976d7620403aabbf77371a9753f80f392 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 062/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 1eabe022672dd90307ab0c2b2d2fbdd417889a9b Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 063/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 818b05ca97281026e4ff8f3fb90cf10f9c2c70b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 064/114] Fix: Can add empty lines From ce601564c22f163552d60653704603f797e1a8e2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 065/114] Removed useless file From 9a78b22a701f2598837cb3b33ea1a12b8190b4ca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 066/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From 362c86e05ce49ebf57934ac5c704526c0b4ebe3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 067/114] Fix: Typo From 16a309abdc73873d569bb4d7a7e3f9110d32b809 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 068/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From c9b55a29fd14f4045921df13876c85e835f4f0f5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 069/114] Do not show residence if not defined. From 64b57604cd0f89dbd1d3e4f6b1981ea6baa92629 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 070/114] Update screenshots From 4bcb0825e857d1aa7398390c9d46b4fa0a0b9464 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 071/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From f9f446539876eae5b1217c5a18e2981fe65e36db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 072/114] Look fixes and enhancements From eb066f6459f3cb389cf7f71bd337ac9c286d5aa6 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 073/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 7e9ab1f8d0abe6df2563036b5fe393acee76d512 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 074/114] Fix: Can add empty lines From 9456a1ca5665df4fc88e5ae498d75ac4380b53fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 075/114] Removed useless file From 9e3d45d9d07b5fc8f74595c22f053ffd5162a5bd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 076/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 117b9766cfbfe573d07ac36c924e50c0b6f7dac7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 077/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From 11af2240ed08715fd89c13a110e7b0c5cfe497c0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 078/114] Fix: Typo From df6394794177aab6c87d1b7be067bbf270de7967 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 079/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 59113a725ff5f4844487dc85d5035e96e61956a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 080/114] Do not show residence if not defined. From 2140030ed666442ac0d58739bc91cf9a8ffd59d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 081/114] Update screenshots From 2324d804916c95c99087aa0bca9b9d968c4fcbaa Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 082/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From a8d6f0aad4c49563d7a9c1e4f0c3b623e3ed1b50 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 083/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From aeb76aa6d85808fcc07c9c368adeb147624331aa Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 084/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From e1727c2eedefca02c2d07b6e292fdc23c7ec5f10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 085/114] Fix: Can add empty lines From 8941ee58745669bd4facc3760ba718b7b3ac23cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 086/114] Removed useless file From ccb2dae3a09e70ff2569dd725bae03d0a54b15df Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 087/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 339cda53183f9fd29c3b9e0817cb44bd6a4473e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 088/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From fd7358b11ec042e6298819b402d4e47befa1933b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 089/114] Fix: Typo From cd0a56cdd3d8b5c694b72bc5873c647a2f192e06 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 090/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From 53c8b2ebdd493f70dc7d02ff2c192c30393dda15 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 091/114] Do not show residence if not defined. From ff29cabfbc72311e0e99987353e8350f871c1f4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 092/114] Update screenshots From 31b8137870a304049f105f99b0b5c902c737897d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 093/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From 2d8ab0c24b6d436bde55b8ced93ba04f98d6f953 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 094/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 10f5bcbd88626e1d690d5e28f58c250a4e7b90d0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 095/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From c7541c77cb6b8a3ff23a1df9f40dd80a80203fe7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 096/114] Fix: Can add empty lines From f3c4b1f4725f1146fb4af4b8c534a8bd4a491f98 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 097/114] Removed useless file From 6bad893f6570fc883d35468a0b8ff434e7d04549 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 098/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 20ab6ad12b88d8757f6085a87b1bee2b5816510b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 11:07:12 +0000 Subject: [PATCH 099/114] Try to fix crl-lf into emails --- htdocs/lib/CMailFile.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 8dda1a9d93b..1184ad3fd07 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,17 +340,13 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) + if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } - if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender - { - $bounce .= ($bounce?' ':'').'-ba'; - } $this->message=stripslashes($this->message); From f5e8da79c01946215557df1a86ee4ae3733f78c6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 12:37:08 +0000 Subject: [PATCH 100/114] Fix: Typo From 14817ce2649a1a50075099f575d60996b1315aeb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:01:03 +0000 Subject: [PATCH 101/114] Add important warning on sendmail setup to allow to send email from dolibarr. --- htdocs/lib/CMailFile.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 1184ad3fd07..8dda1a9d93b 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.146 2011/07/20 11:07:12 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. @@ -340,13 +340,17 @@ class CMailFile dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); $bounce = ''; // By default - if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) + if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) { // le return-path dans les header ne fonctionne pas avec tous les MTA // Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie. // La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse) - $bounce = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); + $bounce .= ($bounce?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $conf->global->MAIN_MAIL_ERRORS_TO : ($this->addr_from != '' ? '-f' . $this->addr_from : '') ); } + if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender + { + $bounce .= ($bounce?' ':'').'-ba'; + } $this->message=stripslashes($this->message); From fcb48cce6d2e4f0b3fce66857cddc49a2bfc54d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 13:32:25 +0000 Subject: [PATCH 102/114] Do not show residence if not defined. From cdc66c69f463d9b1638c8c72fa08c87075656134 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 15:08:28 +0000 Subject: [PATCH 103/114] Update screenshots From 5742cbfc43f66332069174683a29f8d7ba2819c8 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 15:33:00 +0000 Subject: [PATCH 104/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..76726f3a153 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); ?> From a4b6bc629388de5b49102b66b501923f4bd4b9e6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 105/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From fc32d03d85fb6501a30f2d3e2c7a4d09c6c3e73d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 106/114] Fix: Add name of the third on the list, if applicable --- htdocs/comm/propal.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 76726f3a153..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -27,7 +27,7 @@ * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.612 2011/07/20 15:33:00 simnandez Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1833,7 +1833,7 @@ else $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($month) $param.='&month='.$month; if ($year) $param.='&year='.$year; - print_barre_liste($langs->trans('ListOfProposals').' - '.($socid?' '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page,'propal.php',$param,$sortfield,$sortorder,'',$num); $i = 0; print '
'; @@ -1976,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 15:33:00 $ - $Revision: 1.612 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> From 8549f0304d66251bb205d450fec57f6ba4edb26e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 107/114] Fix: Can add empty lines From 0093e03271f561b760fac0d1645ffcd04546fb3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 108/114] Removed useless file From 8a49028534838fad1214b1d93189d8235193f7d5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 109/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } From 39c5ea388636e27522f2242e7a39e76c7390361d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 19:03:31 +0000 Subject: [PATCH 110/114] Look fixes and enhancements --- htdocs/theme/auguria/style.css.php | 6 +++++- htdocs/theme/eldy/style.css.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f642438a8f8..fc333cc6435 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,6 +1294,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3a11f7e5dbc..f446c2b6df0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ + * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,6 +1260,10 @@ font-family: ; td.highlights { background: #f9c5c6; } +td.warning { /* Utilise par Smarty */ + background: #FF99A9; +} + div.ok { color: #114466; } From 312ef624dec694ef3e07fc013033520715c93c60 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Jul 2011 19:22:14 +0000 Subject: [PATCH 111/114] Fix: Add name of the third on the list, if applicable From 850237613e3d31f3398d715f507cfdcc2b068966 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Jul 2011 21:26:11 +0000 Subject: [PATCH 112/114] Fix: Can add empty lines From 68ff9e739c84d8795b2a2aef3bc110b0d3890230 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 00:53:23 +0000 Subject: [PATCH 113/114] Removed useless file From 2b2a342c51a3ebc50e92298c7c8261773a89271d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 01:20:31 +0000 Subject: [PATCH 114/114] Clean code to remove a lot of quality test errors --- htdocs/theme/auguria/style.css.php | 6 +----- htdocs/theme/eldy/style.css.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index fc333cc6435..f642438a8f8 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.88 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1294,10 +1294,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f446c2b6df0..3a11f7e5dbc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.86 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: style.css.php,v 1.87 2011/07/21 01:20:33 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1260,10 +1260,6 @@ font-family: ; td.highlights { background: #f9c5c6; } -td.warning { /* Utilise par Smarty */ - background: #FF99A9; -} - div.ok { color: #114466; }