Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pep8

pull/70/head
Guewen Baconnier 2014-10-08 14:10:24 +02:00
parent 715621cf30
commit 9a5037709c
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail_environment/__openerp__.py
View File

@ -59,7 +59,11 @@ password = openerp
'author': 'Camptocamp', 'author': 'Camptocamp',
'license': 'AGPL-3', 'license': 'AGPL-3',
'website': 'http://openerp.camptocamp.com', 'website': 'http://openerp.camptocamp.com',
'depends': ['mail', 'fetchmail', 'server_environment', 'server_environment_files', 'crm'], 'depends': ['mail',
'fetchmail',
'server_environment',
'server_environment_files',
'crm'],
'init_xml': [], 'init_xml': [],
'update_xml': ['mail_view.xml'], 'update_xml': ['mail_view.xml'],
'demo_xml': [], 'demo_xml': [],

29
mail_environment/env_mail.py
View File

@ -40,7 +40,8 @@ class IrMail(orm.Model):
if serv_config.has_section(global_section_name): if serv_config.has_section(global_section_name):
config_vals.update((serv_config.items(global_section_name))) config_vals.update((serv_config.items(global_section_name)))
custom_section_name = '.'.join((global_section_name, mail_server.name)) custom_section_name = '.'.join((global_section_name,
mail_server.name))
if serv_config.has_section(custom_section_name): if serv_config.has_section(custom_section_name):
config_vals.update(serv_config.items(custom_section_name)) config_vals.update(serv_config.items(custom_section_name))
@ -64,7 +65,8 @@ class IrMail(orm.Model):
type="integer", type="integer",
multi='outgoing_mail_config', multi='outgoing_mail_config',
states={'draft': [('readonly', True)]}, states={'draft': [('readonly', True)]},
help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases.", help="SMTP Port. Usually 465 for SSL, "
"and 25 or 587 for other cases.",
size=5), size=5),
'smtp_user': fields.function( 'smtp_user': fields.function(
_get_smtp_conf, _get_smtp_conf,
@ -87,14 +89,16 @@ class IrMail(orm.Model):
string='smtp_encryption', string='smtp_encryption',
type="selection", type="selection",
multi='outgoing_mail_config', multi='outgoing_mail_config',
selection=[('none','None'), selection=[('none', 'None'),
('starttls','TLS (STARTTLS)'), ('starttls', 'TLS (STARTTLS)'),
('ssl','SSL/TLS')], ('ssl', 'SSL/TLS')],
states={'draft': [('readonly', True)]}, states={'draft': [('readonly', True)]},
help="Choose the connection encryption scheme:\n" help="Choose the connection encryption scheme:\n"
"- none: SMTP sessions are done in cleartext.\n" "- none: SMTP sessions are done in cleartext.\n"
"- starttls: TLS encryption is requested at start of SMTP session (Recommended)\n" "- starttls: TLS encryption is requested at start "
"- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)",) "of SMTP session (Recommended)\n"
"- ssl: SMTP sessions are encrypted with SSL/TLS "
"through a dedicated port (default: 465)")
} }
@ -125,7 +129,8 @@ class FetchmailServer(orm.Model):
if serv_config.has_section(global_section_name): if serv_config.has_section(global_section_name):
config_vals.update(serv_config.items(global_section_name)) config_vals.update(serv_config.items(global_section_name))
custom_section_name = '.'.join((global_section_name, fetchmail.name)) custom_section_name = '.'.join((global_section_name,
fetchmail.name))
if serv_config.has_section(custom_section_name): if serv_config.has_section(custom_section_name):
config_vals.update(serv_config.items(custom_section_name)) config_vals.update(serv_config.items(custom_section_name))
@ -137,7 +142,7 @@ class FetchmailServer(orm.Model):
def _type_search(self, cr, uid, obj, name, args, context=None): def _type_search(self, cr, uid, obj, name, args, context=None):
result_ids = [] result_ids = []
# read all incomming servers values # read all incoming servers values
all_ids = self.search(cr, uid, [], context=context) all_ids = self.search(cr, uid, [], context=context)
results = self.read(cr, uid, all_ids, ['id', 'type'], context=context) results = self.read(cr, uid, all_ids, ['id', 'type'], context=context)
args = args[:] args = args[:]
@ -146,12 +151,14 @@ class FetchmailServer(orm.Model):
operator = args[i][1] operator = args[i][1]
if operator == '=': if operator == '=':
for res in results: for res in results:
if (res['type'] == args[i][2]) and (res['id'] not in result_ids): if (res['type'] == args[i][2] and
res['id'] not in result_ids):
result_ids.append(res['id']) result_ids.append(res['id'])
elif operator == 'in': elif operator == 'in':
for search_vals in args[i][2]: for search_vals in args[i][2]:
for res in results: for res in results:
if (res['type'] == search_vals) and (res['id'] not in result_ids): if (res['type'] == search_vals and
res['id'] not in result_ids):
result_ids.append(res['id']) result_ids.append(res['id'])
else: else:
continue continue