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

check for LF as line ending

Browse Source
This commit is contained in:
Peter Pfeufer 2021-05-17 09:49:33 +02:00
parent a99a375375
commit b47392ba7f
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
4 changed files with 401 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -16,3 +16,5 @@ repos:
exclude: \.(min\.css|min\.js|po|mo)$ exclude: \.(min\.css|min\.js|po|mo)$
- id: end-of-file-fixer - id: end-of-file-fixer
exclude: \.(min\.css|min\.js|po|mo)$ exclude: \.(min\.css|min\.js|po|mo)$
- id: mixed-line-ending
args: [ '--fix=lf' ]

540
allianceauth/services/modules/smf/manager.py
View File

@ -1,270 +1,270 @@
import random import random
import string import string
import calendar import calendar
from datetime import datetime from datetime import datetime
import hashlib import hashlib
import logging import logging
import re import re
from django.db import connections from django.db import connections
from django.conf import settings from django.conf import settings
from allianceauth.eveonline.models import EveCharacter from allianceauth.eveonline.models import EveCharacter
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
TABLE_PREFIX = getattr(settings, 'SMF_TABLE_PREFIX', 'smf_') TABLE_PREFIX = getattr(settings, 'SMF_TABLE_PREFIX', 'smf_')
class SmfManager: class SmfManager:
def __init__(self): def __init__(self):
pass pass
SQL_ADD_USER = r"INSERT INTO %smembers (member_name, passwd, email_address, date_registered, real_name," \ SQL_ADD_USER = r"INSERT INTO %smembers (member_name, passwd, email_address, date_registered, real_name," \
r" buddy_list, message_labels, openid_uri, signature, ignore_boards) " \ r" buddy_list, message_labels, openid_uri, signature, ignore_boards) " \
r"VALUES (%%s, %%s, %%s, %%s, %%s, 0, 0, 0, 0, 0)" % TABLE_PREFIX r"VALUES (%%s, %%s, %%s, %%s, %%s, 0, 0, 0, 0, 0)" % TABLE_PREFIX
SQL_DEL_USER = r"DELETE FROM %smembers where member_name = %%s" % TABLE_PREFIX SQL_DEL_USER = r"DELETE FROM %smembers where member_name = %%s" % TABLE_PREFIX
SQL_DIS_USER = r"UPDATE %smembers SET email_address = %%s, passwd = %%s WHERE member_name = %%s" % TABLE_PREFIX SQL_DIS_USER = r"UPDATE %smembers SET email_address = %%s, passwd = %%s WHERE member_name = %%s" % TABLE_PREFIX
SQL_USER_ID_FROM_USERNAME = r"SELECT id_member from %smembers WHERE member_name = %%s" % TABLE_PREFIX SQL_USER_ID_FROM_USERNAME = r"SELECT id_member from %smembers WHERE member_name = %%s" % TABLE_PREFIX
SQL_ADD_USER_GROUP = r"UPDATE %smembers SET additional_groups = %%s WHERE id_member = %%s" % TABLE_PREFIX SQL_ADD_USER_GROUP = r"UPDATE %smembers SET additional_groups = %%s WHERE id_member = %%s" % TABLE_PREFIX
SQL_GET_GROUP_ID = r"SELECT id_group from %smembergroups WHERE group_name = %%s" % TABLE_PREFIX SQL_GET_GROUP_ID = r"SELECT id_group from %smembergroups WHERE group_name = %%s" % TABLE_PREFIX
SQL_ADD_GROUP = r"INSERT INTO %smembergroups (group_name,description) VALUES (%%s,%%s)" % TABLE_PREFIX SQL_ADD_GROUP = r"INSERT INTO %smembergroups (group_name,description) VALUES (%%s,%%s)" % TABLE_PREFIX
SQL_UPDATE_USER_PASSWORD = r"UPDATE %smembers SET passwd = %%s WHERE member_name = %%s" % TABLE_PREFIX SQL_UPDATE_USER_PASSWORD = r"UPDATE %smembers SET passwd = %%s WHERE member_name = %%s" % TABLE_PREFIX
SQL_REMOVE_USER_GROUP = r"UPDATE %smembers SET additional_groups = %%s WHERE id_member = %%s" % TABLE_PREFIX SQL_REMOVE_USER_GROUP = r"UPDATE %smembers SET additional_groups = %%s WHERE id_member = %%s" % TABLE_PREFIX
SQL_GET_ALL_GROUPS = r"SELECT id_group, group_name FROM %smembergroups" % TABLE_PREFIX SQL_GET_ALL_GROUPS = r"SELECT id_group, group_name FROM %smembergroups" % TABLE_PREFIX
SQL_GET_USER_GROUPS = r"SELECT additional_groups FROM %smembers WHERE id_member = %%s" % TABLE_PREFIX SQL_GET_USER_GROUPS = r"SELECT additional_groups FROM %smembers WHERE id_member = %%s" % TABLE_PREFIX
SQL_ADD_USER_AVATAR = r"UPDATE %smembers SET avatar = %%s WHERE id_member = %%s" % TABLE_PREFIX SQL_ADD_USER_AVATAR = r"UPDATE %smembers SET avatar = %%s WHERE id_member = %%s" % TABLE_PREFIX
@staticmethod @staticmethod
def _sanitize_groupname(name): def _sanitize_groupname(name):
name = name.strip(' _') name = name.strip(' _')
return re.sub('[^\w.-]', '', name) return re.sub('[^\w.-]', '', name)
@staticmethod @staticmethod
def generate_random_pass(): def generate_random_pass():
return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)]) return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)])
@staticmethod @staticmethod
def gen_hash(username_clean, passwd): def gen_hash(username_clean, passwd):
return hashlib.sha1((username_clean + passwd).encode('utf-8')).hexdigest() return hashlib.sha1((username_clean + passwd).encode('utf-8')).hexdigest()
@staticmethod @staticmethod
def santatize_username(username): def santatize_username(username):
sanatized = username.replace(" ", "_") sanatized = username.replace(" ", "_")
sanatized = sanatized.replace("'", "_") sanatized = sanatized.replace("'", "_")
return sanatized.lower() return sanatized.lower()
@staticmethod @staticmethod
def get_current_utc_date(): def get_current_utc_date():
d = datetime.utcnow() d = datetime.utcnow()
unixtime = calendar.timegm(d.utctimetuple()) unixtime = calendar.timegm(d.utctimetuple())
return unixtime return unixtime
@classmethod @classmethod
def create_group(cls, groupname): def create_group(cls, groupname):
logger.debug("Creating smf group %s" % groupname) logger.debug("Creating smf group %s" % groupname)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_ADD_GROUP, [groupname, groupname]) cursor.execute(cls.SQL_ADD_GROUP, [groupname, groupname])
logger.info("Created smf group %s" % groupname) logger.info("Created smf group %s" % groupname)
return cls.get_group_id(groupname) return cls.get_group_id(groupname)
@classmethod @classmethod
def get_group_id(cls, groupname): def get_group_id(cls, groupname):
logger.debug("Getting smf group id for groupname %s" % groupname) logger.debug("Getting smf group id for groupname %s" % groupname)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_GET_GROUP_ID, [groupname]) cursor.execute(cls.SQL_GET_GROUP_ID, [groupname])
row = cursor.fetchone() row = cursor.fetchone()
logger.debug("Got smf group id %s for groupname %s" % (row[0], groupname)) logger.debug("Got smf group id %s for groupname %s" % (row[0], groupname))
return row[0] return row[0]
@classmethod @classmethod
def check_user(cls, username): def check_user(cls, username):
logger.debug("Checking smf username %s" % username) logger.debug("Checking smf username %s" % username)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_USER_ID_FROM_USERNAME, [cls.santatize_username(username)]) cursor.execute(cls.SQL_USER_ID_FROM_USERNAME, [cls.santatize_username(username)])
row = cursor.fetchone() row = cursor.fetchone()
if row: if row:
logger.debug("Found user %s on smf" % username) logger.debug("Found user %s on smf" % username)
return True return True
logger.debug("User %s not found on smf" % username) logger.debug("User %s not found on smf" % username)
return False return False
@classmethod @classmethod
def add_avatar(cls, member_name, characterid): def add_avatar(cls, member_name, characterid):
logger.debug("Adding EVE character id %s portrait as smf avatar for user %s" % (characterid, member_name)) logger.debug("Adding EVE character id %s portrait as smf avatar for user %s" % (characterid, member_name))
avatar_url = EveCharacter.generic_portrait_url(characterid, 64) avatar_url = EveCharacter.generic_portrait_url(characterid, 64)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
id_member = cls.get_user_id(member_name) id_member = cls.get_user_id(member_name)
cursor.execute(cls.SQL_ADD_USER_AVATAR, [avatar_url, id_member]) cursor.execute(cls.SQL_ADD_USER_AVATAR, [avatar_url, id_member])
@classmethod @classmethod
def get_user_id(cls, username): def get_user_id(cls, username):
logger.debug("Getting smf user id for username %s" % username) logger.debug("Getting smf user id for username %s" % username)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_USER_ID_FROM_USERNAME, [username]) cursor.execute(cls.SQL_USER_ID_FROM_USERNAME, [username])
row = cursor.fetchone() row = cursor.fetchone()
if row is not None: if row is not None:
logger.debug("Got smf user id %s for username %s" % (row[0], username)) logger.debug("Got smf user id %s for username %s" % (row[0], username))
return row[0] return row[0]
else: else:
logger.error("username %s not found on smf. Unable to determine user id ." % username) logger.error("username %s not found on smf. Unable to determine user id ." % username)
return None return None
@classmethod @classmethod
def get_all_groups(cls): def get_all_groups(cls):
logger.debug("Getting all smf groups.") logger.debug("Getting all smf groups.")
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_GET_ALL_GROUPS) cursor.execute(cls.SQL_GET_ALL_GROUPS)
rows = cursor.fetchall() rows = cursor.fetchall()
out = {} out = {}
for row in rows: for row in rows:
out[row[1]] = row[0] out[row[1]] = row[0]
logger.debug("Got smf groups %s" % out) logger.debug("Got smf groups %s" % out)
return out return out
@classmethod @classmethod
def get_user_groups(cls, userid): def get_user_groups(cls, userid):
logger.debug("Getting smf user id %s groups" % userid) logger.debug("Getting smf user id %s groups" % userid)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_GET_USER_GROUPS, [userid]) cursor.execute(cls.SQL_GET_USER_GROUPS, [userid])
out = [row[0] for row in cursor.fetchall()] out = [row[0] for row in cursor.fetchall()]
logger.debug("Got user %s smf groups %s" % (userid, out)) logger.debug("Got user %s smf groups %s" % (userid, out))
return out return out
@classmethod @classmethod
def add_user(cls, username, email_address, groups, characterid): def add_user(cls, username, email_address, groups, characterid):
logger.debug("Adding smf user with member_name %s, email_address %s, characterid %s" % ( logger.debug("Adding smf user with member_name %s, email_address %s, characterid %s" % (
username, email_address, characterid)) username, email_address, characterid))
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
username_clean = cls.santatize_username(username) username_clean = cls.santatize_username(username)
passwd = cls.generate_random_pass() passwd = cls.generate_random_pass()
pwhash = cls.gen_hash(username_clean, passwd) pwhash = cls.gen_hash(username_clean, passwd)
logger.debug("Proceeding to add smf user %s and pwhash starting with %s" % (username, pwhash[0:5])) logger.debug("Proceeding to add smf user %s and pwhash starting with %s" % (username, pwhash[0:5]))
register_date = cls.get_current_utc_date() register_date = cls.get_current_utc_date()
# check if the username was simply revoked # check if the username was simply revoked
if cls.check_user(username) is True: if cls.check_user(username) is True:
logger.warn("Unable to add smf user with username %s - already exists. Updating user instead." % username) logger.warn("Unable to add smf user with username %s - already exists. Updating user instead." % username)
cls.__update_user_info(username_clean, email_address, pwhash) cls.__update_user_info(username_clean, email_address, pwhash)
else: else:
try: try:
cursor.execute(cls.SQL_ADD_USER, cursor.execute(cls.SQL_ADD_USER,
[username_clean, passwd, email_address, register_date, username_clean]) [username_clean, passwd, email_address, register_date, username_clean])
cls.add_avatar(username_clean, characterid) cls.add_avatar(username_clean, characterid)
logger.info("Added smf member_name %s" % username_clean) logger.info("Added smf member_name %s" % username_clean)
cls.update_groups(username_clean, groups) cls.update_groups(username_clean, groups)
except: except:
logger.warn("Unable to add smf user %s" % username_clean) logger.warn("Unable to add smf user %s" % username_clean)
pass pass
return username_clean, passwd return username_clean, passwd
@classmethod @classmethod
def __update_user_info(cls, username, email_address, passwd): def __update_user_info(cls, username, email_address, passwd):
logger.debug( logger.debug(
"Updating smf user %s info: username %s password of length %s" % (username, email_address, len(passwd))) "Updating smf user %s info: username %s password of length %s" % (username, email_address, len(passwd)))
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
try: try:
cursor.execute(cls.SQL_DIS_USER, [email_address, passwd, username]) cursor.execute(cls.SQL_DIS_USER, [email_address, passwd, username])
logger.info("Updated smf user %s info" % username) logger.info("Updated smf user %s info" % username)
except: except:
logger.exception("Unable to update smf user %s info." % username) logger.exception("Unable to update smf user %s info." % username)
pass pass
@classmethod @classmethod
def delete_user(cls, username): def delete_user(cls, username):
logger.debug("Deleting smf user %s" % username) logger.debug("Deleting smf user %s" % username)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
if cls.check_user(username): if cls.check_user(username):
cursor.execute(cls.SQL_DEL_USER, [username]) cursor.execute(cls.SQL_DEL_USER, [username])
logger.info("Deleted smf user %s" % username) logger.info("Deleted smf user %s" % username)
return True return True
logger.error("Unable to delete smf user %s - user not found on smf." % username) logger.error("Unable to delete smf user %s - user not found on smf." % username)
return False return False
@classmethod @classmethod
def update_groups(cls, username, groups): def update_groups(cls, username, groups):
userid = cls.get_user_id(username) userid = cls.get_user_id(username)
logger.debug("Updating smf user %s with id %s groups %s" % (username, userid, groups)) logger.debug("Updating smf user %s with id %s groups %s" % (username, userid, groups))
if userid is not None: if userid is not None:
forum_groups = cls.get_all_groups() forum_groups = cls.get_all_groups()
user_groups = set(cls.get_user_groups(userid)) user_groups = set(cls.get_user_groups(userid))
act_groups = set([cls._sanitize_groupname(g) for g in groups]) act_groups = set([cls._sanitize_groupname(g) for g in groups])
addgroups = act_groups - user_groups addgroups = act_groups - user_groups
remgroups = user_groups - act_groups remgroups = user_groups - act_groups
logger.info("Updating smf user %s groups - adding %s, removing %s" % (username, addgroups, remgroups)) logger.info("Updating smf user %s groups - adding %s, removing %s" % (username, addgroups, remgroups))
act_group_id = set() act_group_id = set()
for g in addgroups: for g in addgroups:
if g not in forum_groups: if g not in forum_groups:
forum_groups[g] = cls.create_group(g) forum_groups[g] = cls.create_group(g)
act_group_id.add(str(cls.get_group_id(g))) act_group_id.add(str(cls.get_group_id(g)))
string_groups = ','.join(act_group_id) string_groups = ','.join(act_group_id)
cls.add_user_to_group(userid, string_groups) cls.add_user_to_group(userid, string_groups)
@classmethod @classmethod
def add_user_to_group(cls, userid, groupid): def add_user_to_group(cls, userid, groupid):
logger.debug("Adding smf user id %s to group id %s" % (userid, groupid)) logger.debug("Adding smf user id %s to group id %s" % (userid, groupid))
try: try:
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_ADD_USER_GROUP, [groupid, userid]) cursor.execute(cls.SQL_ADD_USER_GROUP, [groupid, userid])
logger.info("Added smf user id %s to group id %s" % (userid, groupid)) logger.info("Added smf user id %s to group id %s" % (userid, groupid))
except: except:
logger.exception("Unable to add smf user id %s to group id %s" % (userid, groupid)) logger.exception("Unable to add smf user id %s to group id %s" % (userid, groupid))
pass pass
@classmethod @classmethod
def remove_user_from_group(cls, userid, groupid): def remove_user_from_group(cls, userid, groupid):
logger.debug("Removing smf user id %s from group id %s" % (userid, groupid)) logger.debug("Removing smf user id %s from group id %s" % (userid, groupid))
try: try:
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
cursor.execute(cls.SQL_REMOVE_USER_GROUP, [groupid, userid]) cursor.execute(cls.SQL_REMOVE_USER_GROUP, [groupid, userid])
logger.info("Removed smf user id %s from group id %s" % (userid, groupid)) logger.info("Removed smf user id %s from group id %s" % (userid, groupid))
except: except:
logger.exception("Unable to remove smf user id %s from group id %s" % (userid, groupid)) logger.exception("Unable to remove smf user id %s from group id %s" % (userid, groupid))
pass pass
@classmethod @classmethod
def disable_user(cls, username): def disable_user(cls, username):
logger.debug("Disabling smf user %s" % username) logger.debug("Disabling smf user %s" % username)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
password = cls.generate_random_pass() password = cls.generate_random_pass()
revoke_email = "revoked@localhost" revoke_email = "revoked@localhost"
try: try:
pwhash = cls.gen_hash(username, password) pwhash = cls.gen_hash(username, password)
cursor.execute(cls.SQL_DIS_USER, [revoke_email, pwhash, username]) cursor.execute(cls.SQL_DIS_USER, [revoke_email, pwhash, username])
cls.get_user_id(username) cls.get_user_id(username)
cls.update_groups(username, []) cls.update_groups(username, [])
logger.info("Disabled smf user %s" % username) logger.info("Disabled smf user %s" % username)
return True return True
except TypeError: except TypeError:
logger.exception("TypeError occured while disabling user %s - failed to disable." % username) logger.exception("TypeError occured while disabling user %s - failed to disable." % username)
return False return False
@classmethod @classmethod
def update_user_password(cls, username, characterid, password=None): def update_user_password(cls, username, characterid, password=None):
logger.debug("Updating smf user %s password" % username) logger.debug("Updating smf user %s password" % username)
cursor = connections['smf'].cursor() cursor = connections['smf'].cursor()
if not password: if not password:
password = cls.generate_random_pass() password = cls.generate_random_pass()
if cls.check_user(username): if cls.check_user(username):
username_clean = cls.santatize_username(username) username_clean = cls.santatize_username(username)
pwhash = cls.gen_hash(username_clean, password) pwhash = cls.gen_hash(username_clean, password)
logger.debug( logger.debug(
"Proceeding to update smf user %s password with pwhash starting with %s" % (username, pwhash[0:5])) "Proceeding to update smf user %s password with pwhash starting with %s" % (username, pwhash[0:5]))
cursor.execute(cls.SQL_UPDATE_USER_PASSWORD, [pwhash, username]) cursor.execute(cls.SQL_UPDATE_USER_PASSWORD, [pwhash, username])
cls.add_avatar(username, characterid) cls.add_avatar(username, characterid)
logger.info("Updated smf user %s password." % username) logger.info("Updated smf user %s password." % username)
return password return password
logger.error("Unable to update smf user %s password - user not found on smf." % username) logger.error("Unable to update smf user %s password - user not found on smf." % username)
return "" return ""

