Bug: 14148 Correctly add session id to form if it's needed.

horde · Nov 2, 2015 · 3309278 · 3309278
1 parent 8f621d8
commit 3309278
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/ingo/lib/Basic/Forward.php b/ingo/lib/Basic/Forward.php
@@ -91,13 +91,14 @@ protected function _init()
         $this->header = _("Forwards Edit");
 
         Horde::startBuffer();
+        Horde_Util::pformInput();
         $form->renderActive(
             new Horde_Form_Renderer(array(
                 'encode_title' => false,
                 'varrenderer_driver' => array('ingo', 'ingo')
             )),
             $this->vars,
-            self::url(),
+            self::url(array('append_session' => -1)),
             'post'
         );
         $this->output = Horde::endBuffer();
@@ -107,7 +108,10 @@ protected function _init()
      */
     static public function url(array $opts = array())
     {
-        return Horde::url('basic.php')->add('page', 'forward');
+        if (empty($opts['append_session'])) {
+            $opts['append_session'] = 0;
+        }
+        return Horde::url('basic.php', false, array('append_session' => $opts['append_session']))->add('page', 'forward');
     }
 
 }
diff --git a/ingo/lib/Basic/Spam.php b/ingo/lib/Basic/Spam.php
@@ -106,15 +106,19 @@ protected function _init()
         $this->header = _("Spam Filtering");
 
         Horde::startBuffer();
-        $form->renderActive($renderer, $this->vars, self::url(), 'post');
+        Horde_Util::pformInput();
+        $form->renderActive($renderer, $this->vars, self::url(array('append_session' => -1)), 'post');
         $this->output = Horde::endBuffer();
     }
 
     /**
      */
     static public function url(array $opts = array())
     {
-        return Horde::url('basic.php')->add('page', 'spam');
+        if (empty($opts['append_session'])) {
+            $opts['append_session'] = 0;
+        }
+        return Horde::url('basic.php', false, array('append_session' => $opts['append_session']))->add('page', 'spam');
     }
 
 }

diff --git a/ingo/lib/Basic/Vacation.php b/ingo/lib/Basic/Vacation.php
@@ -129,13 +129,14 @@ protected function _init()
         $this->header = _("Vacation Edit");
 
         Horde::startBuffer();
+        Horde_Util::pformInput();
         $form->renderActive(
             new Horde_Form_Renderer(array(
                 'encode_title' => false,
                 'varrenderer_driver' => array('ingo', 'ingo')
             )),
             $this->vars,
-            self::url(),
+            self::url(array('append_session' => -1)),
             'post'
         );
         $this->output = Horde::endBuffer();
@@ -145,7 +146,10 @@ protected function _init()
      */
     static public function url(array $opts = array())
     {
-        return Horde::url('basic.php')->add('page', 'vacation');
+        if (empty($opts['append_session'])) {
+            $opts['append_session'] = 0;
+        }
+        return Horde::url('basic.php', false, array('append_session' => $opts['append_session']))->add('page', 'vacation');
     }
 
 }