From 3d0c6d50d341c393890f54704543810563ea5eda Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sat, 03 Mar 2018 19:13:47 +0000
Subject: [PATCH] Bug mit relativen Pfaden entfernt

---
 src/java/de/uhilger/filecms/api/FileMgr.java |  100 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 82c5369..7046af4 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,9 +18,10 @@
 
 package de.uhilger.filecms.api;
 
+import de.uhilger.filecms.data.Bild;
 import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.web.Initialiser;
-import de.uhilger.wbx.Bild;
+import de.uhilger.filecms.pub.AbstractComparator;
+import de.uhilger.filecms.pub.FileNameComparator;
 import java.awt.Container;
 import java.awt.Image;
 import java.awt.MediaTracker;
@@ -35,6 +36,7 @@
 import java.io.Reader;
 import java.security.Principal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
@@ -45,8 +47,7 @@
 import org.apache.commons.io.FileUtils;
 
 /**
- *
- * @author ulrich
+ * Methoden zur Verwaltung von Dateien
  */
 public class FileMgr extends Api {
   private static final Logger logger = Logger.getLogger(FileMgr.class.getName());
@@ -70,44 +71,75 @@
    * @return 
    */
   public List<FileRef> list(String relPath) {
+    return listInt(relPath, "name", AbstractComparator.ORDER_ASC);
+  }
+  
+  public List<FileRef> listOrdered(String relPath, String orderBy, String order) {
+    return listInt(relPath, orderBy, order);
+  }
+  
+  /**
+   * Inhalte der WebBox listen. Hier wird nur der relative Pfad 
+   * ausgehend von www oder home ausgegeben sowie zudem ausgehend 
+   * von $daten und $basis, sofern der Benutzer die Rolle wbxAdmin hat.
+   * 
+   * Andere Inhalte werden nicht ausgegeben.
+   * 
+   * @param relPath
+   * @param orderBy 'name'
+   * @param order AbstractComparator.ORDER_ASC oder AbstractComparator.ORDER_DESC
+   * @return 
+   */
+  private List<FileRef> listInt(String relPath, String orderBy, String order) {
     Bild bild = new Bild();
     List<FileRef> files = new ArrayList();
-    if(relPath.length() == 0) {
-      FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
-      logger.finer(namedPublicFolder.getAbsolutePath());
-      FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true);
-      logger.finer(namedHomeFolder.getAbsolutePath());
-      files = new ArrayList();
-      files.add(namedHomeFolder);
-      files.add(namedPublicFolder);      
-      if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) {
-        FileRef namedBaseFolder = new FileRef(WBX_BASE, true);
-        FileRef namedDataFolder = new FileRef(WBX_DATA, true);
-        files.add(namedBaseFolder);
-        files.add(namedDataFolder);
-      }      
-    } else {
-      String path = getTargetDir(relPath).getAbsolutePath();
-      logger.fine("listing path: " + path);
-      File dir = new File(path);
-      if(dir.exists()) {
-        File[] fileArray = dir.listFiles();
-        for(int i = 0; i < fileArray.length; i++) {
-          logger.fine(fileArray[i].toURI().toString());
-          String fname = fileArray[i].toURI().toString().replace("file:/", "");
-          if(fileArray[i].isDirectory()) {
-            fname = fname.substring(0, fname.length() - 1);
+    if (!relPath.startsWith(".")) {
+      if (relPath.length() == 0) {
+        FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
+        logger.finer(namedPublicFolder.getAbsolutePath());
+        FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true);
+        logger.finer(namedHomeFolder.getAbsolutePath());
+        FileRef namedDavFolder = new FileRef(DAV_DIR_NAME, true);
+        logger.finer(namedDavFolder.getAbsolutePath());
+        files = new ArrayList();
+        files.add(namedHomeFolder);
+        files.add(namedPublicFolder);
+        files.add(namedDavFolder);
+        if (getRequest().isUserInRole(WBX_ADMIN_ROLE)) {
+          FileRef namedBaseFolder = new FileRef(WBX_BASE, true);
+          FileRef namedDataFolder = new FileRef(WBX_DATA, true);
+          files.add(namedBaseFolder);
+          files.add(namedDataFolder);
+        }
+      } else {
+        String path = getTargetDir(relPath).getAbsolutePath();
+        logger.fine("listing path: " + path);
+        File dir = new File(path);
+        if (dir.exists()) {
+          File[] fileArray = dir.listFiles();
+          if (orderBy != null && orderBy.equalsIgnoreCase("name")) {
+            Arrays.sort(fileArray, new FileNameComparator(order));
+          } else {
+            Arrays.sort(fileArray, new FileNameComparator(AbstractComparator.ORDER_ASC));
           }
-          logger.fine(fname);
-          FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
-          ref.setMimetype(bild.getMimeType(fileArray[i]));
-          files.add(ref);
+          for (int i = 0; i < fileArray.length; i++) {
+            logger.fine(fileArray[i].toURI().toString());
+            String fname = fileArray[i].toURI().toString().replace("file:/", "");
+            if (fileArray[i].isDirectory()) {
+              fname = fname.substring(0, fname.length() - 1);
+            }
+            logger.fine(fname);
+            FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
+            ref.setMimetype(bild.getMimeType(fileArray[i]));
+            files.add(ref);
+          }
         }
       }
-    }    
+    }
     return files;
   }
   
+  
   public FileRef newFolder(String relPath, String folderName) {
     logger.finer(relPath);
     String targetPath = null;

--
Gitblit v1.9.3