cobricks-cvscommit

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalRequest.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5749

Modified Files:
	PortalRequest.java 
Log Message:


Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PortalRequest.java	1 Oct 2004 13:27:12 -0000	1.10
+++ PortalRequest.java	30 Oct 2004 13:47:20 -0000	1.11
@@ -242,18 +242,20 @@
         if (tmps != null) lang = tmps;
         if (request.getParameter("lang")!=null)
             lang = request.getParameter("lang");
-        pos = pageName.lastIndexOf(".");
-        // page.html.XX
-        if (pos > pageName.length()-2) {
-            lang = pageName.substring(pageName.length()-2);
-            pageName = pageName.substring(0, pageName.length()-3);
-        }
-        // page.XX.html
-        else if (pos > 2 && pageName.substring(pos-3, pos-2).equals(".")) {
-            lang = pageName.substring(pos-2, pos);
-            pageName = pageName.substring(0, pos-3) + pageName.substring(pos);
+        if (!pageName.endsWith(".xml")) {
+            pos = pageName.lastIndexOf(".");
+            // page.html.XX
+            if (pos > pageName.length()-2) {
+                lang = pageName.substring(pageName.length()-2);
+                pageName = pageName.substring(0, pageName.length()-3);
+            }
+            // page.XX.html
+            else if (pos > 2 && pageName.substring(pos-3, pos-2).equals(".")) {
+                lang = pageName.substring(pos-2, pos);
+                pageName = pageName.substring(0, pos-3) + pageName.substring(pos);
+            }
+            if (lang.length()>2) lang = lang.substring(0,2);
         }
-        if (lang.length()>2) lang = lang.substring(0,2);
 
         velocityContext.put("pagePath", pagePath);
         velocityContext.put("pageName", pageName);

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalRequest.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31069

Modified Files:
	PortalRequest.java 
Log Message:
Fixed problem with referer information across platforms.


Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- PortalRequest.java	4 Jan 2005 16:37:55 -0000	1.12
+++ PortalRequest.java	3 Mar 2005 16:32:17 -0000	1.13
@@ -202,7 +202,14 @@
                 pos = referer.indexOf("/", pos+2);
                 int pos2 = referer.lastIndexOf("/");
                 if (pos>-1 && pos2 > pos) {
-                    tmppath = referer.substring(pos, pos2);
+		    // check if referer is from same server
+		    String requestURL = request.getRequestURI();
+		    if (requestURL.length()>pos) {
+			requestURL = requestURL.substring(0, pos);
+			if (referer.startsWith(requestURL)) {
+                            tmppath = referer.substring(pos, pos2);
+                        }
+                    }
                 }
             }
         }

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalRequest.java

[Alexander G. <gaf...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19881/src/org/cobricks/portal

Modified Files:
	PortalRequest.java 
Log Message:
getLinkAbbviations added

Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PortalRequest.java	5 Aug 2005 11:25:49 -0000	1.14
+++ PortalRequest.java	31 Jan 2006 19:57:22 -0000	1.15
@@ -14,6 +14,7 @@
 
 import java.io.*;
 import java.util.*;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
@@ -21,6 +22,7 @@
 import org.apache.velocity.VelocityContext;
 
 import org.cobricks.core.util.LogUtil;
+import org.cobricks.portal.wiki.Utility;
 
 
 /**
@@ -439,4 +441,13 @@
         return request.getParameter(aname);
     }
 
+    /**
+     * Get the link abbreviations which are stored in the file "properties.txt"
+     * in "org.cobricks.portal"
+     * @return Map with the link abbreviations and the whole link.
+     */
+    public Map getLinkAbbreviations() {
+        return Utility.getLinkAbbreviations();
+    }
+
 }

[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalRequest.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18781

Modified Files:
	PortalRequest.java 
Log Message:


Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- PortalRequest.java	31 Jan 2006 19:57:22 -0000	1.15
+++ PortalRequest.java	17 May 2006 10:14:07 -0000	1.16
@@ -14,17 +14,14 @@
 
 import java.io.*;
 import java.util.*;
-
 import javax.servlet.*;
 import javax.servlet.http.*;
-
 import org.apache.log4j.*;
 import org.apache.velocity.VelocityContext;
 
 import org.cobricks.core.util.LogUtil;
 import org.cobricks.portal.wiki.Utility;
 
-
 /**
  * Class for objects representing HTTP requests to the portal.
  * In the object the main parameters of the request are stored.