Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 17808)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 17809)
@@ -4,4 +4,6 @@
 1.8.2.dev0 (unreleased)
 =======================
+
+* Limit the file name length to 65 characters.
 
 * Make the certificate's longtitle customizable.
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 17808)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 17809)
@@ -338,5 +338,5 @@
 
 #
-# Login/logout and language switch pages...
+# Login/logout and language switch pages
 #
 
@@ -532,5 +532,5 @@
 
 #
-# Contact form...
+# Contact form
 #
 
@@ -624,5 +624,5 @@
 
 #
-# University related pages...
+# University related pages
 #
 
@@ -840,5 +840,5 @@
 
 #
-# User container pages...
+# User container pages
 #
 
@@ -1186,5 +1186,5 @@
 
 #
-# Search pages...
+# Search pages
 #
 
@@ -1214,5 +1214,5 @@
 
 #
-# Configuration pages...
+# Configuration pages
 #
 
@@ -1344,5 +1344,5 @@
 
 #
-# Datacenter pages...
+# Datacenter pages
 #
 
@@ -1498,4 +1498,9 @@
                 return
             normalized_filename = self.getNormalizedFileName(filename)
+            if len(normalized_filename.split('.')[0]) > 65:
+                self.flash(_("Maximum file name length is 65 characters! "
+                             "Please choose a shorter file name."),
+                           type='danger')
+                return
             finished_file = os.path.join(
                 self.context.storage, 'finished', normalized_filename)
@@ -2558,5 +2563,4 @@
 
 #
-# Courses pages
 #
 class CoursePage(KofaDisplayFormPage, LocalRoleAssignmentUtilityView):
@@ -2747,5 +2751,5 @@
 
 #
-# Certificate course pages...
+# CertificateCourse pages...
 #
 class CertificateCoursePage(KofaPage):
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 17808)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 17809)
@@ -34,5 +34,9 @@
   </div>
 </div>
-<br />
+<br /><br />
+<span i18n:translate="">
+  Please note that the file name must not exceed 65 characters
+  (including the officer's user name, which will become part of the file name).
+</span>
 <form method="post" enctype="multipart/form-data">
 <br />
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 17808)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 17809)
@@ -225,4 +225,19 @@
         return
 
+    def test_forbidden_filename(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.datacenter_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.datacenter_path)
+        self.browser.getLink("Upload data").click()
+        file = open(FORBIDDEN_FILE)
+        ctrl = self.browser.getControl(name='uploadfile:file')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(file, filename='123456789012345678901234567890123456789012345678901234567890123456.csv')
+        self.browser.getControl('Upload').click()
+        self.assertTrue(
+            'Maximum file name length is 65 characters!'
+            in self.browser.contents)
+
 class DataCenterUIExportTests(UniversitySetup, FunctionalAsyncTestCase):
     # Tests for DataCenter class views and pages.
