From b12c95e1d53caed954314ed5e42f0e54730df5cd Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 03 Apr 2018 07:40:16 +0000 Subject: [PATCH] Dateiablage als JNDI-Parameter eingebaut --- src/java/de/uhilger/filecms/api/FileMgr.java | 38 +++++++++----------------------------- 1 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index fba0d22..2b8b985 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -90,7 +90,7 @@ private List<FileRef> listInt(String relPath, String orderBy, String order) { Bild bild = new Bild(); List<FileRef> files = new ArrayList(); - if (!relPath.startsWith(".")) { + if (!relPath.startsWith(".") && !relPath.contains("WEB-INF") && !relPath.contains("META-INF")) { if (relPath.length() == 0) { FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true); logger.finer(namedPublicFolder.getAbsolutePath()); @@ -126,9 +126,13 @@ 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); + if(!fname.contains("WEB-INF") && !fname.contains("META-INF")) { + long fLen = fileArray[i].length(); + long lastMod = fileArray[i].lastModified(); + FileRef ref = new FileRef(fname, fileArray[i].isDirectory(), fileArray[i].isHidden(), lastMod, fLen); + ref.setMimetype(bild.getMimeType(fileArray[i])); + files.add(ref); + } } } } @@ -395,36 +399,12 @@ Thumbnails.of(original) .size(bild.getVariantenGroesse(i), bild.getVariantenGroesse(i)) .keepAspectRatio(true) + .outputQuality(0.7) .toFile(newImgFile); } catch (IOException ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } } - /* - Image image = Toolkit.getDefaultToolkit().getImage(original.getAbsolutePath()); - MediaTracker mediaTracker = new MediaTracker(new Container()); - mediaTracker.addImage(image, 0); - try { - mediaTracker.waitForID(0); - - if (!mediaTracker.isErrorAny()) { - for (int i = 0; i < Bild.GR.length; i++) { - StringBuffer buf = new StringBuffer(); - buf.append(nurname); - buf.append(bild.getVariantenName(i)); - buf.append(ext); - 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), newImgFile.getAbsolutePath()); - //bild.writeImageFile(image, photo.getVariantenGroesse(i), photo.getMimetype(), photo.getAbsolutePath(basisPfad), photo.getVariantenName(basisPfad, i)); - } - } - } - } catch (IOException | InterruptedException ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - */ return "ok"; } else { return "Pfad micht erlaubt."; -- Gitblit v1.9.3