diff --git a/main/inc/lib/pear/HTML/QuickForm/Action.php b/main/inc/lib/pear/HTML/QuickForm/Action.php index 6e50062709..ea74d3177c 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action.php @@ -17,7 +17,7 @@ // | Bertrand Mansion | // +----------------------------------------------------------------------+ // -// $Id: Action.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Action.php,v 1.1 2003/08/29 12:19:41 avb Exp $ /** * Class representing an action to perform on HTTP request. The Controller @@ -27,7 +27,7 @@ * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.1 $ */ class HTML_QuickForm_Action { diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Back.php b/main/inc/lib/pear/HTML/QuickForm/Action/Back.php index 628ab9b794..946b64c47a 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Back.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Back.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Back.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Back.php,v 1.3 2004/03/02 21:15:45 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.3 $ */ class HTML_QuickForm_Action_Back extends HTML_QuickForm_Action { @@ -43,10 +43,16 @@ class HTML_QuickForm_Action_Back extends HTML_QuickForm_Action // 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))) { + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('jump'); return $page->handle('jump'); + // } else { $prev =& $page->controller->getPage($prevName); + // Modified by Chamilo team, 16-MAR-2010. + //$prev->handle('jump'); return $prev->handle('jump'); + // } } } diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Direct.php b/main/inc/lib/pear/HTML/QuickForm/Action/Direct.php index be127d3b43..f6d10c0299 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Direct.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Direct.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Direct.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Direct.php,v 1.2 2004/03/02 21:15:45 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -28,7 +28,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.2 $ */ class HTML_QuickForm_Action_Direct extends HTML_QuickForm_Action { diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Display.php b/main/inc/lib/pear/HTML/QuickForm/Action/Display.php index 8618a736fe..05c0486d11 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Display.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Display.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Display.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Display.php,v 1.4 2004/10/01 09:48:37 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -29,7 +29,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.4 $ */ class HTML_QuickForm_Action_Display extends HTML_QuickForm_Action { @@ -44,7 +44,10 @@ class HTML_QuickForm_Action_Display extends HTML_QuickForm_Action // 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()); + // Modified by Chamilo team, 16-MAR-2010. + //$target->handle('jump'); return $target->handle('jump'); + // } $data =& $page->controller->container(); if (!empty($data['values'][$pageName])) { @@ -59,7 +62,10 @@ class HTML_QuickForm_Action_Display extends HTML_QuickForm_Action if (isset($validate) && $validate) { $page->validate(); } + // Modified by Chamilo team, 16-MAR-2010. + //$this->_renderForm($page); return $this->_renderForm($page); + // } diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Jump.php b/main/inc/lib/pear/HTML/QuickForm/Action/Jump.php index 0bca59d0d4..9072f4c7cc 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Jump.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Jump.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Jump.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Jump.php,v 1.3 2004/03/02 21:15:45 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.3 $ */ class HTML_QuickForm_Action_Jump extends HTML_QuickForm_Action { diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Next.php b/main/inc/lib/pear/HTML/QuickForm/Action/Next.php index 61ca221874..47a15b2d86 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Next.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Next.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Next.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Next.php,v 1.3 2004/03/02 21:15:45 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.3 $ */ class HTML_QuickForm_Action_Next extends HTML_QuickForm_Action { @@ -45,17 +45,29 @@ class HTML_QuickForm_Action_Next extends HTML_QuickForm_Action // More pages? if (null !== ($nextName = $page->controller->getNextName($pageName))) { $next =& $page->controller->getPage($nextName); + // Modified by Chamilo team, 16-MAR-2010. + //$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()) { + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('process'); return $page->handle('process'); + // } else { // this should redirect to the first invalid page + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('jump'); return $page->handle('jump'); + // } } else { + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('display'); return $page->handle('display'); + // } } } diff --git a/main/inc/lib/pear/HTML/QuickForm/Action/Submit.php b/main/inc/lib/pear/HTML/QuickForm/Action/Submit.php index b32ee6d163..ec5e5c4d81 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Action/Submit.php +++ b/main/inc/lib/pear/HTML/QuickForm/Action/Submit.php @@ -16,7 +16,7 @@ // | Author: Alexey Borzov | // +----------------------------------------------------------------------+ // -// $Id: Submit.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Submit.php,v 1.2 2004/03/02 21:15:45 avb Exp $ require_once 'HTML/QuickForm/Action.php'; @@ -25,7 +25,7 @@ require_once 'HTML/QuickForm/Action.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.2 $ */ class HTML_QuickForm_Action_Submit extends HTML_QuickForm_Action { @@ -40,16 +40,25 @@ class HTML_QuickForm_Action_Submit extends HTML_QuickForm_Action // All pages are valid, process if ($page->controller->isValid()) { + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('process'); return $page->handle('process'); + // // Current page is invalid, display it } elseif (!$data['valid'][$pageName]) { + // Modified by Chamilo team, 16-MAR-2010. + //$page->handle('display'); return $page->handle('display'); + // // Some other page is invalid, redirect to it } else { $target =& $page->controller->getPage($page->controller->findInvalid()); + // Modified by Chamilo team, 16-MAR-2010. + //$target->handle('jump'); return $target->handle('jump'); + // } } } diff --git a/main/inc/lib/pear/HTML/QuickForm/Controller.php b/main/inc/lib/pear/HTML/QuickForm/Controller.php index 041d4b0cc7..28c7bc0e5b 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Controller.php +++ b/main/inc/lib/pear/HTML/QuickForm/Controller.php @@ -17,7 +17,7 @@ // | Bertrand Mansion | // +----------------------------------------------------------------------+ // -// $Id: Controller.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Controller.php,v 1.10 2004/10/01 09:48:35 avb Exp $ require_once 'HTML/QuickForm/Page.php'; @@ -32,7 +32,7 @@ require_once 'HTML/QuickForm/Page.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.10 $ */ class HTML_QuickForm_Controller { diff --git a/main/inc/lib/pear/HTML/QuickForm/Page.php b/main/inc/lib/pear/HTML/QuickForm/Page.php index e8e05bcf3b..6999a80103 100755 --- a/main/inc/lib/pear/HTML/QuickForm/Page.php +++ b/main/inc/lib/pear/HTML/QuickForm/Page.php @@ -17,7 +17,7 @@ // | Bertrand Mansion | // +----------------------------------------------------------------------+ // -// $Id: Page.php 6184 2005-09-07 10:08:17Z bmol $ +// $Id: Page.php,v 1.3 2004/03/02 21:15:52 avb Exp $ require_once 'HTML/QuickForm.php'; @@ -30,7 +30,7 @@ require_once 'HTML/QuickForm.php'; * * @author Alexey Borzov * @package HTML_QuickForm_Controller - * @version $Revision: 6184 $ + * @version $Revision: 1.3 $ */ class HTML_QuickForm_Page extends HTML_QuickForm {