Changeset 1425 for HelpIM3

Timestamp:

02/27/11 22:02:09 (15 months ago)

Author:

winfried

Message:

- fixing bug showing escaped javascript code in chat queue
- fixing bug with messed up chatqueue

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/chat/db/services.py (modified) (3 diffs)
• HelpIM/chat/pages/ShowRequestOnQueue.py (modified) (1 diff)
• config/sites/full.xml (modified) (1 diff)

HelpIM3/branches/chatgroups/HelpIM/chat/db/services.py

@@ -208 +208 @@
         
         now = datetime.now()
-        maxAge = timedelta(seconds=(chatQueueLength))
+        maxAge = timedelta(seconds=chatQueueLength)
         minimum_lastChatClientActivityTime = now - maxAge
         chatQueueEntryList = site.getChatQueueEntryList(site, minimum_lastChatClientActivityTime=minimum_lastChatClientActivityTime)
@@ -224 +224 @@
         """ - Toevoegen/Bijwerken van het SessionId.        """
         now = datetime.now()
-        maxAge = timedelta(seconds=(chatQueueLength))
+        maxAge = timedelta(seconds=chatQueueLength)
         minimum_lastChatClientActivityTime = now - maxAge
         chatQueueEntry = site.getChatQueueBySessionId(site=site, sessionId=him_request.sessionId)
@@ -234 +234 @@
             """ if the careseeker has been away too long, he/she has to re-enter the queue s""" 
             if chatQueueEntry.chat_queue_lastChatClientActivityTime < minimum_lastChatClientActivityTime:
+                self.log.debug(".getChatQueuePostion updating chatQueueEntry, chat_queue_lastChatClientActivityTime: %s, minimum_lastChatClientActivityTime: %s" % (chatQueueEntry.chat_queue_lastChatClientActivityTime, minimum_lastChatClientActivityTime))
                 chatQueueEntry.chat_queue_time_entered = datetime.now()
             chatQueueEntry.chat_queue_lastChatClientActivityTime = datetime.now()

HelpIM3/branches/chatgroups/HelpIM/chat/pages/ShowRequestOnQueue.py

@@ -36 +36 @@
                        <p><a href="javascript:window.location.replace('%(location)s');">Klik hier als de verbinding verbroken lijkt te zijn.</a></p>
                     """ % {'line': line, 'location': replaceLocation}
+        #setTimeout = "<script><!-- setTimeout('window.location.replace(\"%s\")',10000); // --></script>" % replaceLocation
+        setTimeout = "<script>setTimeout('window.location.replace(\"%s\")',10000);</script>" % replaceLocation
+        html_code += setTimeout
+
         htmlCode = {  'htmlCode': [ html_code ] }
-        self.panel_data = {  'panel_data': [  [ htmlCode ] ] 
+
+        onloadScript = {  'onloadScript': [ setTimeout ] }
+
+        self.panel_data = {  'panel_data': [  [ htmlCode, onloadScript ] ] 
                       }
         
         
-        setTimeout = "<script><!-- setTimeout('window.location.replace(\"%s\")',10000); // --></script>" % replaceLocation
-        onloadScript = {  'onloadScript': [ setTimeout ] }
         
         
-        htmlCode = {  'htmlCode': [ ] }
+        # htmlCode = {  'htmlCode': [ ] }
         
         web_panel = {  'web_panel': [  {  'panelName' : 'Wachtrij' },
-                                         [ htmlCode, onloadScript ]
+#                                         [ htmlCode, onloadScript ]
+                                         [ htmlCode ]
                                       ] 
                       }

HelpIM3/branches/chatgroups/config/sites/full.xml

@@ -21 +21 @@
         cs_subject_id="2"
         cs_nickname_id="1"
-        chatQueueLength="10"
+        chatQueueLength="120"
         maxChats="1">
+  <!-- Note: chatQueueLength is the timeout in seconds before kicking out of the queue!! -->
+