--- versionedFile/versionedFile.py	2006/02/17 12:16:08	1.56
+++ versionedFile/versionedFile.py	2006/05/22 10:54:31	1.60
@@ -299,6 +299,26 @@ class versionedFileFolder(Folder,ECHO_ba
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+    
+    def generateAddFileForm(self,RESPONSE=None):
+        """lege standard addfileform an"""
+        #TODO: write generateaddfileform only a dummy at them moment
+
+        if not self.ZopeFind(self,obj_ids=['addFileForm.dtml']):
+            zt=ZopePageTemplate('index.html')
+            self._setObject('index.html',zt)
+            default_content_fn = os.path.join(package_home(globals()),
+                                               'zpt/versionFileFolderMain.zpt')
+            text = open(default_content_fn).read()
+            zt.pt_edit(text, 'text/html')
+
+        else:
+            return "already exists!"
+        
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+
     def generateIndexHTML(self,RESPONSE=None):
         """lege standard index.html an"""
 
@@ -419,6 +439,7 @@ class versionedFileFolder(Folder,ECHO_ba
         return pt()
 
 
+
     def addFileForm(self):
         """add a file"""
         ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"])
@@ -602,11 +623,12 @@ class versionedFileObject(File):
 
         #self.REQUEST.close()
     
+    security.declareProtected('AUTHENTICATED_USER','downloadLocked')    
     def downloadLocked(self):
         """download and lock"""
         
         
-        if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User':
+        if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
             return "please login first"
         if not self.aq_parent.lockedBy=="":
             return "cannot be locked because is already locked by %s"%self.lockedBy
@@ -698,6 +720,9 @@ class versionedFile(CatalogAware,Folder)
 
     default_catalog='fileCatalog'
     
+    security= ClassSecurityInfo()   
+    
+    security.declarePublic('getTitle')
     def getTitle(self):
         """get title"""
         return self.title
@@ -762,7 +787,7 @@ class versionedFile(CatalogAware,Folder)
         else:
             return images
                              
-        
+    security.declarePublic('getComment')
     def getComment(self):
         """get the comment of this file"""
         if not hasattr(self,'comment') or (not self.comment) or (self.comment.lstrip()==""):
@@ -791,7 +816,7 @@ class versionedFile(CatalogAware,Folder)
                 self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
 
         return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url())
-    
+    security.declarePublic('getLastVersion')
     def getLastVersion(self):
         """Last Version"""
         tmp=0
@@ -828,13 +853,13 @@ class versionedFile(CatalogAware,Folder)
         
         
         return max([plus,minus]),l
-    
+    security.declarePublic('index_html')
     def index_html(self):
         """main view"""
         lastVersion=self.getLastVersion()
         #return "File:"+self.title+"  Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor()
         return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor())
-    security= ClassSecurityInfo()   
+
 
      
     security.declarePublic('getVersion')                                              
@@ -880,7 +905,7 @@ class versionedFile(CatalogAware,Folder)
         """unlock"""
         if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]:
             self.lockedBy=''
-            RESPONSE.redirect(self.REQUEST['URL2'])
+            RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])
         else:
             return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER'])
         
@@ -894,8 +919,12 @@ class versionedFile(CatalogAware,Folder)
         if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]:
             return "please login first"
         if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''):
-            out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self)
-            return out()
+            ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"])
+            if ext:
+                return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getLastVersion().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
+            else:
+                out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self)
+                return out()
         else:
             return "Sorry file is locked by somebody else"
         
@@ -975,9 +1004,11 @@ class versionedFile(CatalogAware,Folder)
         #self.getLastVersion().content_type="application/octet-stream"
         self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId())
     
+    security.declareProtected('AUTHENTICATED_USER','downloadLocked')    
     def downloadLocked(self):
         """download and lock"""
-        if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User':
+
+        if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
             return "please login first"
         if not self.lockedBy=="":
             return "cannot be locked because is already locked by %s"%self.lockedBy