Branch: Tag:

1997-02-13

1997-02-13 13:01:14 by Per Hedbor <ph@opera.com>

Many changes, now uses normal pike, and replace_master. Requires the new module system.

Rev: server/base_server/cache.pike:1.10
Rev: server/base_server/color.pike:1.6
Rev: server/base_server/config/builders.pike:1.4
Rev: server/base_server/config/describers.pike:1.18
Rev: server/base_server/config/draw_things.pike:1.17
Rev: server/base_server/config/low_describers.pike:1.4
Rev: server/base_server/configuration.pike:1.13
Rev: server/base_server/db.pike:1.5
Rev: server/base_server/disk_cache.pike:1.13
Rev: server/base_server/fonts.pike:1.2
Rev: server/base_server/hosts.pike:1.9
Rev: server/base_server/language.pike:1.7
Rev: server/base_server/mainconfig.pike:1.32
Rev: server/base_server/newdecode.pike:1.5
Rev: server/base_server/persistent.pike:1.5
Rev: server/base_server/read_config.pike:1.8
Rev: server/base_server/roxen.pike:1.36
Rev: server/base_server/roxenlib.pike:1.15
Rev: server/base_server/roxenloader.pike:1.7
Rev: server/base_server/socket.pike:1.4
Rev: server/etc/include/stdio.h:1.2(DEAD)
Rev: server/etc/roxen_master.pike:1.21
Rev: server/modules/directories/directories.pike:1.8
Rev: server/modules/filesystems/secure_fs.pike:1.6
Rev: server/modules/filesystems/userfs.pike:1.9
Rev: server/modules/graphics/graphic_text.pike:1.26
Rev: server/modules/misc/contenttypes.pike:1.6
Rev: server/modules/misc/ismap.pike:1.6
Rev: server/modules/misc/userdb.pike:1.9
Rev: server/modules/scripting/pikescript.pike:1.7
Rev: server/modules/tags/htmlparse.pike:1.22
Rev: server/protocols/http.pike:1.18

1:   inherit "config/builders"; - string cvs_version = "$Id: mainconfig.pike,v 1.31 1997/02/07 21:11:20 nisse Exp $"; + string cvs_version = "$Id: mainconfig.pike,v 1.32 1997/02/13 13:00:57 per Exp $";   inherit "roxenlib";   inherit "config/draw_things";    -  + import Stdio; + import Array; +    #include <confignode.h>   #include <module.h>   
244:    switch(type)    {    case TYPE_MODULE_LIST: -  return map_array(var/"\000", find_module); +  return map(var/"\000", find_module);       case TYPE_MODULE:    return find_module(var, node->config());
289:       case TYPE_DIR_LIST:    array foo; -  foo=map_array((var-" ")/",", lambda(string var, object node) { -  if (!strlen( var ) || file_size( var ) != -2) +  foo=map((var-" ")/",", lambda(string var, object node) { +  if (!strlen( var ) || file_stat( var )[1] != -2)    {    if(node->error)    node->error += ", " +var + " is not a directory";
308:    return foo;       case TYPE_DIR: -  if (!strlen( var ) || file_size( var ) != -2) +  if (!strlen( var ) || file_stat( var )[1] != -2)    {    node->error = var + " is not a directory";    return 0;
354:    if(node->data[VAR_MISC])    return (int)var;    else -  return map_array((var-" ")/",", lambda(string s){ +  return map((var-" ")/",", lambda(string s){    return (int)s;    });   
413:      string new_configuration_form()   { -  return replace(default_head("")+read_bytes("etc/newconfig.html"), ({"$COPIES","$configurl"}), +  return replace(default_head("")+ read_bytes("etc/newconfig.html"), +  ({"$COPIES","$configurl"}),    ({configuration_list(),CONFIG_URL})) +    "\n\n</body>";   }
821:    "Errors":"/Errors",   ]);    - constant tabs = ({ + array tabs = ({    "Configurations",    "Globals",    "Status",    "Errors",   });    - constant tab_names = ({ + array tab_names = ({    " Virtual servers ",    " Global variables ",    " Status info ",
865:   }       - object module_font = Font()->load("base_server/config/font"); - object button_font = Font()->load("base_server/config/button_font"); + object module_font = get_font("base_server/config/font",0,0,0,"left",1.0,1.0); + object button_font = get_font("base_server/config/button_font",0,0,0,"left",1.0,1.0);      mapping auto_image(string in, object id)   {
1005:    // _above_ them. This is supposed to be some nice introductory    // text about the configuration interface...    return http_string_answer(default_head("Roxen Challenger")+ -  display_tabular_header(root)+read_bytes("etc/config.html"),"text/html"); +  display_tabular_header(root)+ +  read_bytes("etc/config.html"),"text/html");    }       if(sizeof(id->prestate))
1193:    roxen->remove_configuration(o->data->name);       if(roxen->configurations[i]->ports_open) -  map_array(values(roxen->configurations[i]->ports_open), destruct); +  map(values(roxen->configurations[i]->ports_open), destruct);    destruct(roxen->configurations[i]);       roxen->configurations =