[jan] Fix creating new spam folders.

horde · Jul 12, 2016 · 39ac98d · 39ac98d
1 parent 6466c0d
commit 39ac98d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/docs/CHANGES b/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.2.12-git
 -----------
 
+[jan] Fix creating new spam folders.
 
 
 -------

diff --git a/lib/Basic/Spam.php b/lib/Basic/Spam.php
@@ -133,10 +133,11 @@ static public function url(array $opts = array())
 class Horde_Form_Type_ingo_folders extends Horde_Form_Type {
 
     var $_folder;
+    var $newFolderSet;
 
     function isValid(&$var, &$vars, $value, &$message)
     {
-        if (strlen($value)) {
+        if ($this->newFolderSet || strlen($value)) {
             return true;
         }
 

diff --git a/lib/Form/Spam.php b/lib/Form/Spam.php
@@ -60,4 +60,15 @@ public function renderActive(
         );
     }
 
+    public function validate($vars = null, $canAutoFill = false)
+    {
+        if (is_null($vars)) {
+            $vars = $this->_vars;
+        }
+        if (strlen($vars->get('folder_new'))) {
+            $this->folder_var->type->newFolderSet = true;
+        }
+        return parent::validate($vars, $canAutoFill);
+    }
+
 }
diff --git a/package.xml b/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
-* 
+* [jan] Fix creating new spam folders.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1674,7 +1674,7 @@
    <date>2016-07-01</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
-* 
+* [jan] Fix creating new spam folders.
    </notes>
   </release>
  </changelog>