Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from R4stl1n/master

Browse Source 
pull
This commit is contained in:
orbitroom 2015-01-08 07:56:44 -05:00
commit f523c2e52a
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
services/views.py
View File

@ -24,6 +24,8 @@ from forms import JabberBroadcastForm
from forms import FleetFormatterForm from forms import FleetFormatterForm
from util import check_if_user_has_permission from util import check_if_user_has_permission
import threading
@login_required @login_required
def fleet_formatter_view(request): def fleet_formatter_view(request):
@ -50,6 +52,18 @@ def fleet_formatter_view(request):
return render_to_response('registered/fleetformattertool.html', context, context_instance=RequestContext(request)) return render_to_response('registered/fleetformattertool.html', context, context_instance=RequestContext(request))
class xmppThread (threading.Thread):
def __init__(self, threadID, name, counter, group, message,):
threading.Thread.__init__(self)
self.threadID = threadID
self.name = name
self.counter = counter
self.group = group
self.message = message
def run(self):
print "Starting " + self.name
OpenfireManager.send_broadcast_message(self.group, self.message)
print "Exiting " + self.name
@login_required @login_required
@permission_required('auth.jabber_broadcast') @permission_required('auth.jabber_broadcast')
@ -61,14 +75,19 @@ def jabber_broadcast_view(request):
user_info = AuthServicesInfo.objects.get(user=request.user) user_info = AuthServicesInfo.objects.get(user=request.user)
main_char = EveCharacter.objects.get(character_id=user_info.main_char_id) main_char = EveCharacter.objects.get(character_id=user_info.main_char_id)
if user_info.main_char_id != "": if user_info.main_char_id != "":
OpenfireManager.send_broadcast_message(form.cleaned_data['group'], form.cleaned_data[ message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + main_char.character_name + " TO: " + form.cleaned_data['group'] + " #####\n##### Replies are NOT monitored #####\n"
'message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + main_char.character_name + " TO: " + group_to_send = form.cleaned_data['group']
form.cleaned_data[
'group'] + " #####\n##### Replies are NOT monitored #####\n") broadcast_thread = xmppThread(1, "XMPP Broadcast Thread", 1, group_to_send, message_to_send)
broadcast_thread.start()
else: else:
OpenfireManager.send_broadcast_message(form.cleaned_data['group'], form.cleaned_data[ message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "No character but can send pings?" + " TO: " + form.cleaned_data['group'] + " #####\n##### Replies are NOT monitored #####\n"
'message'] + "\n##### SENT BY: " + "No character but can send pings?" + " TO: " + form.cleaned_data[ group_to_send = form.cleaned_data['group']
'group'] + " #####\n##### Replies are NOT monitored #####\n")
broadcast_thread = xmppThread(1, "XMPP Broadcast Thread", 1, group_to_send, message_to_send)
broadcast_thread.start()
success = True success = True
else: else:
form = JabberBroadcastForm() form = JabberBroadcastForm()

2
templates/registered/corpstats.html
View File

@ -25,7 +25,7 @@
<p>Ticker: {{ corp.corporation_ticker }}</p> <p>Ticker: {{ corp.corporation_ticker }}</p>
<p>Memeber: {{ corp.member_count }}</p> <p>Member: {{ corp.member_count }}</p>
<p>Total Authed Members: {{ currentCount }}</p> <p>Total Authed Members: {{ currentCount }}</p>
</div> </div>