cvs: pear /HTML_QuickForm_Controller/Action Back.php Display.php Next.php Submit.php

avb Fri Nov 26 05:49:48 2004 EDT Modified files: /pear/HTML_QuickForm_Controller/Action Submit.php Next.php Display.php Back.php Log: All action handlers now return results (request #2689) http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/Action/Submit.php?r1=1.2&r2=1.3&ty=u Index: pear/HTML_QuickForm_Controller/Action/Submit.php diff -u pear/HTML_QuickForm_Controller/Action/Submit.php:1.2 pear/HTML_QuickForm_Controller/Action/Submit.php:1.3 --- pear/HTML_QuickForm_Controller/Action/Submit.php:1.2 Tue Mar 2 16:15:45 2004 +++ pear/HTML_QuickForm_Controller/Action/Submit.php Fri Nov 26 05:49:48 2004 @@ -16,7 +16,7 @@ // | Author: Alexey Borzov <avb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Submit.php,v 1.2 2004/03/02 21:15:45 avb Exp $ +// $Id: Submit.php,v 1.3 2004/11/26 10:49:48 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ * * @author Alexey Borzov <avb@php.net> * @package HTML_QuickForm_Controller - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class HTML_QuickForm_Action_Submit extends HTML_QuickForm_Action { @@ -40,16 +40,16 @@ // All pages are valid, process if ($page->controller->isValid()) { - $page->handle('process'); + return $page->handle('process'); // Current page is invalid, display it } elseif (!$data['valid'][$pageName]) { - $page->handle('display'); + return $page->handle('display'); // Some other page is invalid, redirect to it } else { $target =& $page->controller->getPage($page->controller->findInvalid()); - $target->handle('jump'); + return $target->handle('jump'); } } } http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/Action/Next.php?r1=1.3&r2=1.4&ty=u Index: pear/HTML_QuickForm_Controller/Action/Next.php diff -u pear/HTML_QuickForm_Controller/Action/Next.php:1.3 pear/HTML_QuickForm_Controller/Action/Next.php:1.4 --- pear/HTML_QuickForm_Controller/Action/Next.php:1.3 Tue Mar 2 16:15:45 2004 +++ pear/HTML_QuickForm_Controller/Action/Next.php Fri Nov 26 05:49:48 2004 @@ -16,7 +16,7 @@ // | Author: Alexey Borzov <avb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Next.php,v 1.3 2004/03/02 21:15:45 avb Exp $ +// $Id: Next.php,v 1.4 2004/11/26 10:49:48 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ * * @author Alexey Borzov <avb@php.net> * @package HTML_QuickForm_Controller - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ class HTML_QuickForm_Action_Next extends HTML_QuickForm_Action { @@ -45,17 +45,17 @@ // More pages? if (null !== ($nextName = $page->controller->getNextName($pageName))) { $next =& $page->controller->getPage($nextName); - $next->handle('jump'); + return $next->handle('jump'); // Consider this a 'finish' button, if there is no explicit one } elseif($page->controller->isModal()) { if ($page->controller->isValid()) { - $page->handle('process'); + return $page->handle('process'); } else { // this should redirect to the first invalid page - $page->handle('jump'); + return $page->handle('jump'); } } else { - $page->handle('display'); + return $page->handle('display'); } } } http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/Action/Display.php?r1=1.4&r2=1.5&ty=u Index: pear/HTML_QuickForm_Controller/Action/Display.php diff -u pear/HTML_QuickForm_Controller/Action/Display.php:1.4 pear/HTML_QuickForm_Controller/Action/Display.php:1.5 --- pear/HTML_QuickForm_Controller/Action/Display.php:1.4 Fri Oct 1 05:48:37 2004 +++ pear/HTML_QuickForm_Controller/Action/Display.php Fri Nov 26 05:49:48 2004 @@ -16,7 +16,7 @@ // | Author: Alexey Borzov <avb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Display.php,v 1.4 2004/10/01 09:48:37 avb Exp $ +// $Id: Display.php,v 1.5 2004/11/26 10:49:48 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -29,7 +29,7 @@ * * @author Alexey Borzov <avb@php.net> * @package HTML_QuickForm_Controller - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ class HTML_QuickForm_Action_Display extends HTML_QuickForm_Action { @@ -44,7 +44,7 @@ // unless all previous pages are valid (see also bug #2323) if ($page->controller->isModal() && !$page->controller->isValid($page->getAttribute('id'))) { $target =& $page->controller->getPage($page->controller->findInvalid()); - $target->handle('jump'); + return $target->handle('jump'); } $data =& $page->controller->container(); if (!empty($data['values'][$pageName])) { @@ -59,7 +59,7 @@ if (isset($validate) && $validate) { $page->validate(); } - $this->_renderForm($page); + return $this->_renderForm($page); } http://cvs.php.net/diff.php/pear/HTML_QuickForm_Controller/Action/Back.php?r1=1.3&r2=1.4&ty=u Index: pear/HTML_QuickForm_Controller/Action/Back.php diff -u pear/HTML_QuickForm_Controller/Action/Back.php:1.3 pear/HTML_QuickForm_Controller/Action/Back.php:1.4 --- pear/HTML_QuickForm_Controller/Action/Back.php:1.3 Tue Mar 2 16:15:45 2004 +++ pear/HTML_QuickForm_Controller/Action/Back.php Fri Nov 26 05:49:48 2004 @@ -16,7 +16,7 @@ // | Author: Alexey Borzov <avb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Back.php,v 1.3 2004/03/02 21:15:45 avb Exp $ +// $Id: Back.php,v 1.4 2004/11/26 10:49:48 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ * * @author Alexey Borzov <avb@php.net> * @package HTML_QuickForm_Controller - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ class HTML_QuickForm_Action_Back extends HTML_QuickForm_Action { @@ -43,10 +43,10 @@ // get the previous page and go to it // we don't check validation status here, 'jump' handler should if (null === ($prevName = $page->controller->getPrevName($pageName))) { - $page->handle('jump'); + return $page->handle('jump'); } else { $prev =& $page->controller->getPage($prevName); - $prev->handle('jump'); + return $prev->handle('jump'); } } }