From c3e2f73e48ec0a018263ba739f0386f1d73c49fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Dec 2018 19:45:30 +0100 Subject: [PATCH] FIX #10144 --- htdocs/emailcollector/class/emailcollector.class.php | 8 ++++---- htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 2 +- .../mysql/tables/llx_emailcollector_emailcollector.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index 1902473a0cd..44f8555bea7 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -96,7 +96,7 @@ class EmailCollector extends CommonObject 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'), 'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1), 'host' => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>100, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'), - 'user' => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myacount@gmail.com'), + 'login' => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myacount@gmail.com'), 'password' => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>1, 'comment'=>"IMAP password"), 'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'), //'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105), @@ -161,7 +161,7 @@ class EmailCollector extends CommonObject public $host; - public $user; + public $login; public $password; public $source_directory; public $target_directory; @@ -829,7 +829,7 @@ class EmailCollector extends CommonObject $this->error=$langs->trans('ErrorFieldRequired', 'EMailHost'); return -1; } - if (empty($this->user)) + if (empty($this->login)) { $this->error=$langs->trans('ErrorFieldRequired', 'Login'); return -1; @@ -855,7 +855,7 @@ class EmailCollector extends CommonObject $connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir); $connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir); - $connection = imap_open($connectstringsource, $this->user, $this->password); + $connection = imap_open($connectstringsource, $this->login, $this->password); if (! $connection) { $this->error = 'Failed to open IMAP connection '.$connectstringsource; diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index c3e886df914..20b0a874879 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -159,7 +159,7 @@ CREATE TABLE llx_emailcollector_emailcollector( label varchar(255), description text, host varchar(255), - user varchar(128), + login varchar(128), password varchar(128), source_directory varchar(255) NOT NULL, target_directory varchar(255), diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql index 750c2b24e84..0f81df401dc 100644 --- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql +++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql @@ -22,7 +22,7 @@ CREATE TABLE llx_emailcollector_emailcollector( label varchar(255), description text, host varchar(255), - user varchar(128), + login varchar(128), password varchar(128), source_directory varchar(255) NOT NULL, target_directory varchar(255),