From cccd2bf52b77a8b7b17357093a5bfd3092d29a7a Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sun, 12 Mar 2017 10:48:35 +0000
Subject: [PATCH] Persoenlicher Ordner heisst jetzt Persoenlich
---
src/java/de/uhilger/filecms/api/FileMgr.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 3e1073c..73b7c0b 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -49,7 +49,8 @@
public static final String PUB_DIR_PATH = "www/";
public static final String HOME_DIR_PATH = "home/";
public static final String PUB_DIR_NAME = "Oeffentlich";
- public static final String HOME_DIR_NAME = "Persoenlicher Ordner";
+ //public static final String HOME_DIR_NAME = "Persoenlicher Ordner";
+ public static final String HOME_DIR_NAME = "Persoenlich";
public static final int OP_COPY = 1;
public static final int OP_MOVE = 2;
@@ -59,6 +60,7 @@
}
public List<FileRef> list(String relPath) {
+ Bild bild = new Bild();
List<FileRef> files = new ArrayList();
if(relPath.length() == 0) {
FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
@@ -81,7 +83,9 @@
fname = fname.substring(0, fname.length() - 1);
}
logger.fine(fname);
- files.add(new FileRef(fname, fileArray[i].isDirectory()));
+ FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
+ ref.setMimetype(bild.getMimeType(fileArray[i]));
+ files.add(ref);
}
}
}
@@ -333,7 +337,7 @@
File newImgFile = new File(dir, buf.toString());
if(!newImgFile.exists()) {
logger.fine(original.getAbsolutePath() + " " + newImgFile.getAbsolutePath());
- bild.writeImageFile(image, bild.getVariantenGroesse(i), bild.getMimeType(original), original.getAbsolutePath(), newImgFile.getAbsolutePath());
+ bild.writeImageFile(image, bild.getVariantenGroesse(i), bild.getMimeType(original), newImgFile.getAbsolutePath());
//bild.writeImageFile(image, photo.getVariantenGroesse(i), photo.getMimetype(), photo.getAbsolutePath(basisPfad), photo.getVariantenName(basisPfad, i));
}
}
--
Gitblit v1.9.3