Roxen.git/ server/ plugins/ protocols/ prot_hilfe.pike

2003-01-23

2003-01-23 16:21:02 by Martin Nilsson <mani@lysator.liu.se>

• 86903b279c385dd23c064b9f75f00e1789d7e52f (27 lines) (+13/-14) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

More cleanup

Rev: server/plugins/protocols/ftp.pike:2.87
Rev: server/plugins/protocols/http.pike:1.393
Rev: server/plugins/protocols/prot_ftp.pike:2.5
Rev: server/plugins/protocols/prot_ftps.pike:2.6
Rev: server/plugins/protocols/prot_hilfe.pike:2.17
Rev: server/plugins/protocols/prot_http.pike:2.7
Rev: server/plugins/protocols/prot_https.pike:2.8
Rev: server/plugins/protocols/prot_tetris.pike:2.6

24:    inherit RequestID;    string real_auth;    string remoteaddr = "127.0.0.1"; -  static string _sprintf() -  { -  return sprintf("RequestID(conf=%O; not_query=%O)", conf, not_query ); +  static string _sprintf(int t) { +  return t=='O' && sprintf("%O(conf=%O; not_query=%O)", this_program, +  conf, not_query );    }       static void create()
150:    this_program set_url( string url )    {    Configuration c; -  foreach( indices(roxen->urls), string u ) +  foreach(core->urls; string u; mixed q )    { -  mixed q = roxen->urls[u]; +     if( glob( u+"*", url ) ) -  if( (c = q->port->find_configuration_for_url(url, this_object(), 1 )) ) +  if( (c=q->port->find_configuration_for_url(url, this_object(), 1)) )    {    conf = c;    break;
164:    if(!c)    {    // pass 2: Find a configuration with the 'default' flag set. -  foreach( roxen->configurations, c ) +  foreach( core->configurations, c )    if( c->query( "default_server" ) )    {    conf = c;
176:    if(!c)    {    // pass 3: No such luck. Let's allow default fallbacks. -  foreach( indices(roxen->urls), string u ) +  foreach( core->urls; string u; mixed q )    { -  mixed q = roxen->urls[u]; -  if( (c = q->port->find_configuration_for_url( url,this_object(), 1 )) ) +  if( (c=q->port->find_configuration_for_url(url, this_object(), 1)) )    {    conf = c;    break;
224:       switch( words[1] ) {    case "accesses": -  foreach( roxen->configurations, Configuration c ) +  foreach( core->configurations, Configuration c )    if( c->inited ) {    c->pri[4]->first_modules += ({ InsinuateFirst() });    c->invalidate_cache();
296:    switch( state )    {    case USER: -  if(!(user = roxen.find_admin_user( line-"\n" ) ) ) +  if(!(user = core.find_admin_user( line-"\n" ) ) )    {    rl->readline->write("No such user: '"+(line-"\n")+"'\n");    }
408:      void create( mixed ... args )   { -  roxen.add_permission( "Hilfe", "Hilfe" ); -  roxen.set_up_hilfe_variables( this_object() ); +  core.add_permission( "Hilfe", "Hilfe" ); +  core.set_up_hilfe_variables( this_object() );    requesthandler = Connection;    ::create( @args );   }