[phplib-dev] cvs commit From: uw (phplib-dev <email protected>)
Date: 12/13/00

From: uw
Date: Wed Dec 13 16:10:31 2000
Modified files:
      php-lib/php/form/assistant.inc

Log message:
:) yet another bug fix.

Index: php-lib/php/form/assistant.inc
diff -u php-lib/php/form/assistant.inc:1.15 php-lib/php/form/assistant.inc:1.16
--- php-lib/php/form/assistant.inc:1.15 Mon Dec 11 21:01:12 2000
+++ php-lib/php/form/assistant.inc Wed Dec 13 16:10:30 2000
@@ -3,7 +3,7 @@
 * Assistant/wizard that guides a user through several forms.
 *
 *  <email protected> Ulf Wendel <ulf.wendel <email protected>>
-*  <email protected> $Id: assistant.inc,v 1.15 2000/12/11 20:01:12 uw Exp $
+*  <email protected> $Id: assistant.inc,v 1.16 2000/12/13 15:10:30 uw Exp $
 */
 class assistant extends panemanager {
         
@@ -138,8 +138,13 @@
         */
         function restoreAssistant() {
         
- $this->saveFormValues();
- $this->setPageErrors();
+ if (isset($GLOBALS["HTTP_" . $this->method . "_VARS"])) {
+
+ $this->saveFormValues();
+ $this->setPageErrors();
+
+ }
+
                 $this->findPosition();
                 $this->loadFormValues();
                                 
@@ -320,7 +325,7 @@
         */
         function loadFormValues() {
 
- if ($this->lastviewed != $this->now && isset($this->page_values[$this->now]))
+ if ( isset($this->page_values[$this->now]) && ($this->lastviewed != $this->now || $this->selected > 0) )
                         $this->pages[$this->now]["object"]->restoreSessionHash($this->page_values[$this->now]);
 
                 $this->page_errors[$this->now] = ($this->pages[$this->now]["object"]->isValid()) ? true : false;
@@ -517,7 +522,11 @@
         */
         function findSelected() {
                 
- $data = ("GET" == $this->method) ? &$GLOBALS["HTTP_GET_VARS"] : &$GLOBALS["HTTP_POST_VARS"];
+ if ("GET" == $this->method)
+ $data =& $GLOBALS["HTTP_GET_VARS"];
+ else
+ $data =& $GLOBALS["HTTP_POST_VARS"];
+
                 $this->selected = -1;
                 
                 if (!is_array($data) || 0 == count($data))

---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>