Branch: Tag:

2001-04-24

2001-04-24 08:49:06 by Jonas Wallden <jonasw@roxen.com>

Wizard code was too eager to call id->variables->cancel_url when a wizard
exited normally.

Rev: server/base_server/wizard.pike:1.133

1:   // Wizard generator   // This file generats all the nice wizards   // Copyright © 1997 - 2000, Roxen IS. - // $Id: wizard.pike,v 1.132 2001/04/12 17:32:14 nilsson Exp $ + // $Id: wizard.pike,v 1.133 2001/04/24 08:49:06 jonasw Exp $      /* wizard_automaton operation (old behavior if it isn't defined):   
658:    }    if(res != -1)    return (res -  || http_redirect(s->cancel_url||cancel||id->not_query, +  || http_redirect(cancel || id->not_query,    @(id->conf?({id}):({}))));    DEBUGMSG ("Wizard: -1 from wizard_done; continuing\n");    }
1060:   {    return ("<table><tr><td valign=\"top\"><img \nalt=\"Notice:\" src=\""+    (id->conf?"/internal-roxen-":"/image/") -  +"err_1.gif\" /></td><td valign=\"top\">"+notice+"</td></tr></table>"); +  +"err_1.gif\" />&nbsp;&nbsp;</td><td valign=\"top\">"+notice+"</td></tr></table>");   }      string html_warning(string notice, RequestID id)   {    return ("<table><tr><td valign=\"top\"><img \nalt=\"Warning:\" src=\""+    (id->conf?"/internal-roxen-":"/image/") -  +"err_2.gif\" /></td><td valign=\"top\">"+notice+"</td></tr></table>"); +  +"err_2.gif\" />&nbsp;&nbsp;</td><td valign=\"top\">"+notice+"</td></tr></table>");   }      string html_error(string notice, RequestID id)