Commit Graph
2421 Commits
Author SHA1 Message Date
Hans Bakker 6a4d119dff upgrade fop 0.94 -> 0.95
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746645 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 07:59:30 +00:00
David E. Jones 2471cffc96 Addressed more issues with output encoding, based on feedback from Michele Orru in OFBIZ-1959 plus looking for other similar problems in code, and some random testing around; this should catch quite a bit more stuff as there were various places in the form, menu, tree and screen widgets that needed output encoding for data to be presented to the user through a browser; also a few cleanups here and there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746409 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 23:00:36 +00:00
David E. Jones 368d99fa2d Changed the canonicalization and encoding to not use the CSS and JavaScript codecs, especially for canonicalization they cause problems with backslashes in strings which we generally want to allow and which generally isn't used in webapp input strings and I don't think we interpret such encodings anywhere so there is no danger nor utility for it; this better resolves the filename/etc problem reported by Jacques, so his temporary fix is now gone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746292 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:47:31 +00:00
Jacques Le Roux 246090c0a6 BigDecimal in POS (complete). Integration of ofbiz-1945.patch changes (with some modifications) but still not used since it miss some features:
* AutoSave (automatically save current transaction)
* Add a saved sale to the current sale
* Remove a savec sale
* Replace current sale by a saved sale and remove simultaneously the saved sale

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745257 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:16:33 +00:00
Jacques Le Roux 36dc3600c3 Indicate clearly the status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745025 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 12:49:22 +00:00
David E. Jones f27b4eeaaa No functional changes, just reorganizing code: moved email services from content to the framework/common component except the CommunicationEvent related ones which are now in the party component along with other CommunicationEvent resources; changed framework components so that webapp no longer depends on common and common is higher level than the various tool components which was an odd dependency before; one new thing is in here and that is an entity called EmailTemplateSetting which is meant to be a generic version of the ProductStoreEmailSetting entity so we can have configurable email templates without depending on ProductStore, still need to write the service to send email from this (sendMailFromTemplateSetting)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744727 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:34:49 +00:00
Jacques Le Roux 56ce285fc5 This enforces probability
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744657 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 11:48:36 +00:00
Jacques Le Roux 4eacbb164a This allows to use Windows paths from input fields (like from Entity import for instance)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 10:53:16 +00:00
Jacques Le Roux d5dc2d53ab Marco's LabelReferences2.patch from "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744635 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 08:42:06 +00:00
David E. Jones b4c3b96da5 Fixed issue reported by Ashish Nagar where the condition was checking for the same character twice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744420 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:23:13 +00:00
David E. Jones 1a5c2de3c5 Changed LoginWorker.makeLoginUrl back to returning a String and implemented a more general solution for the @ofbizUrl and @ofbizContentUrl tags so that they do decoding and are now tolerant of encoded URLs just in case it happens; this should be a more general fix and avoid the problem more; also a few cleanups like resolving warnings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:17:05 +00:00
David E. Jones 80b9e4e2cc Changed LRUMap.get to be synchronized to hopefully resolve issue reported by Philippe Mouawad in Jira #OFBIZ-2186; comments in code discuss why this is needed; get is ONLY synchronized for the LRUMap, and not for caches where there is no size limit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744205 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 18:25:50 +00:00
Adrian Crum 86b75fa340 Oops, I meant to clean up this code before committing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743440 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:22:19 +00:00
Adrian Crum 8db1e5be50 Added util:urlExists(String url) function to the UEL functions. This should be helpful for testing if a file exists before trying using it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743436 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:19:11 +00:00
Jacques Le Roux e46e3c34e4 A patch from Marco Ruocco "Error using the UtilDateTime.addDaysToTimestamp method" (https://issues.apache.org/jira/browse/OFBIZ-2177) - OFBIZ-2177
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742933 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 10:47:01 +00:00
David E. Jones 0b71effc99 Added new shorter method to StringUtil called wrapString for getting a StringWrapper; added shared variable for StringUtil that is always there in FTL files so when string wrapping is needed one can just use StringUtil.wrapString(); added examples of this for the ProductPromo.promoText field in ecommerce; also set services for that field to allow safe html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742442 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 12:20:55 +00:00
David E. Jones 5d8d243a26 A simple StringWrapper object that can be used to get around the general HTML auto-encoding now done in FTL rendered through the Screen Widget; just call the static method to wrap it and it will insert fine and the encoder will leave it alone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742412 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 11:55:07 +00:00
David E. Jones 09825430f1 Added new allow-html tag on the attribute, auto-attribute, and override elements; has 3 options: none, safe, and any; the comments in the XSD file describe what each of these do; the important thing to know is that none is the default meaning no html is allowed; if html is needed use safe and look at the antisamy-esapi.xml file to see policy details; in extreme trust cases use any where any html is allowed; note that many services need updating which should allow at least safe html, and it may take some time to discover all of those and get them handled; please send in issues and requests for service attributes that should allow safe html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742352 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 09:34:34 +00:00
David E. Jones ebd5c3e78f Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00
Jacques Le Roux b2e544ef31 Fix a cut/paste typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741900 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 14:18:52 +00:00
David E. Jones cea6620fbd Added general usage of ESAPI HTML and XML encoding for the form widget; removed the old partially implemented use of the StringEscapeUtils stuff; includes attribute on the form field element called encode-output that is true by default so if HTML encoding is not desired then must be set to false
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741857 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 08:56:19 +00:00
David E. Jones 8cee12a983 Added license header for ASL and note about BSD
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741755 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 22:04:40 +00:00
David E. Jones 49db5c858f Added basic ESAPI.properties file for the owasp esapi library, based on default with the ones I don't think we'll use commented out
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741743 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 21:38:26 +00:00
David E. Jones 574d610ccf Small update to use OWASP ESAPI Encoder instead of java.net.URLEncoder for parameter strings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741496 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 09:40:37 +00:00
David E. Jones 57dcf34bcd Some refactoring of canonicalize feature, also change ServiceEventHandler to use UtilHttp stuff for parameters so this and other things take effect there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741478 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 09:05:50 +00:00
David E. Jones 71a1ed6b95 All incoming parameters used through these parameter maps (which should be, but currently isn't, all use of parameters) will now go through the ESAPI canonicalize process
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741466 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 08:20:58 +00:00
David E. Jones 0b2e7e05c5 Added owasp esapi library, uses of it soon to come
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741442 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 07:02:59 +00:00
David E. Jones 4d9382e887 Cleanup and pretty-up a bunch of log statements; moved some less helpful ones to verbose, combined some, and generally tried to make logs in various places more user friendly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741424 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:04:58 +00:00
David E. Jones afe3dc9c81 A few related changes:
Big refactor of ControlServlet, RequestManager, RequestHandler, and ConfigXMLReader so that simple objects are used instead of Maps within Maps within Maps for the data from the controller.xml file, which results in eliminating hundreds of lines of code including the entire RequestHandler class. I have tested this a lot with different apps that use the ControlServlet differently, but this is a very big change so there could still be issues. Based on this cleanup future issues and new features should be easier and less error prone, and that is why doing it now in order to help with a number of other improvements and bug fixes that are part of this commit.

Also added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues wd in and also going to the same page after login from auth=true or from clicking on the login link.

Related to cleaning up login URLs also changed how the request and parameters passed to a request before a login are saved and used after a login is successful so that it URL parameters go on the URL in a redirect to the original request to make it more transparent, and non-URL parameters just stay in the session and are used when the original request is run again to avoid putting sensitive information like passwords and big information like textarea data in the URL, which has been a problem before.

To see what some of these things combined can do try going to the example app, login, click on the New Example link, then logout in another tab or window, then go back to the New Example page and enter a name and a whole bunch of text in the long description then click Create, the system will show you the login page so enter username/password, and then after login you'll see a nice URL to EditExample with the correct exampleId parameter and all of the data entered before login successfully saved and never appearing in a URL.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741374 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:14:19 +00:00
Jacques Le Roux 5abb9596cb LabelsInfo14.patch from Marco "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
+ some correct changes done with this update of Labels Manager (I updated some wrong ones by hand to keep going forward...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739955 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 10:17:34 +00:00
Adrian Crum 2d25c4e591 Fixed a bug where the property name wasn't being returned when the property wasn't found - reported on dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739786 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:55:09 +00:00
Jacopo Cappellato 4eeaa929bb Modified two FreeMarkerWorker methods to return the Environment object; no functional change, but this mode is required by the upcoming new screen renderer based on Freemarker macros.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739785 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:54:53 +00:00
Jacques Le Roux 2cd3740648 A slightly modified patch from Karim Rahimpur "Localized values are not retrieved from LocalizedMaps (through BasicVariableMapper)" '(https://issues.apache.org/jira/browse/OFBIZ-2148) - OFBIZ-2148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738870 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 14:50:45 +00:00
Jacques Le Roux 0d9b46d1b9 Modified LabelsInfo11.patch from Marco Risaliti "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737382 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 15:35:14 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
David E. Jones 40981c7f0c Added new themes directory with Bruno's bluelight theme as a first one to OOTB; this directory is like hot-deploy in that all components dropped in will be loaded, and ONLY themes should go in this directory
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736892 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 02:28:49 +00:00
Adrian Crum a3b3ad07ad Trivial JavaDoc fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735182 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 23:20:30 +00:00
David E. Jones c4602119e7 Changed screen, form, menu and tree widget actions and conditions to be consistent with simple-method cleanups, includes XSD and java changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733436 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 09:19:34 +00:00
Adrian Crum ddf29482dc Updated JUEL library to 2.1.1 RC1 - the version that contains the changes we need.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732622 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 06:32:11 +00:00
Adrian Crum fcffc8771a Fixed a problem where the BSH interpreter was throwing exceptions on a variable that had periods in its name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732173 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:38:47 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Jacques Le Roux 35897cab0c Upgrade Freemarker jar from 2.3.10 to 2.3.15 (downloaded from http://downloads.sourceforge.net/freemarker/freemarker-2.3.15.tar.gz).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731487 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 08:09:29 +00:00
Adrian Crum 01fdf5c723 Fixed problem with OFBiz script syntax versus UEL syntax. UEL identifiers cannot start with a digit, so identifiers created from IDs would generate syntax errors. This commit fixes that by converting ID identifiers internally by prefixing them with an underscore.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729819 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 00:43:05 +00:00
Adrian Crum 3d8de29f8a Final work on Unified Expression Language integration. L-values can contain nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729759 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 18:15:20 +00:00
Adrian Crum db2a92cadc Improved UEL implementation. FlexibleMapAccessor.java uses the UEL library instead of the home-grown parser.
This commit includes the JUEL library taken from CVS - not the 2.1.0 zip file download. It includes the author's modifications to support auto-vivify.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729583 13f79535-47bb-0310-9956-ffa450edef68
2008-12-27 02:31:05 +00:00
Jacques Le Roux 5a6d7dc969 These blocks should not have been indented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729471 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 09:32:07 +00:00
Jacques Le Roux 3ab1cc9086 This change should not have slipped in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729394 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 06:09:46 +00:00
Hans Bakker a2d58dc0ca set port values back to original default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729391 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 03:33:55 +00:00
David E. Jones c5c395277f I don't know why these were changed, probably mistakenly included in a commit, so changing back to more normal defaults
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729337 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 17:32:18 +00:00
Jacques Le Roux 7613c522d0 Added a comment found in https://sourceforge.net/forum/message.php?msg_id=5879468
Gmail would needs IMAPs for inbounds mails to work (SSL)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729284 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 09:27:05 +00:00