diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index d69c20ab643..50e767fe411 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -244,7 +244,7 @@ class modAgenda extends DolibarrModules // Calendar $this->menu[$r]=array('fk_menu'=>'r=1', 'type'=>'left', - 'titre'=>'Agenda', + 'titre'=>'Calendar', 'mainmenu'=>'agenda', 'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda', 'langs'=>'agenda', diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index ccf303949ec..7724e312ff2 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -930,18 +930,17 @@ class EmailCollector extends CommonObject if ($errorforactions) break; if (empty($operation['status'])) continue; - // Make Operation if ($operation['type'] == 'recordevent') { $actioncode = 'EMAIL_IN'; - var_dump($structure); + // Insert record of emails sent $actioncomm = new ActionComm($this->db); $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) $actioncomm->code = 'AC_'.$actioncode; - $actioncomm->label = $subject; + $actioncomm->label = $langs->trans("EmailReceived").' - '.$langs->trans("From").' '.$from; $actioncomm->note = $messagetext; $actioncomm->fk_project = 0; $actioncomm->datep = $date; @@ -983,9 +982,12 @@ class EmailCollector extends CommonObject } } - var_dump($actioncomm);exit; + elseif ($operation['type'] == 'aaa') + { + } + if (! $errorforactions) { $nbactiondone++;