You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/11/16 14:50:07 UTC
svn commit: r345016 - in /lenya/trunk/src/java/org/apache/lenya/cms:
publication/DocumentManagerImpl.java site/usecases/CreateDocument.java
Author: andreas
Date: Wed Nov 16 05:49:59 2005
New Revision: 345016
URL: http://svn.apache.org/viewcvs?rev=345016&view=rev
Log:
Calling DocumentManager.isValidDocumentName() from CreateDocument usecase to validate document names. DocumentManagerImpl allows only characters and numbers in document IDs.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=345016&r1=345015&r2=345016&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Wed Nov 16 05:49:59 2005
@@ -291,7 +291,7 @@
* @see org.apache.lenya.cms.publication.DocumentManager#isValidDocumentName(java.lang.String)
*/
public boolean isValidDocumentName(String documentName) {
- return !documentName.equals("") && documentName.indexOf("/") < 0;
+ return documentName.matches("[a-zA-Z0-9]+");
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java?rev=345016&r1=345015&r2=345016&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java Wed Nov 16 05:49:59 2005
@@ -89,14 +89,19 @@
DocumentManager documentManager = null;
try {
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
- Document parent = getSourceDocument();
- Publication publication = getSourceDocument().getPublication();
- Document document = getSourceDocument().getIdentityMap().get(publication,
- getSourceDocument().getArea(),
- parent.getId() + "/" + documentName,
- language);
- if (document.exists()) {
- addErrorMessage("The document does already exist.");
+
+ if (!documentManager.isValidDocumentName(documentName)) {
+ addErrorMessage("The document ID may not contain any special characters.");
+ } else {
+ Document parent = getSourceDocument();
+ Publication publication = getSourceDocument().getPublication();
+ Document document = getSourceDocument().getIdentityMap().get(publication,
+ getSourceDocument().getArea(),
+ parent.getId() + "/" + documentName,
+ language);
+ if (document.exists()) {
+ addErrorMessage("The document does already exist.");
+ }
}
} finally {
if (documentManager != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org