Roxen.git/ server/ etc/ modules/ Variable.pmod/ Schedule.pike

2002-04-25

2002-04-25 14:59:06 by Anders Johansson <anders@roxen.com>

• 4dbfcf286a079a25a7fcf819ebe996e8394c247a (30 lines) (+13/-17) ^{[ Show | Annotate ]}
  Branch: 5.2

This version might actually work as expected with fixed times.

Rev: server/etc/modules/Variable.pmod/Schedule.pike:1.5

78:   {    from->hour = 0;    if(from->wday<day) { -  from->wday = day; -  return from; +  return localtime(mktime(from) + (day - from->wday)*3600*24);    } -  return localtime(mktime(from) + (7-from->wday)*3600*24 + day*3600*24); +  return localtime(mktime(from) + (7 - from->wday + day)*3600*24);   }      private mapping next_or_same_time(mapping from, int hour, void|int delta)
96:    from->hour = hour;    return from;    } -  return localtime(mktime(from) + (24-from->hour)*3600 + delta + hour*3600); +  return localtime(mktime(from) + (24 - from->hour + hour)*3600 + delta);   }      int get_next( int last )
124:       mapping m = localtime( last || time(1) );    m->min = m->sec = 0; -  if( !last ) -  { -  if( !vals[3] ) -  return mktime( next_or_same_time( m, vals[4] ) ); -  return mktime( next_or_same_time( -  next_or_same_day( m, vals[3]-1 ), -  vals[4], 7*24*3600 ) ); +  if( !vals[3] ) { +  for(int i; i<vals[2]; i++) +  m = next_or_same_time( m, vals[4] ); +  return mktime(m);    } -  -  m->hour = 0; -  if(!vals[3]) -  return mktime(m)+vals[2]*24*3600 + vals[4]*3600; +     for(int i; i<vals[2]; i++) -  m = next_day(m, vals[3]-1); -  return mktime(m) + vals[4]*3600; +  { +  m = next_or_same_time( next_or_same_day( m, vals[3]-1 ), +  vals[4], 6*24*3600 );    } -  +  return mktime(m); + }      string render_form( RequestID id, void|mapping additional_args )   {