Branch: Tag:

1998-02-20

1998-02-20 00:58:15 by Per Hedbor <ph@opera.com>

Added resolv action, and changed wizard.pike to allow returning -1 for 'stay with me' in wizard_done

Rev: server/base_server/config/describers.pike:1.54
Rev: server/base_server/roxen.pike:1.168
Rev: server/base_server/smartpipe.pike:1.3
Rev: server/base_server/wizard.pike:1.50
Rev: server/config_actions/resolv.pike:1.1
Rev: server/protocols/http.pike:1.56

1: - /* $Id: wizard.pike,v 1.49 1998/02/19 16:45:30 mirar Exp $ + /* $Id: wizard.pike,v 1.50 1998/02/20 00:58:14 per Exp $    * name="Wizard generator";    * doc="This file generats all the nice wizards";    */
367:    function c;       if(!functionp(c=this_object()["verify_"+v->_page]) || (!c( id, @args ))) -  return (((c=this_object()->wizard_done)?c(id,@args):0) -  || http_redirect(cancel||id->not_query, @(id->conf?({id}):({})))); +  { +  mixed res; +  if(c=this_object()->wizard_done) +  res = c(id,@args); +  if(res != -1) +  return (res +  || http_redirect(cancel||id->not_query, +  @(id->conf?({id}):({}))));    } -  +  }    else if(v["help.x"])    {    m_delete(v, "help.x");