piratebox-mirror/PirateBoxScripts_Webserver
2
1
Fork 0
mirror of https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git synced 2023-12-14 07:22:58 +01:00
Code Issues Releases Wiki Activity

Try to add a configuration variable

Browse source 
to enable the use of client timestamps in the chat window. Doesn't work
yet.
This commit is contained in:
Tobias Trumm 2014-08-04 21:46:17 +02:00
parent d308a46c32
commit 1256c62c38
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
piratebox/piratebox/bin/generate_config_files.sh
View file

@ -145,6 +145,7 @@ generate_lighttpd_env() {
local SHOUTBOX_GEN_HTMLFILE=$4
local PIRATEBOX=$5
local SHOUTBOX_CHATFILE=$6
local SHOUTBOX_CLIENT_TIMESTAMP=$7
echo "Generating Environment-config for lighttpd ....."
@ -157,6 +158,7 @@ generate_lighttpd_env() {
\"PYTHONPATH\" => \"$PYTHONPATH:$PIRATEBOX/python_lib\",
\"SHOUTBOX_GEN_HTMLFILE\" => \"$SHOUTBOX_GEN_HTMLFILE\" ,
\"SHOUTBOX_CHATFILE\" => \"$SHOUTBOX_CHATFILE\" ,
\"SHOUTBOX_CLIENT_TIMESTAMP\" => \"$SHOUTBOX_CLIENT_TIMESTAMP\" ,
$LIGHTTPD_ENV_BR_LINE
)"
@ -197,7 +199,7 @@ if [ "$IPV6_ENABLE" = "yes" ] ; then
fi
generate_hosts $HOST $IP $IPV6
generate_dnsmasq $NET $IP_SHORT $START_LEASE $END_LEASE $LEASE_DURATION $DNSMASQ_INTERFACE
generate_lighttpd_env $GLOBAL_CHAT "$GLOBAL_DEST" $PIRATEBOX_PYTHONPATH $GEN_CHATFILE $PIRATEBOX_FOLDER $CHATFILE
generate_lighttpd_env $GLOBAL_CHAT "$GLOBAL_DEST" $PIRATEBOX_PYTHONPATH $GEN_CHATFILE $PIRATEBOX_FOLDER $CHATFILE $SHOUTBOX_CLIENT_TIMESTAMP
COMPLETE_HOST=$HOST

1
piratebox/piratebox/bin/shoutbox_stuff.sh
View file

@ -18,6 +18,7 @@ cd python_lib
export SHOUTBOX_CHATFILE=$CHATFILE
export SHOUTBOX_GEN_HTMLFILE=$GEN_CHATFILE
export SHOUTBOX_CLIENT_TIMESTAMP=$SHOUTBOX_CLIENT_TIMESTAMP
#Writing init-message and reset chat..

2
piratebox/piratebox/conf/piratebox.conf
View file

@ -145,6 +145,8 @@ RESET_CHAT="yes"
# to make clear, that the box is not working anymore.
SHOUTBOX_ENABLED="yes"
SHOUTBOX_CLIENT_TIMESTAMP="no"
#Inititiation Chat-Message
### This option was removed, you can find the chat message in conf/chat_init.txt

6
piratebox/piratebox/python_lib/psogen.py
View file

@ -12,6 +12,7 @@ import messages, broadcast
datafilename = os.environ["SHOUTBOX_CHATFILE"]
htmlfilename = os.environ["SHOUTBOX_GEN_HTMLFILE"]
clienttimestamp =os.environ["SHOUTBOX_CLIENT_TIMESTAMP"]
try:
raw_dest = os.environ["SHOUTBOX_BROADCAST_DESTINATIONS"]
@ -112,7 +113,10 @@ def writeToDisk ( content ):
def prepare_line ( name, indata, color , timestamp ):
datapass = re.sub("<", "&lt;", indata)
data = re.sub(">", "&gt;", datapass)
curdate = datetime.datetime.fromtimestamp(timestamp)
if clienttimestamp == 'yes':
curdate = datetime.datetime.fromtimestamp(timestamp)
else:
curdate = datetime.datetime.now()
# Trying to make it look like this:
# <div class="message">
# <date>00:00:00</date> <name>Nickname:</name> <data class="def">Lorem ipsum dolor sit amet</data>