Merge branch 'master' of https://code.ffdn.org/franciliens.net/fcn-toolbox

Conflicts:
	conf/config.ini.example

conf/config.ini.example

@@ -10,7 +10,10 @@ user = sympa_user
 password = sympa_password
 host = localhost
 
-[reminder]
+[ac] # access control
+members_only_lists = members,admins,illuminati
+
+[reminder] # subscription reminders
 reminder0_min = -21
 reminder0_max = +14
 reminder1_min = +30

conf/fcn-report.format

@@ -10,7 +10,11 @@ Ces membres devraient être abonnés à la liste '{list}' :
 
 Ces membres devraient être désabonnés de la liste '{list}' : 
 
-{tounsubscribe}
+{removesubscribers}
+
+Ces modérateurs devraient être retirés de la liste '{list}' : 
+
+{removeeditors}
 
 Automatiquement,
 

fcn-report

@@ -25,6 +25,7 @@ args = parser.parse_args()
 config = configparser.RawConfigParser()
 config.sections()
 config.read(args.config)
+confac = config['ac']
 confdoli = config['dolibarr']
 confsympa = config['sympa']
 
@@ -71,8 +72,6 @@ sympaconn = psycopg2.connect(host=confsympa['host'], database=confsympa['databas
 sympaIns = sympa.Instance(sympaconn)
 list = 'adherents'
 francisubs = set(sympaIns.get_subscribers(list, confsympa['robot']))
-list2 = 'admin'
-adminsubs = set(sympaIns.get_subscribers(list2, confsympa['robot']))
 
 tosubscribe = set()
 for adh in adherents:
@@ -90,13 +89,14 @@ for sub in francisubs:
   else:
     tounsubscribe.add(sub)
 
-tounsubscribe2 = set()
-for sub in adminsubs:
-  if sub in adherents \
-      or (sub in radherents_alt and radherents_alt[sub] in adherents):
+editors = set(sympaIns.get_editors(list, confsympa['robot']))
+remeditors = set()
+for editor in editors:
+  if editor in adherents \
+      or (editor in radherents_alt and radherents_alt[editor] in adherents):
     pass
   else:
-    tounsubscribe2.add(sub)
+    remeditors.add(editor)
 
 reportFormat = open('/etc/fcntoolbox/fcn-report.format', 'r').read()
 
@@ -104,11 +104,12 @@ s = smtplib.SMTP('localhost')
 
 pp = pprint.PrettyPrinter()
 
-def sendReport(listname, tosubscribe, tounsubscribe):
+def sendReport(listname, tosubscribe, tounsubscribe, removeeditors):
   body = reportFormat.format(
     list = listname,
     tosubscribe = pp.pformat(tosubscribe),
-    tounsubscribe = pp.pformat(tounsubscribe))
+    removesubscribers = pp.pformat(tounsubscribe),
+    removeeditors = pp.pformat(removeeditors))
   msg = MIMEText(body)
   msg['Subject'] = "Rapport de la liste [%s]" % listname
   msg['From'] = confsympa['mail_from']
@@ -118,9 +119,30 @@ def sendReport(listname, tosubscribe, tounsubscribe):
   s.send_message(msg)
 
 if len(adherents) > 0 and (len(tosubscribe) > 0 or len(tounsubscribe) > 0) :
-  sendReport(list, tosubscribe, tounsubscribe)
-
-if len(adherents) > 0 and len(tounsubscribe2) > 0 :
-  sendReport(list2, {}, tounsubscribe2)
+  sendReport(list, tosubscribe, tounsubscribe, remeditors)
+
+molists = confac['members_only_lists'].split(',')
+for list in molists:
+  subs = set(sympaIns.get_subscribers(list, confsympa['robot']))
+
+  tounsubscribe = set()
+  for sub in subs:
+    if sub in adherents \
+        or (sub in radherents_alt and radherents_alt[sub] in adherents):
+      pass
+    else:
+      tounsubscribe.add(sub)
+
+  editors = set(sympaIns.get_editors(list, confsympa['robot']))
+  remeditors = set()
+  for editor in editors:
+    if editor in adherents \
+        or (editor in radherents_alt and radherents_alt[editor] in adherents):
+      pass
+    else:
+      remeditors.add(editor)
+
+  if len(adherents) > 0 and len(tounsubscribe) > 0 :
+    sendReport(list, {}, tounsubscribe, remeditors)
 
 s.quit()

fcntoolbox/sympa.py

@@ -8,6 +8,16 @@
 class Instance:
   def __init__(self, conn):
     self._conn = conn
+  def get_editors(self, list, robot):
+    """Get the list's moderators, aka editors"""
+    rows = ["editors_list"]
+    cur = self._conn.cursor()
+    cur.execute("""SELECT %s FROM list_table WHERE name_list LIKE %%s AND robot_list LIKE %%s""" % (",".join(rows)) , (list, robot))
+    editors = cur.fetchone()
+    if len(editors[0]) == 0:
+      return []
+    else:
+      return editors[0].split(',')
   def get_subscribers(self, list, robot):
     rows = ["user_subscriber", "list_subscriber"]
     cur = self._conn.cursor()