Roxen.git/ server/ base_server/ mainconfig.pike

1998-02-10

1998-02-10 18:36:21 by Per Hedbor <ph@opera.com>

• e5bad2a884ffb5e57effe6de7069bc486e4c5a9b (23 lines) (+12/-11) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixes...

Rev: server/base_server/cache.pike:1.19
Rev: server/base_server/color.pike:1.13
Rev: server/base_server/configuration.pike:1.94
Rev: server/base_server/disk_cache.pike:1.34
Rev: server/base_server/dummy_hosts.pike:1.5
Rev: server/base_server/html.pike:1.4
Rev: server/base_server/language.pike:1.12
Rev: server/base_server/lock.pike:1.3(DEAD)
Rev: server/base_server/mainconfig.pike:1.94
Rev: server/base_server/module_support.pike:1.15
Rev: server/base_server/newdecode.pike:1.7
Rev: server/base_server/privs.pike:1.33
Rev: server/base_server/read_config.pike:1.20
Rev: server/base_server/roxen.pike:1.166
Rev: server/base_server/roxenlib.pike:1.47
Rev: server/base_server/roxenloader.pike:1.58
Rev: server/base_server/smartpipe.pike:1.1
Rev: server/base_server/socket.pike:1.11
Rev: server/modules/filesystems/filesystem.pike:1.27
Rev: server/modules/filesystems/restrictedfs.pike:1.8
Rev: server/modules/filesystems/userfs.pike:1.18
Rev: server/modules/filters/htaccess.pike:1.29
Rev: server/modules/filters/redirect.pike:1.12
Rev: server/modules/graphics/graphic_text.pike:1.101
Rev: server/modules/misc/contenttypes.pike:1.11
Rev: server/modules/misc/demo.pike:1.2
Rev: server/modules/misc/ismap.pike:1.11
Rev: server/modules/misc/userdb.pike:1.24
Rev: server/modules/misc/ypuserdb.pike:1.7
Rev: server/protocols/http.pike:1.54

1:   inherit "config/builders"; - string cvs_version = "$Id: mainconfig.pike,v 1.93 1998/02/05 01:09:55 grubba Exp $"; + string cvs_version = "$Id: mainconfig.pike,v 1.94 1998/02/10 18:36:05 per Exp $";   //inherit "roxenlib";      inherit "config/draw_things";    - import Array; - import Stdio; + // import Array; + // import Stdio;      string status_row(object node);   string display_tabular_header(object node);
372:    return node->data[ VAR_MISC ][2]( var, type, node, allvars );       case TYPE_MODULE_LIST: -  return map(var/"\000", find_module); +  return Array.map(var/"\000", find_module);       case TYPE_MODULE:    return find_module(var, node->config());
423:       case TYPE_DIR_LIST:    array foo; -  foo=map((var-" ")/",", lambda(string var, object node) { -  if (!strlen( var ) || file_size( var ) != -2) +  foo=Array.map((var-" ")/",", lambda(string var, object node) { +  if (!strlen( var ) || Stdio.file_size( var ) != -2)    {    if(node->error)    node->error += ", " +var + " is not a directory";
490:    if(node->data[VAR_MISC])    return (int)var;    else -  return map((var-" ")/",", lambda(string s){ +  return Array.map((var-" ")/",", lambda(string s){    return (int)s;    });   
727:    }       a=roxen->allmodules; -  mods=sort_array(indices(a), lambda(string a, string b, mapping m) { +  mods=Array.sort_array(indices(a), lambda(string a, string b, mapping m) {    return m[a][0] > m[b][0];    }, a);   
949:       res = default_head("Welcome to Roxen Challenger");    -  res += read_bytes("etc/welcome.html"); +  res += Stdio.read_bytes("etc/welcome.html");    if(error && strlen(error))    res += "<blockquote>\n<p><b>"+error+"</b>";   
1301:    return http_string_answer(default_head("Roxen Challenger")+    status_row(root)+    display_tabular_header(root)+ -  read_bytes(full_version?"etc/config.html": +  Stdio.read_bytes(full_version?"etc/config.html":    "etc/config.int.html"), "text/html");    }   
1497:    roxen->remove_configuration(o->data->name);       if(roxen->configurations[i]->ports_open) -  map(values(roxen->configurations[i]->ports_open), destruct); +  Array.map(values(roxen->configurations[i]->ports_open), destruct);    destruct(roxen->configurations[i]);       roxen->configurations =