Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix sendreport script

This commit is contained in:
Enno Rehling 2019-01-20 02:48:14 +01:00
parent 0473d76f45
commit dda0fd9d27
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
process/getfaction.py Executable file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env python
import sys, re
from epasswd import EPasswd
if len(sys.argv)<4:
sys.exit(-2)
filename=sys.argv[1]
myfaction=sys.argv[2]
quiet=len(sys.argv)<=3
def log(str):
if not quiet:
print(str)
pw_data = EPasswd()
try:
pw_data.load_database(filename)
log("loaded from db " + filename)
except:
pw_data.load_file(filename)
log("loaded from file " + filename)
if pw_data.fac_exists(myfaction):
log("faction found: " + myfaction)
print(pw_data.get_email(myfaction))
sys.exit(0)
else:
log("faction missing: " + myfaction)
sys.exit(-1)

5
process/sendreport.sh
View File

@ -30,11 +30,12 @@ LOCKFILE="$ERESSEA/.report.lock"
echo "$(date):report:$GAME:$EMAIL:$FACTION:$PASSWD" >> "$ERESSEA/request.log"
cd "$ERESSEA" || exit
BIN="$ERESSEA/server/bin"
PWFILE="game-$GAME/eressea.db"
if [ ! -e "$PWFILE" ]; then
PWFILE="game-$GAME/passwd"
fi
checkpasswd.py "$PWFILE" "$FACTION" "$PASSWD" || reply "Das Passwort fuer die Partei $FACTION ist ungueltig"
$BIN/checkpasswd.py "$PWFILE" "$FACTION" "$PASSWD" || reply "Das Passwort fuer die Partei $FACTION ist ungueltig"
cd "$ERESSEA/game-$GAME/reports" || exit
if [ ! -e "${FACTION}.sh" ]; then
@ -45,7 +46,7 @@ fi
bash "${FACTION}.sh" "$EMAIL" || reply "Unbekannte Partei $FACTION"
OWNER=$(getfaction.py "$PWFILE" "$FACTION")
OWNER=$($BIN/getfaction.py "$PWFILE" "$FACTION")
if [ ! -z "$OWNER" ]; then
echo "Der Report Deiner Partei wurde an ${EMAIL} gesandt." \
| mutt -s "Reportnachforderung Partei ${FACTION}" "$OWNER"