--- MPIWGWeb/MPIWGStaff.py	2005/10/14 15:21:22	1.10.2.7
+++ MPIWGWeb/MPIWGStaff.py	2005/10/17 20:37:05	1.10.2.11
@@ -13,6 +13,7 @@ import bibliography
 from Globals import package_home
 from Products.PythonScripts.standard import sql_quote
 from types import *
+from AccessControl import ClassSecurityInfo
 
 departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"
 
@@ -33,6 +34,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     meta_type="MPIWGStaff"
     default_catalog='MembersCatalog'
     departmentList=departmentList
+    security=ClassSecurityInfo()
     
     def getConnectionObj(self):#ueberschreibe connection id methode    
          
@@ -89,6 +91,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             DBid=self.getDBId()
          
         self.ZSQLQuery("SET DATESTYLE TO 'German'")
+
         self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data,
                                    date_from=date_from,
                                    date_to=date_to)
@@ -113,11 +116,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     
     def updateImage(self,file,publishImage,rename=None,RESPONSE=None):
         """update image"""
-        
-        if self.getImageObj():
-            self.getImageObj().updateImage(file,rename=None,RESPONSE=None)
-        else:
-            self.getImageFolder().addImage2(file,fileName=self.getId())
+
+        if file and not(file.filename==""):
+            if self.getImageObj():
+                     self.getImageObj().updateImage(file,rename=None,RESPONSE=None)
+            else:
+                     self.getImageFolder().addImage2(file,fileName=self.getId())
             
         self.publishImage=publishImage
         
@@ -210,7 +214,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         """change form"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGStaff.zpt')).__of__(self)
         return pt()
-
+    
+    security.declareProtected('View management screens','changeMPIWGStaff')
     def changeMPIWGStaff(self,lastName,firstName,RESPONSE=None):
         """change it"""
         self.title="%s, %s"%(lastName,firstName)
@@ -219,15 +224,22 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
-
+            
+    security.declareProtected('View management screens','edit')
     def edit(self):
         """Edit the pages"""
+    #TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern
+        if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de":
+                redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId()
+        
+                self.REQUEST.RESPONSE.redirect(redURL)
 
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)
         return pt()
 
     mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))
 
+    security.declareProtected('View management screens','changeResearch')
     def changeResearch(self,noredirect=None):
         """change the research entries"""
         newEntries={}
@@ -278,7 +290,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
 
         if not noredirect:
             self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])
-        
+            
+    security.declareProtected('View management screens','editCV')    
     def editCV(self,cv=None,oid=None,RESPONSE=None):
          """edit Cv"""
 
@@ -293,6 +306,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
          if RESPONSE:
             RESPONSE.redirect("editCV")
 
+    security.declareProtected('View management screens','editAwards')    
     def editAwards(self,awards=None,oid=None,RESPONSE=None):
          """edit a awards"""
 
@@ -307,13 +321,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
          if RESPONSE:
             RESPONSE.redirect("editAwards")
 
+    security.declareProtected('View management screens','editTalks')    
     def editTalks(self):
         """edit talks"""
 
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editTalks.zpt')).__of__(self)
         return pt()
         
-         
+    security.declareProtected('View management screens','editTeaching')    
     def editTeaching(self):
         """edit Teaching"""
 
@@ -326,6 +341,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         list= [x[0] for x in finds]
         return "\n".join(list)
 
+    security.declareProtected('View management screens','editMainData')    
     def editMainData(self,REQUEST=None,RESPONSE=None,name=None,**argv):
         """edit main data"""
         
@@ -339,7 +355,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             if RESPONSE:
                 RESPONSE.redirect("editMainData")
                 
-              
+    security.declareProtected('View management screens','newBibliogrpaphy')    
     def newBibliography(self,_docType=None, _addEntry=None,RESPONSE=None,**argv):
         
         """add an entry to the bibliography"""
@@ -370,18 +386,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             
         return True
     
+    security.declareProtected('View management screens','editImage')    
     def editImage(self):
         """edit images"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editImageStaff.zpt')).__of__(self)
         return pt()
     
+    security.declareProtected('View management screens','editBibliography')    
     def editBibliography(self):
         """edit the bibliography"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editBibliographyEntry.zpt')).__of__(self)
         return pt()
     
       
-        
+    security.declareProtected('View management screens','editPublications')    
     def editPublications(self):
         """edit the bibliographie"""
 
@@ -407,7 +425,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         except:
             return 0
         
-        
+    security.declareProtected('View management screens','changePublications')    
     def changePublications(self):
         """change the publication list"""
         self.changeResearch(noredirect=True)
@@ -416,7 +434,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])
         
 
-
+    security.declareProtected('View management screens','addPublications')    
     def addPublications(self,submit=None,REQUEST=None,noredirect=None):
         """add publications"""