diff --git a/authentication/views.py b/authentication/views.py index 5dc123ac..2e1ce349 100644 --- a/authentication/views.py +++ b/authentication/views.py @@ -40,6 +40,7 @@ def login_user(request): def logout_user(request): logger.debug("logout_user called by user %s" % request.user) + logoutUser = request.user logout(request) - logger.info("Successful logout for user %s" % request.user) + logger.info("Successful logout for user %s" % logoutUser) return HttpResponseRedirect("/") diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 8a6c1c2e..02c89dd2 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -490,8 +490,6 @@ def run_api_refresh(): logger.info("User %s main character id %s missing model. Clearning main character." % (user, authserviceinfo.main_char_id)) authserviceinfo.main_char_id = '' authserviceinfo.save() - else: - logger.warn("User %s has no main character id, unable to validate membership.") set_state(user) diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py index 6d5f1964..1f17bd73 100644 --- a/services/managers/eve_api_manager.py +++ b/services/managers/eve_api_manager.py @@ -287,11 +287,11 @@ class EveApiManager(): def validate_member_api(api_id, api_key): if settings.MEMBER_API_ACCOUNT: if EveApiManager.check_api_is_type_account(api_id, api_key) is not True: - logger.debug("Api id %s is not type account as required for members - failed validation." % api_id) + logger.info("Api id %s is not type account as required for members - failed validation." % api_id) return False if EveApiManager.check_api_is_full(api_id, api_key) is not True: - logger.debug("Api id %s does not meet member access mask requirements - failed validation." % api_id) + logger.info("Api id %s does not meet member access mask requirements - failed validation." % api_id) return False return True @@ -299,9 +299,9 @@ class EveApiManager(): def validate_blue_api(api_id, api_key): if settings.BLUE_API_ACCOUNT: if EveApiManager.check_api_is_type_account(api_id, api_key) is not True: - logger.debug("Api id %s is not type account as required for blues - failed validation." % api_id) + logger.info("Api id %s is not type account as required for blues - failed validation." % api_id) return False if EveApiManager.check_blue_api_is_full(api_id, api_key) is not True: - logger.debug("Api id %s does not meet minimum blue access mask requirements - failed validation." % api_id) + logger.info("Api id %s does not meet minimum blue access mask requirements - failed validation." % api_id) return False return True diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 1ffe7046..bb38aa37 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -47,7 +47,7 @@ class Phpbb3Manager: @staticmethod def __add_avatar(username, characterid): logger.debug("Adding EVE character id %s portrait as phpbb avater for user %s" % (characterid, username)) - avatar_url = "http://image.eveonline.com/Character/" + characterid + "_64.jpg" + avatar_url = "https://image.eveonline.com/Character/" + characterid + "_64.jpg" cursor = connections['phpbb3'].cursor() userid = Phpbb3Manager.__get_user_id(username) cursor.execute(Phpbb3Manager.SQL_ADD_USER_AVATAR, [avatar_url, userid]) diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index 1bc86067..d4959fe3 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -279,13 +279,11 @@ class Teamspeak3Manager: if user_ts_groups[user_ts_group_key] not in ts_groups.values(): remgroups.append(user_ts_groups[user_ts_group_key]) - logger.info("Finished checking user id %s TS3 groups - adding %s, removing %s." % (userid, addgroups, remgroups)) - for g in addgroups: - logger.debug("Issuing add command for group %s" % g) + logger.info("Adding Teamspeak user %s into group %s" % (userid, g)) Teamspeak3Manager._add_user_to_group(userid, g) for g in remgroups: - logger.debug("Issuing remove command for group %s" % g) + logger.info("Removing Teamspeak user %s from group %s" % (userid, g)) Teamspeak3Manager._remove_user_from_group(userid, g) diff --git a/sigtracker/form.py b/sigtracker/form.py index accb7cce..108a5954 100644 --- a/sigtracker/form.py +++ b/sigtracker/form.py @@ -5,8 +5,12 @@ from django.core.validators import MaxValueValidator, MinValueValidator class SignatureForm(forms.Form): sigtype = [('Wormhole', 'Wormhole'), ('Combat', 'Combat'), ('Data', 'Data'), - ('Relic', 'Relic')] - status = [('Open', 'Open'), ('Started', 'Started'), ('Finished', 'Finished')] + ('Relic', 'Relic'), ('Gas', 'Gas'), ('Ore', 'Ore')] + status = [('Open', 'Open'), ('Started', 'Started'), ('Finished', 'Finished'), ('Life cycle has not begun', 'Life cycle has not begun'), + ('Probably wont last another day', 'Probably wont last another day'), ('End of its natural lifetime', 'End of its natural lifetime'), + ('stability not significantly disrupted', 'stability not significantly disrupted'), + ('Stability reduced not critical degree yet', 'Stability reduced not critical degree yet'), + ('Wormhole stability critically disrupted', 'Wormhole stability critically disrupted')] system = forms.CharField(max_length=254, required=True, label='System') ident = forms.CharField(max_length=254, required=True, label="ID") diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html index 7529f890..708f3996 100644 --- a/stock/templates/registered/corputils.html +++ b/stock/templates/registered/corputils.html @@ -1,187 +1,187 @@ -{% extends "public/base.html" %} -{% load bootstrap %} -{% load staticfiles %} - -{% block title %}Alliance Auth{% endblock %} -{% block page_title %}Corporation Member Tracking{% endblock page_title %} - -{% block content %} - -
-

