@ -52,34 +52,39 @@ class IrMail(osv.osv):
return res
_columns = {
' smtp_host ' : fields . function ( _get_smtp_conf ,
' smtp_host ' : fields . function (
_get_smtp_conf ,
method = True ,
string = ' SMTP Server ' ,
type = " char " ,
multi = ' outgoing_mail_config ' ,
size = 128 ) ,
' smtp_port ' : fields . function ( _get_smtp_conf ,
' smtp_port ' : fields . function (
_get_smtp_conf ,
method = True ,
string = ' SMTP Port ' ,
type = " integer " ,
multi = ' outgoing_mail_config ' ,
help = " SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases. " ,
size = 5 ) ,
' smtp_user ' : fields . function ( _get_smtp_conf ,
' smtp_user ' : fields . function (
_get_smtp_conf ,
method = True ,
string = ' Username ' ,
type = " char " ,
multi = ' outgoing_mail_config ' ,
help = " Optional username for SMTP authentication " ,
size = 64 ) ,
' smtp_pass ' : fields . function ( _get_smtp_conf ,
' smtp_pass ' : fields . function (
_get_smtp_conf ,
method = True ,
string = ' Password ' ,
type = " char " ,
multi = ' outgoing_mail_config ' ,
help = " Optional password for SMTP authentication " ,
size = 64 ) ,
' smtp_encryption ' : fields . function ( _get_smtp_conf ,
' smtp_encryption ' : fields . function (
_get_smtp_conf ,
method = True ,
string = ' smtp_encryption ' ,
type = " char " ,
@ -108,13 +113,15 @@ class FetchmailServer(osv.osv):
key_types = { ' port ' : int ,
' is_ssl ' : lambda a : bool ( int ( a ) ) ,
' attach ' : lambda a : bool ( int ( a ) ) ,
' original ' : lambda a : bool ( int ( a ) ) , }
' original ' : lambda a : bool ( int ( a ) ) ,
}
# default vals
config_vals = { ' port ' : 993 ,
' is_ssl ' : 0 ,
' attach ' : 0 ,
' original ' : 0 }
' original ' : 0 ,
}
if serv_config . has_section ( global_section_name ) :
config_vals . update ( serv_config . items ( global_section_name ) )
@ -152,19 +159,22 @@ class FetchmailServer(osv.osv):
return [ ( ' id ' , ' in ' , result_ids ) ]
_columns = {
' server ' : fields . function ( _get_incom_conf ,
' server ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Server ' ,
type = " char " ,
multi = ' income_mail_config ' ,
size = 256 , help = " Hostname or IP of the mail server " ) ,
' port ' : fields . function ( _get_incom_conf ,
' port ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Port ' ,
type = " integer " ,
multi = ' income_mail_config ' ,
help = " Hostname or IP of the mail server " ) ,
' type ' : fields . function ( _get_incom_conf ,
' type ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Type ' ,
type = " char " ,
@ -172,34 +182,41 @@ class FetchmailServer(osv.osv):
fnct_search = _type_search ,
size = 64 ,
help = " pop, imap, local " ) ,
' is_ssl ' : fields . function ( _get_incom_conf ,
' is_ssl ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Is SSL ' ,
type = " boolean " ,
multi = ' income_mail_config ' ,
help = ' Connections are encrypted with SSL/TLS through '
' a dedicated port (default: IMAPS=993, POP3S=995) ' ) ,
' attach ' : fields . function ( _get_incom_conf ,
' attach ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Keep Attachments ' ,
type = " boolean " ,
multi = ' income_mail_config ' ,
help = " Whether attachments should be downloaded. "
" If not enabled, incoming emails will be stripped of any attachments before being processed " ) ,
' original ' : fields . function ( _get_incom_conf ,
" If not enabled, incoming emails will be stripped of any "
" attachments before being processed " ) ,
' original ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Keep Original ' ,
type = " boolean " ,
multi = ' income_mail_config ' ,
help = " Whether a full original copy of each email should be kept for reference "
" and attached to each processed message. This will usually double the size of your message database. " ) ,
' user ' : fields . function ( _get_incom_conf ,
help = " Whether a full original copy of each email should be kept "
" for reference and attached to each processed message. This "
" will usually double the size of your message database. " ) ,
' user ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' Username ' ,
type = " char " ,
multi = ' income_mail_config ' ,
size = 64 ) ,
' password ' : fields . function ( _get_incom_conf ,
' password ' : fields . function (
_get_incom_conf ,
method = True ,
string = ' password ' ,
type = " char " ,