--- MPIWGWeb/MPIWGProjects.py	2005/10/14 16:41:27	1.47.2.32
+++ MPIWGWeb/MPIWGProjects.py	2005/10/17 10:59:06	1.47.2.34
@@ -4,6 +4,7 @@ for organizing and maintaining the diffe
 """
 #TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaengig vom status publish_the_data
 #TODO: was passiert wenn aenderungen von jochen im filemaker nicht mit den aenderungen im sql uebereinstimmen
+#TODO: in einzelnen projecte steht als pfad auf die bilder noch wwwneu statt www
 
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
@@ -1395,6 +1396,7 @@ class MPIWGProject(CatalogAware,Folder):
         
     
     def copyImageToMargin(self,RESPONSE=None):
+        #TODO: copy more than one image
         """copy inline images to marginal images"""
         self.getContent('WEB_project_description',filter='yes')
 
@@ -1407,8 +1409,17 @@ class MPIWGProject(CatalogAware,Folder):
             
         self.addImage(None,self.imagecap,filename=filename)
         #hole die bilddaten aus der url
-        data=urllib.urlopen(self.absolute_url()+"/"+self.imageURL).read()
-
+        url=self.absolute_url()+"/"+self.imageURL
+        #url=self.absolute_url()+"/"+filename
+        
+        try:#relative url
+            data=urllib.urlopen(url).read()
+        except:
+            try:#absolute
+                data=urllib.urlopen(self.imageURL).read()
+            except:
+                zLOG.LOG("MPIWG Project",zLOG.ERROR,"can't open: %s"%url)
+            
         obj=getattr(self,filename)
         obj.update_data(data)
         
@@ -1905,7 +1916,7 @@ class MPIWGProject(CatalogAware,Folder):
         
         return True
 
-    security.declareProtected('View managment screens','edit')
+    security.declareProtected('View management screens','edit')
     def edit(self,western=None):
         """Edit pages"""
         if western:
@@ -2032,6 +2043,7 @@ class MPIWGProject(CatalogAware,Folder):
         splitted=[y.rstrip().lstrip() for y in splitted]
         
         for x in splitted:
+            x=re.sub(r"[^A-z]","",x)
             if (not x==u'') and x in wert:
                 return 1
         return 0
@@ -2042,13 +2054,13 @@ class MPIWGProject(CatalogAware,Folder):
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasisNeu.zpt')).__of__(self)
         return pt()
 
-    
+    security.declareProtected('View management screens','editMPIWGBasisForm')
     def editMPIWGBasisForm(self):
         """editform"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)
         return pt()
 
-    
+    security.declareProtected('View management screens','editMPIWGRelatedPublicationsForm')
     def editMPIWGRelatedPublicationsForm(self):
         """Edit related Publications"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)