186
allianceauth/timerboard/form.py
View File

@ -1,93 +1,93 @@
import logging import logging
import datetime import datetime
from django import forms from django import forms
from django.utils import timezone from django.utils import timezone
from django.core.validators import MaxValueValidator, MinValueValidator from django.core.validators import MaxValueValidator, MinValueValidator
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from .models import Timer from .models import Timer
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class TimerForm(forms.ModelForm): class TimerForm(forms.ModelForm):
class Meta: class Meta:
model = Timer model = Timer
fields = ('details', 'system', 'planet_moon', 'structure', 'objective', 'important', 'corp_timer') fields = ('details', 'system', 'planet_moon', 'structure', 'objective', 'important', 'corp_timer')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.user = kwargs.pop('user', None) self.user = kwargs.pop('user', None)
if 'instance' in kwargs and kwargs['instance'] is not None: if 'instance' in kwargs and kwargs['instance'] is not None:
# Do conversion from db datetime to days/hours/minutes # Do conversion from db datetime to days/hours/minutes
# for appropriate fields # for appropriate fields
current_time = timezone.now() current_time = timezone.now()
td = kwargs['instance'].eve_time - current_time td = kwargs['instance'].eve_time - current_time
initial = kwargs.pop('initial', dict()) initial = kwargs.pop('initial', dict())
if 'days_left' not in initial: if 'days_left' not in initial:
initial.update({'days_left': td.days}) initial.update({'days_left': td.days})
if 'hours_left' not in initial: if 'hours_left' not in initial:
initial.update({'hours_left': td.seconds // 3600}) initial.update({'hours_left': td.seconds // 3600})
if 'minutes_left' not in initial: if 'minutes_left' not in initial:
initial.update({'minutes_left': td.seconds // 60 % 60}) initial.update({'minutes_left': td.seconds // 60 % 60})
kwargs.update({'initial': initial}) kwargs.update({'initial': initial})
super(TimerForm, self).__init__(*args, **kwargs) super(TimerForm, self).__init__(*args, **kwargs)
structure_choices = [('POCO', 'POCO'), structure_choices = [('POCO', 'POCO'),
('I-HUB', 'I-HUB'), ('I-HUB', 'I-HUB'),
('TCU', 'TCU'), ('TCU', 'TCU'),
('POS[S]', 'POS[S]'), ('POS[S]', 'POS[S]'),
('POS[M]', 'POS[M]'), ('POS[M]', 'POS[M]'),
('POS[L]', 'POS[L]'), ('POS[L]', 'POS[L]'),
('Astrahus', 'Astrahus'), ('Astrahus', 'Astrahus'),
('Fortizar', 'Fortizar'), ('Fortizar', 'Fortizar'),
('Keepstar', 'Keepstar'), ('Keepstar', 'Keepstar'),
('Raitaru', 'Raitaru'), ('Raitaru', 'Raitaru'),
('Azbel', 'Azbel'), ('Azbel', 'Azbel'),
('Sotiyo', 'Sotiyo'), ('Sotiyo', 'Sotiyo'),
('Athanor', 'Athanor'), ('Athanor', 'Athanor'),
('Tatara', 'Tatara'), ('Tatara', 'Tatara'),
('Pharolux Cyno Beacon', 'Pharolux Cyno Beacon'), ('Pharolux Cyno Beacon', 'Pharolux Cyno Beacon'),
('Tenebrex Cyno Jammer', 'Tenebrex Cyno Jammer'), ('Tenebrex Cyno Jammer', 'Tenebrex Cyno Jammer'),
('Ansiblex Jump Gate', 'Ansiblex Jump Gate'), ('Ansiblex Jump Gate', 'Ansiblex Jump Gate'),
('Moon Mining Cycle', 'Moon Mining Cycle'), ('Moon Mining Cycle', 'Moon Mining Cycle'),
(_('Other'), _('Other'))] (_('Other'), _('Other'))]
objective_choices = [('Friendly', _('Friendly')), objective_choices = [('Friendly', _('Friendly')),
('Hostile', _('Hostile')), ('Hostile', _('Hostile')),
('Neutral', _('Neutral'))] ('Neutral', _('Neutral'))]
details = forms.CharField(max_length=254, required=True, label=_('Details')) details = forms.CharField(max_length=254, required=True, label=_('Details'))
system = forms.CharField(max_length=254, required=True, label=_("System")) system = forms.CharField(max_length=254, required=True, label=_("System"))
planet_moon = forms.CharField(max_length=254, label=_("Planet/Moon"), required=False, initial="") planet_moon = forms.CharField(max_length=254, label=_("Planet/Moon"), required=False, initial="")
structure = forms.ChoiceField(choices=structure_choices, required=True, label=_("Structure Type")) structure = forms.ChoiceField(choices=structure_choices, required=True, label=_("Structure Type"))
objective = forms.ChoiceField(choices=objective_choices, required=True, label=_("Objective")) objective = forms.ChoiceField(choices=objective_choices, required=True, label=_("Objective"))
days_left = forms.IntegerField(required=True, label=_("Days Remaining"), validators=[MinValueValidator(0)]) days_left = forms.IntegerField(required=True, label=_("Days Remaining"), validators=[MinValueValidator(0)])
hours_left = forms.IntegerField(required=True, label=_("Hours Remaining"), hours_left = forms.IntegerField(required=True, label=_("Hours Remaining"),
validators=[MinValueValidator(0), MaxValueValidator(23)]) validators=[MinValueValidator(0), MaxValueValidator(23)])
minutes_left = forms.IntegerField(required=True, label=_("Minutes Remaining"), minutes_left = forms.IntegerField(required=True, label=_("Minutes Remaining"),
validators=[MinValueValidator(0), MaxValueValidator(59)]) validators=[MinValueValidator(0), MaxValueValidator(59)])
important = forms.BooleanField(label=_("Important"), required=False) important = forms.BooleanField(label=_("Important"), required=False)
corp_timer = forms.BooleanField(label=_("Corp-Restricted"), required=False) corp_timer = forms.BooleanField(label=_("Corp-Restricted"), required=False)
def save(self, commit=True): def save(self, commit=True):
timer = super(TimerForm, self).save(commit=False) timer = super(TimerForm, self).save(commit=False)
# Get character # Get character
character = self.user.profile.main_character character = self.user.profile.main_character
corporation = character.corporation corporation = character.corporation
logger.debug("Determined timer save request on behalf " logger.debug("Determined timer save request on behalf "
"of character {} corporation {}".format(character, corporation)) "of character {} corporation {}".format(character, corporation))
# calculate future time # calculate future time
future_time = datetime.timedelta(days=self.cleaned_data['days_left'], hours=self.cleaned_data['hours_left'], future_time = datetime.timedelta(days=self.cleaned_data['days_left'], hours=self.cleaned_data['hours_left'],
minutes=self.cleaned_data['minutes_left']) minutes=self.cleaned_data['minutes_left'])
current_time = timezone.now() current_time = timezone.now()
eve_time = current_time + future_time eve_time = current_time + future_time
logger.debug( logger.debug(
"Determined timer eve time is %s - current time %s, adding %s" % (eve_time, current_time, future_time)) "Determined timer eve time is %s - current time %s, adding %s" % (eve_time, current_time, future_time))
timer.eve_time = eve_time timer.eve_time = eve_time
timer.eve_character = character timer.eve_character = character
timer.eve_corp = corporation timer.eve_corp = corporation
timer.user = self.user timer.user = self.user
if commit: if commit:
timer.save() timer.save()
return timer return timer

72
docs/make.bat
View File

@ -1,36 +1,36 @@
@ECHO OFF @ECHO OFF
pushd %~dp0 pushd %~dp0
REM Command file for Sphinx documentation REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" ( if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build set SPHINXBUILD=sphinx-build
) )
set SOURCEDIR=. set SOURCEDIR=.
set BUILDDIR=_build set BUILDDIR=_build
set SPHINXPROJ=AllianceAuth set SPHINXPROJ=AllianceAuth
if "%1" == "" goto help if "%1" == "" goto help
%SPHINXBUILD% >NUL 2>NUL %SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 ( if errorlevel 9009 (
echo. echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.http://sphinx-doc.org/
exit /b 1 exit /b 1
) )
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
goto end goto end
:help :help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
:end :end
popd popd