Changeset 9fc4d8797d8b9f3e36c7d5871eda34d7fa44f1f4

Timestamp:

05/12/08 16:18:28 (2 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1210601908 +0200

git-parent:

[5dc487d6f8fa08760e5156f406bf9475a1f8ce56]

git-author:

Christopher Jung <bktheg@web.de> 1210601908 +0200

Message:

[feature] Es wird nun eine Java-Session aufgebaut und ueber Requests hinweg erhalten

Files:

• src/net/driftingsouls/ds2/server/framework/pipeline/HttpRequest.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/framework/pipeline/HttpResponse.java (modified) (3 diffs)
• templates/comm.html (modified) (1 diff)
• templates/links.html (modified) (1 diff)
• templates/main.html (modified) (3 diffs)

src/net/driftingsouls/ds2/server/framework/pipeline/HttpRequest.java

@@ -54 +54 @@
-        public HttpRequest(HttpServletRequest request) {
-                this.request = request;
+                
+                if( request.getSession(false) == null ) {
+                        request.getSession(true);
+                }
-                
-                // Standard-Encoding ist UTF-8

src/net/driftingsouls/ds2/server/framework/pipeline/HttpResponse.java

@@ -22 +22 @@
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletResponse;
@@ -118 +120 @@
-                                        OutputStreamWriter writer = new OutputStreamWriter(response.getOutputStream(), charSet);
-                                        if( content.length() > 0 ) {
-content.toString
+prepareContentForSend
-                                        }
-                                        writer.flush();
@@ -136 +138 @@
-                }
-        }
+        
+        private static final Pattern[] URL_PATTERNS = new Pattern[] {
+                Pattern.compile("href\\=\"([^\"]*)\""),
+                Pattern.compile("src\\=\"([^\"]*)\""),
+                Pattern.compile("action\\=\"([^\"]*)\"")
+        };
+        
+        private String prepareContentForSend() {
+                String str = this.content.toString();
+                
+                for( int i=0; i < URL_PATTERNS.length; i++ ) {
+                        str = encodeUrlsWithPattern(str, URL_PATTERNS[i]);
+                }
+                
+                return str;
+        }
+
+        private String encodeUrlsWithPattern(String str, Pattern pattern) {
+                Matcher matcher = pattern.matcher(str);
+                
+                int offset = 0;
+                while( matcher.find() ) {
+                        String group = matcher.group(1);
+                        
+                        if( !group.equals("#") && !group.startsWith("http://") && 
+                                        !group.startsWith("javascript") && !group.contains("(") && 
+                                        !group.contains(")") ) {
+                                int oldlength = str.length();
+                                str = str.substring(0,matcher.start(1)+offset)+
+                                        this.response.encodeURL(group)+
+                                        str.substring(matcher.end(1)+offset);
+                                
+                                offset += str.length() - oldlength;
+                        }
+                }
+                return str;
+        }
-
-        public void setContent(String content) {

templates/comm.html

@@ -208 +208 @@
-                        $("inbox_waiter").style.display = "block";
-                        
-'./ajax'
+location.href
-                        // Oh ich liebe das toooolle caching vom *piep* ie
-                        var params = 'module={global.module}&sess={global.sess}&action=move&ordner={ordner.parent}&moveto='+ordnerid+"&pm_"+pmid+"="+pmid+"&antiiecachingtimestamp="+(new Date().getTime());

templates/links.html

@@ -75 +75 @@
-
-        function checkPMStatus() {
-'./ajax'
+location.href
-                var params = 'module={global.module}&sess={global.sess}&action=hasNewPm';
-                

templates/main.html

@@ -21 +21 @@
-
-        function checkPMStatus() {
-'./ajax'
+location.href
-                var params = 'module={global.module}&sess={global.sess}&action=hasNewPm';
-
+
-                var myAjax = new Ajax.Request( url, {
-                                method: 'get', 
@@ -75 +75 @@
-                        $('helpboxtext').innerHTML = '';
-                        
-"./ajax"
+location.href
-                                method: 'get', 
-                                parameters: 'module={global.module}&sess={global.sess}&action=getHelpText&page='+currentModule, 
@@ -96 +96 @@
-                        var cmd = $('adminConsoleCommand').value;
-                        $('adminConsoleResponse').innerHTML = '';
-"./ajax"
+location.href
-                                method: 'get', 
-                                parameters: 'module=admin&sess={global.sess}&action=ajax&namedplugin=net.driftingsouls.ds2.server.modules.admin.AdminConsole&responseOnly=1&cmd='+encodeURIComponent(cmd),