Jacques Le Roux
46038493c4
Revert r766443 commited by accident
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766446 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 11:06:54 +00:00
Jacques Le Roux
59dcd48d1b
This was a commit error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766443 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 10:27:47 +00:00
Jacques Le Roux
2ca2feef1a
Changes from Erwan de FERRIERES "Upgrade of the fop library (0.94 -> 0.95)" https://issues.apache.org/jira/browse/OFBIZ-2317 - OFBIZ-2317
...
+ LICENCE updated (libraries wiki page also updated)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 19:42:46 +00:00
David E. Jones
78d8c7cdc0
Consolidated code to check for non-encrypted parameters sent to service calls, enhanced to support a new url.properties property (service.http.parameters.require.encrypted) that controls whether or not this will throw an exception
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764286 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 07:30:29 +00:00
David E. Jones
8821b17e3e
A small change to address an issue reported by Angelo Matarazzo when HTTPS is disabled and form data is POSTed; note that deploying so that OFBiz doesn't know if the request is over HTTPS or not is NOT recommended as this DOES open a security vulnerability for XSRF and such when data is POSTed not over HTTPS
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763855 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 01:41:52 +00:00
Jacques Le Roux
b9c3ddef08
2d part and end of an effort to remove trailing spaces
...
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg )
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Bilgin Ismet Ibryam
7e7c1f375a
Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside
...
firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761220 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:47:48 +00:00
Hans Bakker
ff5b74da4d
use 'home' to go back if 'last save' is not available
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:15:50 +00:00
Adam Heath
6d524e41c0
Fix lines that *only* have whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759243 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:58:52 +00:00
David E. Jones
1ae162b803
Small change to error message for non-secure parameters to mention the form field that will hopefully help it mean more to more people; also changed the service-multi handler to be consistent with the service one
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758734 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 16:45:29 +00:00
Hans Bakker
cc860ba38b
rather big change which contains the following:
...
1. created a new function in the partyManager called 'myCommunications'
This function enables the sending and receiving of email and internal communications to/from the current userlogin. It looks like an email client for internal and external email.
2. merged the party/webapp/partymgr/communication/CommMenus.xml and party/widget/partymgr/PartyMenus.xml
3. moved all forms/screens from my portal back into the party component
4. fixed some more problems with myportal
5. added 'save-home' and save 'current' in the same pattern as 'save-last' function in the controler.xml
6. added 'view-home' in the same pattern as 'view-last'
7. moved all related uilabels from myportal to party
8. This update needs a re-creation of the portlet/portal entities.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758522 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 06:06:12 +00:00
David E. Jones
4a1705a315
Removed some more references to applications stuff from framework, including small cleanup of service engine to get rid of WebAppDispatcher and use new factory method in GenericDispatcher, and changed AvailableServices.groovy to get the real dispatcher list instead of a hard-coded one; also updated eclipse classpath file for new webslinger stuff
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757671 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 06:27:03 +00:00
Hans Bakker
874ffe7c49
better error messages in request handler instead of null pointer exceptions
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757334 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 07:32:21 +00:00
David E. Jones
efcadbe25f
Small change so that if a service attribute has allow-html=any then don't canonicalize the input, ie get it straight from the request; this fixes Jira #OFBIZ-2231 and should fix other related issues, and should not open any security holes (except from trusted users, as long as services are setup correctly)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757318 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 04:50:57 +00:00
David E. Jones
2241c75865
Changed back to throw an exception when a non-body parameter is passed to a secure request that calls a service as an event; now that we have the Form Widget and form defs fixed up to handle these better it should be fine for most things, but chances are there are some links in FTL files that will still be broken and will need to be manually fixed; with this we can look forward to more issues and questions/comments on the mailing list, but this also makes it a lot more secure and pretty difficult to spoof one of these requests (will have to hack HTTPS and encrypt the body to do so)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757316 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 04:40:23 +00:00
Adam Heath
6954dfa49f
Fix purely empty whitespace lines, and remove trailing whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757075 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:24:37 +00:00
Jacques Le Roux
0e0519e802
All tabs to 4 spaces in *.groovy, *.java, *.xml
...
Done with Eclipse S/R "\t"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00
David E. Jones
2fb6b549cc
Fixed JSON event handling as described in the ml by Bilgin
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754908 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 14:48:16 +00:00
Bilgin Ismet Ibryam
c3f28c69da
Moved repeating method from EventHandlers to UtilHttp class
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754795 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 23:55:19 +00:00
Adam Heath
ab71160347
Upgrade to latest velocity release.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753064 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 23:49:00 +00:00
David E. Jones
a4037109a8
Changed insecure parameter passing response to log warning and not throw an exception for now; it breaks too many things and we should fix those before we make this a strict policy
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752399 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 07:40:46 +00:00
David E. Jones
fc20ee8bd7
Added comment about GET vs POST in this case; all requests that have events that call services should use POST with body parameters
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751510 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 19:48:00 +00:00
David E. Jones
6ebdc25981
Changed EventHandler interface so that the run method takes the new Event and RequestMap objects so it knows more about them; the service event handler and the service multi event handler now look at the request-map to see if the security -> https attribute is true and if it is then it will only allow encrypted body parameters to be passed to the service, or in other words it won't allow URL parameters that are not encrypted to be passed in; also changed the RequestHandler so that it will not accept http POST requests to request-map with security -> https=true; both of these changes better protect service calls from a webapp and protect better against XSRF and similar attacks since spoofing https is more difficult
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751501 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 19:14:14 +00:00
Jacques Le Roux
f796e230d2
catch( => catch(
...
}else => } else
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Jacques Le Roux
dfebb46e4b
}else{ => } else {
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751004 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:51:02 +00:00
Jacques Le Roux
e91b1d80a2
Reverted ad David's demand but the unused update button in Product Suppliers form
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:43:18 +00:00
Jacques Le Roux
fc6db9e886
if( => if (
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750997 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:36:09 +00:00
Jacques Le Roux
13a934f823
In spirit of Adam's r749341 and following http://java.sun.com/docs/codeconv/html/CodeConventions.doc7.html#489
...
The idea is also that a lot of code is duplicated and then changed (copy/paste). Hence having a rightly formatted code help to keep it rightly formatted
1st (simple) step : ){ => ) { (I checked all occurrences but of course other pairs of eyeballs are welcome)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750993 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:31:13 +00:00
Jacques Le Roux
d5b5215604
A modified patch from Eric De Maulde "When a virtual product is modified, its variants aren't modified" ( https://issues.apache.org/jira/browse/OFBIZ-2228 ) - OFBIZ-2228
...
Also I removed an update link from Product suppliers lists (not fields were modifiable)
More formatting to come (but in all OFBiz, ie no only in ServiceVariantsEventHandler.java)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750878 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 12:41:38 +00:00
David E. Jones
40fdb4076d
Fixed issue with serialization exceptions on shutdown and startup: the RequestHandler class no longer implements serializable, it was never serializable anyway because it has member fields of types ServletContext, ViewFactory, and EventFactory which are not serializable; I tried making those transient or removing them to load dynamically after a bunch of changes realized that it doesn't make sense to serialize this class anyway, it contains no useful data that a user would care about, and all of its information comes from configuration files that we would want to reload on a restart or in another system or whatever
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750572 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 20:09:53 +00:00
Adam Heath
44d8af6de0
Bad suite-name.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750339 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 06:44:49 +00:00
Jacques Le Roux
fe6219376d
Just keep the comment, in case someone one day wants to implement the counter idea
...
This closes "ServerHit aborts transactions when trying to create entries with duplicate startTime(s)." https://issues.apache.org/jira/browse/OFBIZ-2208 OFBIZ-2208
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750068 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 16:39:17 +00:00
Jacques Le Roux
cb74438cd4
Refactoring of ImageTransform, mostly
...
* Split into 2 classes one in framework/common : ImageTransform, one remains in product : ScaleImage.java
* Moved some labels used by ImageTransformCreated from ProductErrorUiLabels.xml in new CommonErrorUiLabels.xml
* Moved Jdom from webapp/lib to base/lib, updated .classpath
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750018 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 14:22:55 +00:00
David E. Jones
7a247f7135
Some improvements to the last view and view save code to handle request attributes and more parameters, safe since they are never going int he URL or anything; this resolves the issues I was running into before with this, and hopefully with no side effects other than a few CPU cycles here and there; made sure that the stuff is serializable before putting into the session
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749970 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 11:49:27 +00:00
David E. Jones
f876f9a0c1
Simple implementation of feature discussed on the mailing list to facilitate getting back to a view after some generic action, like schanging the locale which this commit has use the new feature as a test case; I'm not sure I like this approach, will send message to dev list about it
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749959 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 10:27:52 +00:00
Hans Bakker
2c183a034f
it looks like the requesthandler does deal with the default request which is required for the ofbiz cms ????DAVID????? can you please have a look if this change i made is correct?
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748455 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 09:21:37 +00:00
Jacques Le Roux
d8fceeeb82
Typo found by chance
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747517 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 19:26:10 +00:00
Jacques Le Roux
df5dbc4cc9
A bit of refactoring + update of Jdom
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747085 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 17:06:57 +00:00
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
ee8708e9b2
No functional changes, just type/generics cleanups
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746303 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 17:41:48 +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
David E. Jones
11bc29b4a6
Changed these back to have LoginWorker.makeLoginUrl return a StringWrapper so it doesn't get encoded, and the @ofbizUrl and @ofbizContentUrl tags back to not decode because it is important that various encoded parameters remain encoded so the browser does not interpret the characters as part of the URL
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744573 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:50:43 +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
f8351887b9
Changed LoginWorker.makeLoginUrl to return a StringWrapper so it does not get html encoded in FTL; decided to do it here instead of in each FTL file because based on a search it appears that this is ONLY used in FTL files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744232 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 20:35:04 +00:00
David E. Jones
29d2f40e84
Fixed issue reported by Hans Bakker which shows up in the strange situation for the content/views/Xxx URLs because they chain to a request with no event, and that was causing the overrideViewUrl to not get set to be picked up later when it is time to render the view; that is now fixed and the WebSite -> CMS tab is working again in the Content Manager
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744020 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 07:38:18 +00:00
David E. Jones
6c7938c134
Small change to suppress warning
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743984 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 04:50:55 +00:00
David E. Jones
26ad14469a
Fixed bug when there is not security element, certain values were not getting initialized; also fixed bug caused when default-request is not specified
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743822 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 18:15:35 +00:00
Hans Bakker
12ae876822
primarykey definition on the wrong place
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743637 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:20:01 +00:00
David E. Jones
b8707a26f8
Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743202 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:19:19 +00:00
David E. Jones
276dbd183b
Fixed changes from rev 742983 that caused a double question mark (?) for request-redirect responses with redirect-parameter sub-elements by changing the code for the case without redirect-parameter sub-elements to have a question mark, which was missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742991 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:16:00 +00:00