DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

csrf

This commit is contained in:
Holger Trampe 2020-05-19 22:03:29 +02:00
parent d8dc365b03
commit 712532a117
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
chat/templates/chat/chat_content.html
View File

@ -98,15 +98,7 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
function scrollDown(){
//$('#chatmessages').animate({scrollTop: $('#chatmessages').prop("scrollHeight")}, 500);
}
$(document).ready(function(){ $(document).ready(function(){
$('#chatcontentcomplete').scrollTop( $('#chatcontentcomplete').height()*200 ) $('#chatcontentcomplete').scrollTop( $('#chatcontentcomplete').height()*200 )
}); });
@ -127,9 +119,6 @@ $(document).ready(function(){
chatwebsocket = new WebSocket(ws_string+window.location.host+"/ws/chat/{{roomdata.creator.pk}}/{{roomdata.chatmember_single.pk}}/") chatwebsocket = new WebSocket(ws_string+window.location.host+"/ws/chat/{{roomdata.creator.pk}}/{{roomdata.chatmember_single.pk}}/")
} }
chatwebsocket.onmessage = function(e) { chatwebsocket.onmessage = function(e) {
datainfo = e["data"].split("__"); datainfo = e["data"].split("__");
if(datainfo[0] == "starttyping") if(datainfo[0] == "starttyping")
@ -183,24 +172,28 @@ $(document).ready(function(){
}) })
function sendNewMessage(){ function sendNewMessage()
$.ajax( {
if($("#message").val().length > 0)
{ {
type: "GET", $.ajax(
url: "{% url 'chat:chat-ajax' %}", {
data : { type: "GET",
action : "addnewmessage", url: "{% url 'chat:chat-ajax' %}",
new_chat_userid : userownid, data : {
message : $("#message").val(), action : "addnewmessage",
room : {{roomdata.pk}} new_chat_userid : userownid,
}, message : $("#message").val(),
success: function( data ) room : {{roomdata.pk}}
{ },
$("#message").val(""); success: function( data )
chatwebsocket.send("load__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}"); {
chatwebsocket.send("stoptyping__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}"); $("#message").val("");
} chatwebsocket.send("load__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}");
}); chatwebsocket.send("stoptyping__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}");
}
});
}
} }

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

1
digitaleagentur/settings.py
View File

@ -61,6 +61,7 @@ X_FRAME_OPTIONS = 'SAMEORIGIN'
SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', '127.0.0.1', 'localhost', 'dev01.digitale-agentur.com', '10.0.2.2'] ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', '127.0.0.1', 'localhost', 'dev01.digitale-agentur.com', '10.0.2.2']
CSRF_TRUSTED_ORIGINS = ['127.0.0.1', 'localhost']
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [