Support maximum file count and size config switches.

horde · Jan 7, 2016 · 4a2b76f · 4a2b76f
1 parent 684e774
commit 4a2b76f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/kronolith/config/conf.xml b/kronolith/config/conf.xml
@@ -20,6 +20,12 @@
  <configsection name="documents">
   <configheader>Virtual File Storage</configheader>
   <configvfs switchname="type" />
+   <configinteger name="size_limit" desc="The maximum total size of
+   documents allowed per event (in bytes)? Set to 0 for no limit. [The
+   maximum allowable size of any individual attachment is set via the PHP
+   'upload_max_filesize' parameter; see kronolith/docs/INSTALL]">0</configinteger>
+   <configinteger name="count_limit" desc="The maximum total number of
+   documents allowed per event? Set to 0 for no limit.">0</configinteger>
  </configsection>
 
  <configsection name="storage">

diff --git a/kronolith/lib/Ajax/Application/Handler.php b/kronolith/lib/Ajax/Application/Handler.php
@@ -1541,7 +1541,7 @@ public function checkResources()
      */
     public function addFile()
     {
-        global $notification;
+        global $notification, $conf;
 
         $result = new stdClass;
         $result->success = 0;
@@ -1552,7 +1552,13 @@ public function addFile()
             try {
                 $event = $this->_getDriver($this->vars->c)->getEvent($this->vars->i);
                 if ($this->_canUploadFiles()) {
+                    $max_files = $conf['documents']['count_limit'];
                     foreach ($this->_addFileFromUpload() as $f) {
+                        if (!empty($conf['documents']['count_limit']) &&
+                            count($event->listFiles()) >= $max_files) {
+                            $notification->push(_("You have reached the maximum number of allowed files."), 'horde.notification');
+                            break;
+                        }
                         if ($f instanceof Kronolith_Exception) {
                             $notification->push($f, 'horde.error');
                         } else {
@@ -1613,9 +1619,9 @@ protected function _canUploadFiles()
         global $browser, $conf;
 
         $size = $browser->allowFileUploads();
-        return empty($conf['file_uploads'])
+        return empty($conf['documents']['size_limit'])
             ? $size
-            : min($size, $conf['file_uploads']['size_limit']);
+            : min($size, $conf['documents']['size_limit']);
     }
 
     /**