midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept patch [2788801] MAttachementEntry.java patch 

Thanks to Muhammad Faisal Shahzad (ro2)
This commit is contained in:
Carlos Ruiz 2009-05-08 15:18:09 +00:00
parent fa69ebfcef
commit 73efd701fd
5 changed files with 307 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JasperReports/src/org/compiere/report/ReportStarter.java
View File

@ -603,7 +603,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
MAttachmentEntry[] entries = attachment.getEntries(); MAttachmentEntry[] entries = attachment.getEntries();
for(int i = 0; i < entries.length; i++) { for(int i = 0; i < entries.length; i++) {
if (!entries[i].getName().equals(name) && if (!entries[i].getName().equals(name) &&
(entries[i].getName().endsWith(".jrxml") || entries[i].getName().endsWith(".jasper"))) { (entries[i].getName().toLowerCase().endsWith(".jrxml") || entries[i].getName().toLowerCase().endsWith(".jasper"))) {
File reportFile = getAttachmentEntryFile(entries[i]); File reportFile = getAttachmentEntryFile(entries[i]);
if (reportFile != null) if (reportFile != null)
subreports.add(reportFile); subreports.add(reportFile);

6
base/src/org/adempiere/process/PrepareMigrationScripts.java
View File

@ -1,4 +1,4 @@
/********************************************************************** /***********************************************************************
* This file is part of Adempiere ERP Bazaar * * This file is part of Adempiere ERP Bazaar *
* http://www.adempiere.org * * http://www.adempiere.org *
* * * *
@ -25,7 +25,7 @@
* * * *
* Sponsors: * * Sponsors: *
* - Company (http://www.faire.com.br) * * - Company (http://www.faire.com.br) *
***********************************************************************/ **********************************************************************/
package org.adempiere.process; package org.adempiere.process;
@ -67,7 +67,7 @@ public class PrepareMigrationScripts extends SvrProcess {
FilenameFilter filter = new FilenameFilter() { FilenameFilter filter = new FilenameFilter() {
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
return name.endsWith(".sql"); return name.toLowerCase().endsWith(".sql");
} }
}; };
dirList = dir.listFiles(filter); dirList = dir.listFiles(filter);

9
base/src/org/compiere/model/MAttachmentEntry.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -260,16 +260,17 @@ public class MAttachmentEntry
*/ */
public boolean isPDF() public boolean isPDF()
{ {
return m_name.endsWith(".pdf"); return m_name.toLowerCase().endsWith(".pdf");
} // isPDF } // isPDF
/** /**
* Isattachment entry a Graphic * Is attachment entry a Graphic
* @return true if *.gif, *.jpg, *.png * @return true if *.gif, *.jpg, *.png
*/ */
public boolean isGraphic() public boolean isGraphic()
{ {
return m_name.endsWith(".gif") || m_name.endsWith(".jpg") || m_name.endsWith(".png"); String m_lowname = m_name.toLowerCase();
return m_lowname.endsWith(".gif") || m_lowname.endsWith(".jpg") || m_lowname.endsWith(".png");
} // isGraphic } // isGraphic

2
posterita/posterita/src/main/org/posterita/struts/pos/GetReportAction.java
View File

@ -54,7 +54,7 @@ public class GetReportAction extends POSAction
String mimeType = null; String mimeType = null;
if(reportName.endsWith(".csv")) if(reportName.toLowerCase().endsWith(".csv"))
{ {
mimeType = "text/comma-separated-values"; mimeType = "text/comma-separated-values";
} }

8
serverApps/src/main/servlet/org/compiere/www/WFilter.java
View File

@ -139,10 +139,12 @@ public final class WFilter implements javax.servlet.Filter
// Get URI // Get URI
String uri = ""; String uri = "";
String urilow = "";
if (request instanceof HttpServletRequest) if (request instanceof HttpServletRequest)
{ {
HttpServletRequest req = (HttpServletRequest)request; HttpServletRequest req = (HttpServletRequest)request;
uri = req.getRequestURI(); uri = req.getRequestURI();
urilow = uri.toLowerCase();
} }
@ -171,9 +173,9 @@ public final class WFilter implements javax.servlet.Filter
else else
pass = false; pass = false;
else if (!uri.startsWith(WebEnv.DIR_BASE) // not requesting /adempiere/... else if (!uri.startsWith(WebEnv.DIR_BASE) // not requesting /adempiere/...
|| uri.endsWith(".gif") || uri.endsWith(".jpg") || uri.endsWith(".png") || urilow.endsWith(".gif") || urilow.endsWith(".jpg") || urilow.endsWith(".png")
|| uri.endsWith(".html") || uri.endsWith(".css") || urilow.endsWith(".html") || urilow.endsWith(".css")
|| uri.endsWith(".js")) || urilow.endsWith(".js"))
check = false; check = false;
else else
; ;