[Jboss-svn-commits] JBL Code SVN: r978 - in trunk/forge/portal-extensions: forge-file-access/src/java/org/jboss/forge/fileaccess forge-prj-freezone/src/java/org/jboss/forge/projects/freezone

[<jbo...@li...>]

Author: ral...@jb...
Date: 2005-08-26 13:14:14 -0400 (Fri, 26 Aug 2005)
New Revision: 978

Modified:
   trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
   trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
images fixed

Modified: trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java	2005-08-26 17:03:45 UTC (rev 977)
+++ trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java	2005-08-26 17:14:14 UTC (rev 978)
@@ -51,6 +51,11 @@
      */
     private final static String DOCS_ACCESS = "/docs/";
     /**
+     * <code>FREEZONE_ACCESS</code> - another directory from which files are
+     * enabled to download.
+     */
+    private final static String FREEZONE_ACCESS = "/freezone/";
+    /**
      * <code>BUF_SIZE</code> - size of a buffer, which is used while reading a
      * file and sending it to the client.
      */
@@ -82,7 +87,8 @@
 
         if ((toCheck.indexOf(IMAGES_ACCESS) != -1)
                 || (toCheck.indexOf(DOWNLOADS_ACCESS) != -1)
-                || (toCheck.indexOf(DOCS_ACCESS) != -1)) {
+                || (toCheck.indexOf(DOCS_ACCESS) != -1)
+                || (toCheck.indexOf(FREEZONE_ACCESS) != -1)) {
             // Allowing access to images, downloads and docs
         } else
             // Not images, nor downloads - wrong request.

Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-08-26 17:03:45 UTC (rev 977)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-08-26 17:14:14 UTC (rev 978)
@@ -94,8 +94,8 @@
     
 //  modifies path to page/resource so folder structure can be supported
     private  String modifyPath(String path, String element) {
-        System.out.println("element is: "+ element);
-        System.out.println("path is: "+ path);
+       // System.out.println("element is: "+ element);
+       // System.out.println("path is: "+ path);
         int start, end;
         String mainPath = "";
         
@@ -106,7 +106,7 @@
         }
         else {
             mainPath = path.substring(0, pre);
-            System.out.println("main path is: " + mainPath);
+          //  System.out.println("main path is: " + mainPath);
         }//main path to page
         
             
@@ -181,6 +181,11 @@
             {
                 pageContent = forgeHelper.replace(pageContent,"HREF=", "href=");
              }
+            
+            while(pageContent.indexOf("<IMG SRC=")!= -1)
+            {
+                pageContent = forgeHelper.replace(pageContent,"<IMG SRC=", "<img src=");
+             }
 
 //          Replacing links
             while ((nextRef = findNextReference(pageContent, "link")) != null) {
@@ -203,8 +208,10 @@
             String imagePrepend = "/file-access/" + portalName + "/"
                     + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/";
             while ((nextRef = findNextReference(pageContent, "image")) != null)
+            {
+                nextRef2 = modifyPath(pagePath, nextRef);
                 pageContent = forgeHelper.replace(pageContent, "<img src="+'"'
-                        + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"');
+                        + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');}
             
             //fix back internal links
             while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)