From 55b9d6b86a1bfac2968cc2c8ee2b06972aa7d44a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 Jun 2010 19:00:21 +0000 Subject: [PATCH] Fix: Removed not translated combo box. --- htdocs/adherents/admin/adherent.php | 4 ++-- htdocs/compta/bank/fiche.php | 11 ++++++----- htdocs/install/mysql/data/llx_const.sql | 16 ++++++++-------- htdocs/lib/doleditor.class.php | 24 ++++++++++++------------ 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index bef6fb9a00e..01e85b456c4 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -48,7 +48,7 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add') $const=$_POST["constname"]; $value=$_POST["constvalue"]; - if (in_array($const,array('ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const]; + if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const]; $type=$_POST["consttype"]; $constnote=isset($_POST["constnote"])?$_POST["constnote"]:''; @@ -374,7 +374,7 @@ function form_constantes($tableau) print ''; print ''; } - else if (in_array($const,array('ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) + else if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) { // Editor wysiwyg if ($conf->fckeditor->enabled) diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index df2738ab0de..6e818201ab6 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -225,8 +225,8 @@ if ($_GET["action"] == 'create') // Comment print ''.$langs->trans("Comment").''; print ''; - // Editeur wysiwyg - if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) + // Editor wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); $doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false); @@ -235,7 +235,8 @@ if ($_GET["action"] == 'create') else { print ''; + print dol_htmlentitiesbr_decode($account->comment); + print ''; } print ''; @@ -463,8 +464,8 @@ else // Comment print ''.$langs->trans("Comment").''; print ''; - // �diteur wysiwyg - if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) + // Editor wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); $doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false); diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 4000086209a..3b28cd96046 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -99,14 +99,14 @@ insert into llx_const (name, value, type, note, visible) values('SOCIETE_CODECOM -- -- Mail Adherent -- -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_REQUIRED','1','yesno','Le mail est obligatoire pour créer un adhérent',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_FROM','adherents@domain.com','chaine','From des mails adherents',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL','Votre adhesion vient d\'etre resiliee.\r\nNous esperons vous revoir tres bientot','texte','Mail de Resiliation',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID','Votre adhesion vient d\'etre validee. \r\nVoici le rappel de vos coordonnees (toute information erronee entrainera la non validation de votre inscription) :\r\n\r\n%INFOS%\r\n\r\n','texte','Mail de validation',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS','Bonjour %PRENOM%,\r\nMerci de votre inscription.\r\nCet email confirme que votre cotisation a ete recue et enregistree.\r\n\r\n','texte','Mail de validation de cotisation',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID_SUBJECT','Votre adhésion a ete validée','chaine','Sujet du mail de validation',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL_SUBJECT','Resiliation de votre adhesion','chaine','Sujet du mail de resiliation',0); -insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS_SUBJECT','Recu de votre cotisation','chaine','Sujet du mail de validation de cotisation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_REQUIRED','1','yesno','EMail required to create a new member',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_FROM','adherents@domain.com','chaine','Sender EMail for automatic emails',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL','Your subscription has been resiliated.\r\nWe hope to see you soon again','texte','Mail resiliation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID','Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte','Mail de validation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS','Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte','Mail de validation de cotisation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_VALID_SUBJECT','Your subscription has been validated','chaine','Sujet du mail de validation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_RESIL_SUBJECT','Resiliating your subscription','chaine','Sujet du mail de resiliation',0); +insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_COTIS_SUBJECT','Receipt of your subscription','chaine','Sujet du mail de validation de cotisation',0); -- diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index abe739f2412..b76ffb82cc3 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.class.php @@ -36,22 +36,22 @@ class DolEditor /** - \brief DolEditor - \param htmlname Nom formulaire html WYSIWIG - \param content Contenu edition WYSIWIG - \param height Hauteur en pixel de la zone edition - \param toolbarname Nom barre de menu editeur - \param toolbarlocation Emplacement de la barre de menu : - 'In' chaque fenetre d'edition a la propre barre d'outils - 'Out:nom' partage de la barre d'outils ou 'nom' est le nom du DIV qui affiche la barre - \param toolbarstartexpanded visible ou non au demarrage - \param modulepart modulepart pour protection wrapper download viewimage - */ + * \brief DolEditor + * \param htmlname Nom formulaire html WYSIWIG + * \param content Contenu edition WYSIWIG + * \param height Hauteur en pixel de la zone edition + * \param toolbarname Nom barre de menu editeur + * \param toolbarlocation Emplacement de la barre de menu : + * 'In' chaque fenetre d'edition a la propre barre d'outils + * 'Out:nom' partage de la barre d'outils ou 'nom' est le nom du DIV qui affiche la barre + * \param toolbarstartexpanded visible ou non au demarrage + * \param uselocalbrowser Enabled to add links to local object with local browsers. If false, only external images can be added in content. + */ function DolEditor($htmlname,$content,$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true) { global $conf,$langs; - dol_syslog("DolEditor::DolEditor modulepart=".$modulepart); + dol_syslog("DolEditor::DolEditor htmlname=".$htmlname); require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php");