some fixes

Author: cekk

src/collective/volto/formsupport/adapters/post.py

@@ -14,6 +14,7 @@
 from zope.interface import implementer
 from zope.interface import Interface
 
+import base64
 import math
 import os
 
@@ -118,7 +119,7 @@ def validate_form(self):
                 )
             )
 
-        if not self.form_data.get("data", []):
+        if not self.form_data.get("data", []) and not self.form_data.get("attachments"):
             raise BadRequest(
                 translate(
                     _(
@@ -207,14 +208,21 @@ def validate_bcc(self):
                 )
 
     def validate_attachments(self):
+        """
+        * validate attachments size (total size of all attachments must be less
+          than FORM_ATTACHMENTS_LIMIT)
+        """
         attachments_limit = os.environ.get("FORM_ATTACHMENTS_LIMIT", "")
         if not attachments_limit:
             return
         attachments = self.form_data.get("attachments", {})
         attachments_len = 0
-        for attachment in attachments.values():
-            data = attachment.get("data", "")
-            attachments_len += (len(data) * 3) / 4 - data.count("=", -2)
+        for value in attachments.values():
+            data = value.get("data", "")
+            if value.get("encoding") == "base64":
+                attachments_len += len(base64.b64decode(data))
+            else:
+                attachments_len += len(data)
         if attachments_len > float(attachments_limit) * pow(1024, 2):
             size_name = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
             i = int(math.floor(math.log(attachments_len, 1024)))
@@ -239,6 +247,7 @@ def validate_attachments(self):
     def filter_parameters(self):
         """
         do not send attachments fields.
+        Used for email message body, and xml attachment (?)
         """
         result = []
 

src/collective/volto/formsupport/browser/configure.zcml

@@ -49,13 +49,4 @@
       permission="cmf.ModifyPortalContent"
       />
 
-  <browser:page
-      name="email-confirm-view"
-      for="*"
-      class=".email_confirm_view.EmailConfirmView"
-      template="templates/email_confirm_view.pt"
-      permission="zope2.View"
-      layer="collective.volto.formsupport.interfaces.ICollectiveVoltoFormsupportLayer"
-      />
-
 </configure>

src/collective/volto/formsupport/restapi/services/form_data/csv.py

@@ -126,7 +126,10 @@ def get_data(self):
                 if k not in self.form_fields_order and label not in legacy_columns:
                     legacy_columns.append(label)
 
-                data[label] = json_compatible(value)
+                if isinstance(value, NamedBlobFile):
+                    data[label] = value.filename
+                else:
+                    data[label] = json_compatible(value)
 
             for k in fixed_columns:
                 # add fixed columns values

src/collective/volto/formsupport/restapi/services/submit_form/post.py

@@ -9,7 +9,6 @@
 import logging
 import os
 import re
-import base64
 
 try:
     from plone.base.interfaces.controlpanel import IMailSchema
@@ -389,7 +388,6 @@ def attach_xml(self, msg):
 
     def store_data(self):
         store = getMultiAdapter((self.context, self.request), IFormDataStore)
-        import pdb;pdb.set_trace()
         data = self.form_data_adapter.filter_parameters()
         if self.form_data.get("attachments"):
             data += [

src/collective/volto/formsupport/scripts/cleansing.py

@@ -23,7 +23,6 @@
     help="--dryrun (default) simulate, --no-dryrun actually save the changes",
 )
 def main(dryrun):
-    # import pdb;pdb.set_trace()
     if dryrun:
         print("CHECK ONLY")
     catalog = api.portal.get_tool("portal_catalog")