Branch: Tag:

1997-08-13

1997-08-13 21:37:39 by Per Hedbor <ph@opera.com>

Fixes

Rev: server/base_server/config/describers.pike:1.36
Rev: server/base_server/configuration.pike:1.54
Rev: server/base_server/mainconfig.pike:1.65
Rev: server/base_server/read_config.pike:1.12
Rev: server/base_server/roxen.pike:1.99
Rev: server/config_actions/changepass.pike:1.3
Rev: server/config_actions/openports.pike:1.1
Rev: server/config_actions/reloadconfiginterface.pike:1.1
Rev: server/config_actions/reloadconfigurations.pike:1.2
Rev: server/config_actions/shutdown.pike:1.5
Rev: server/start:1.19

1:   inherit "config/builders"; - string cvs_version = "$Id: mainconfig.pike,v 1.64 1997/08/13 06:51:37 neotron Exp $"; + string cvs_version = "$Id: mainconfig.pike,v 1.65 1997/08/13 21:37:32 per Exp $";   inherit "roxenlib";   inherit "config/draw_things";   
148:    }   }    + int restore_more_mode() + { +  return !!file_stat(".more_mode"); + } +    object root=Node(); - int expert_mode, more_mode; + int expert_mode, more_mode=restore_more_mode();    -  + void save_more_mode() + { +  if(more_mode) +  open(".more_mode", "wct"); +  else +  rm(".more_mode"); + }    -  +    void create()   {    build_root(root);
161:      #define BUTTON(ACTION,TEXT,ALIGN) do{PUSH("<a href=\"/(ACTION)"+(o?o->path(1):"/")+"?"+(bar++)+"\"><img border=0 hspacing=0 vspacing=0 src=\"/auto/button/"+(lm?"lm/":"")+replace(TEXT," ","%20")+"\" alt=\""+(lm?"/ ":" ")+TEXT+" /\""+(("ALIGN"-" ")=="left"?"":" align="+("ALIGN"-" "))+"></a>");lm=0;}while(0)    - inline string shutdown_restart(string save, int compact,void|object o) - { -  return /*"<br clear=all>"*/""; - } -  +    string default_head(string h, string|void save)   {    return ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Draft//EN\">"
547:      string configuration_docs()   { -  string res; +  string res="";    foreach(get_dir("server_templates"), string c)    {    catch {
819:   {    if(!sizeof(id->variables))    return stores(new_configuration_form()); +  if(id->variables->no) +  return http_redirect(roxen->config_url()+id->not_query[1..]+"?"+bar++);       if(!id->variables->name)    return stores(default_head("Bad luck")+
1142:    if(cnt>0)    {   // werror("q="+q+"\n"); -  res += ("<b><font size=+1><a href=\""+q+"\">"+ +  res += ("<b><font size=+1><a href=\""+q+"?"+bar+++"\">"+    dn(find_node(http_decode_string(q[..strlen(q)-2])))+    "</a></font></b> -&gt; ");    }
1236:    case "expert": expert_mode = 1; break;    case "noexpert": expert_mode = 0; break;    -  case "morevars": more_mode = 1; break; -  case "nomorevars": more_mode = 0; break; +  case "morevars": more_mode = 1; save_more_mode(); break; +  case "nomorevars": more_mode = 0; save_more_mode(); break;       // Fold and unfold nodes, this is _very_ simple, once all the    // supporting code was writte.
1640:    || o->type == NODE_MODULE_COPY_VARIABLES)    {    BUTTON(delete, "Delete module", left); +  if(more_mode)    BUTTON(refresh, "Reload module", left);    }   
1675:   // BUTTON(shutdown,"Shutdown", left);       PUSH("<img border=0 alt=\"\" hspacing=0 vspacing=0 src=\"/auto/button/rm/%20\">"); -  PUSH("<br clear=all>"); + // PUSH("<br clear=all>");   // PUSH("<p align=right><font size=-1 color=blue><a href=\"$docurl\"><font color=blue>"+roxen->real_version +"</font></a></font></p>");   // PUSH("</table>");    PUSH("</body>\n");    return stores(res*"");   }