Corporation Member Data

- {% if perms.auth.corputils %} -
- {% if corp %} -
-
-
-
Corporation
-
-
- -
-
-

{{ corp.corporation_name }}

- -

Ticker: {{ corp.corporation_ticker }}

- -

Member count: {{ corp.member_count }}

- -

Player count: {{characters_with_api|length}}

- -

Unregistered characters: {{characters_without_api|length}}

-
-
- API Index: -
-
- {{characters_with_api|length}}/{{ corp.member_count }} -
-
-
-
-
-
-
- - -
-
- {% if characters_with_api %} -
-
- - - - - - - - - {% for maincharname, player in characters_with_api %} - - - - - - - - {% endfor %} -
Main characterMain corporationCharacter listKillboard
- - -

{{ maincharname }}

- 		- {% if not corp.corporation_name == player.maincorp%} - - {{ player.maincorp }} - - {% else %} - - {{ player.maincorp }} - - {% endif %} - - {% for char in player.altlist %} -

{{ char.character_name }}

- {% endfor %} - 		- {% for char in player.altlist %} -

Killboard

- {% endfor %} -
-
-
- {% else %} - - {% endif %} -
-
- {% if characters_without_api %} -
-
- - - - - - - {% for character_name, character_id in characters_without_api %} - - - - - - {% endfor %} -
CharacterKillboard
- - -

{{ character_name }}

- 		- Killboard -
-
-
- {% else %} - - {% endif %} -
-
- {% else %} -
-
-
- -
-
-
-
- {% endif %} -
- {% else %} - {% if IS_CORP %} - - {% else %} - - {% endif %} - {% endif %} - -{% endblock content %} +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} +{% block page_title %}Corporation Member Tracking{% endblock page_title %} + +{% block content %} + +
+

Corporation Member Data

+ {% if perms.auth.corputils %} +
+ {% if corp %} +
+
+
+
Corporation
+
+
+ +
+
+

{{ corp.corporation_name }}

+ +

Ticker: {{ corp.corporation_ticker }}

+ +

Member count: {{ corp.member_count }}

+ +

Player count: {{characters_with_api|length}}

+ +

Unregistered characters: {{characters_without_api|length}}

+
+
+ API Index: +
+
+ {{characters_with_api|length}}/{{ corp.member_count }} +
+
+
+
+
+
+
+ + +
+
+ {% if characters_with_api %} +
+
+ + + + + + + + + {% for maincharname, player in characters_with_api %} + + + + + + + + {% endfor %} +
Main characterMain corporationCharacter listKillboard
+ + +

{{ maincharname }}

+ 		+ {% if not corp.corporation_name == player.maincorp%} + + {{ player.maincorp }} + + {% else %} + + {{ player.maincorp }} + + {% endif %} + + {% for char in player.altlist %} +

{{ char.character_name }}

+ {% endfor %} + 		+ {% for char in player.altlist %} +

Killboard

+ {% endfor %} +
+
+
+ {% else %} + + {% endif %} +
+
+ {% if characters_without_api %} +
+
+ + + + + + + {% for character_name, character_id in characters_without_api %} + + + + + + {% endfor %} +
CharacterKillboard
+ + +

{{ character_name }}

+ 		+ Killboard +
+
+
+ {% else %} + + {% endif %} +
+
+ {% else %} +
+
+
+ +
+
+
+
+ {% endif %} +
+ {% else %} + {% if IS_CORP %} + + {% else %} + + {% endif %} + {% endif %} + +{% endblock content %}