nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-23 14:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into redesign-v2

Browse Source
This commit is contained in:
Andrew Williams
2011-11-27 22:28:07 +00:00
parent 9a26bfd235 362c4c31cd
commit 1bf5099dab
8 changed files with 176 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/sso/services/jabber/__init__.py
View File

@@ -15,7 +15,8 @@ class JabberService(BaseService):
'jabber_xmlrpc_url': 'http://127.0.0.1:4560',
'jabber_announce_from': 'announcebot@pleaseignore.com',
'jabber_announce_password': 'pepperllama',
'jabber_announce_endpoint': 'http://127.0.0.1:5281/message'}
'jabber_announce_endpoint': 'http://127.0.0.1:5281/message',
'jabber_announce_servers': ['pleaseignore.com'] }
def exec_xmlrpc(self, func, **kwargs):
""" Send a XMLRPC request """
@@ -161,23 +162,24 @@ class JabberService(BaseService):
return resp.read().strip()[:2] == 'OK'
def announce(self, server, message, subject=None, users=[], groups=[]):
def announce(self, server, message, subject=None, users=[], groups=[], servers=[]):
if 'all' in groups:
dest = ['%s/announce/all-hosts/online' % server]
else:
dest = []
dest = []
if len(servers):
if 'all' in servers:
dest = ['%s/announce/all-hosts/online' % self.settings['jabber_server']]
else:
dest = ['%s/announce/online' % server for server in servers]
if len(users):
for u in set(users):
dest.append(u)
if len(users):
for u in set(users):
dest.append(u)
elif len(groups):
for g in groups:
dest.extend([x for x in self.get_group_members(server, g)])
dest = set(dest)
if len(groups):
for g in groups:
dest.extend([x for x in self.get_group_members(server, g)])
dest = set(dest)
if len(dest):
return self.send_message(dest, message, subject)
return False