5c5
< # $Id: Ticket.pm,v 1.338 2008/08/03 15:26:35 martin Exp $
---
> # $Id: Ticket.pm,v 1.338_cp 2008/08/03 15:26:35 martin Exp $
2471,2477c2471,2480
<     for (qw(Year Month Day Hour Minute)) {
<         if ( !defined $Param{ $Prefix . $Param{Counter} . $_ } ) {
<             $Self->{LogObject}->Log(
<                 Priority => 'error',
<                 Message  => "Need $Prefix" . $Param{Counter} . "$_!",
<             );
<             return;
---
>     my $TimeStamp;
>     if (!defined($Param{TimeStamp})) {
>         for (qw(Year Month Day Hour Minute)) {
>             if ( !defined $Param{ $Prefix . $Param{Counter} . $_ } ) {
>                 $Self->{LogObject}->Log(
>                     Priority => 'error',
>                     Message  => "Need $Prefix" . $Param{Counter} . "$_!",
>                 );
>                 return;
>             }
2479d2481
<     }
2481,2491c2483,2496
<     # generate time stamp to compare if update is needed
<     my $TimeStamp = sprintf(
<         "%04d-%02d-%02d %02d:%02d:00",
<         $Param{ $Prefix . $Param{Counter} . 'Year' },
<         $Param{ $Prefix . $Param{Counter} . 'Month' },
<         $Param{ $Prefix . $Param{Counter} . 'Day' },
<         $Param{ $Prefix . $Param{Counter} . 'Hour' },
<         $Param{ $Prefix . $Param{Counter} . 'Minute' },
<     );
<     if ( $TimeStamp eq '0000-00-00 00:00:00' ) {
<         $TimeStamp = '';
---
>         # generate time stamp to compare if update is needed
>         $TimeStamp = sprintf(
>             "%04d-%02d-%02d %02d:%02d:00",
>             $Param{ $Prefix . $Param{Counter} . 'Year' },
>             $Param{ $Prefix . $Param{Counter} . 'Month' },
>             $Param{ $Prefix . $Param{Counter} . 'Day' },
>             $Param{ $Prefix . $Param{Counter} . 'Hour' },
>             $Param{ $Prefix . $Param{Counter} . 'Minute' },
>         );
>         if ( $TimeStamp eq '0000-00-00 00:00:00' ) {
>             $TimeStamp = '';
>         }
>     } else {
>         $TimeStamp = $Param{TimeStamp};
3812a3818,3822
>         # get tickets with freetime older then now
>         if ( $Param{'TicketFreeTime'.$_.'OlderNow'} ) {
>             $SQLExt .= " AND st.freetime$_ <= Now()";
>         }
> 
4042c4052,4054
<         $Param{TicketPendingTimeOlderDate} = $Time;
---
>         $Param{TicketPendingTimeOlderDate} = $Self->{TimeObject}->SystemTime2TimeStamp(
>             SystemTime => $Time,
>         );
4049c4061,4063
<         $Param{TicketPendingTimeNewerDate} = $Time;
---
>         $Param{TicketPendingTimeNewerDate} = $Self->{TimeObject}->SystemTime2TimeStamp(
>             SystemTime => $Time,
>         );
4459a4474
>         OldState => $Ticket{State},
5670a5686,5694
>     my $Limit;
>     if ( $Param{Max} ) {
>         $Limit = " ORDER BY sh.create_time DESC, sh.id DESC"
>                . " LIMIT $Param{Max}";
>     } else {
>         $Limit = " ORDER BY sh.create_time, sh.id";
>     }
> 
> 
5675c5699
<             . ' ORDER BY sh.create_time, sh.id',
---
>             . $Limit,