Changeset 255

Show
Ignore:
Timestamp:
06/26/07 12:01:28 (1 year ago)
Author:
ludo
Message:

quick launch fixed. More retries for deletion. Scheduled hour bug fixed. (from r4525)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/webmin/lsc/include/command_launcher.inc.php

    r250 r255  
    176176                        lsc_command_on_host_set_executed_state($this->id_command_on_host, "WORK_IN_PROGRESS"); 
    177177                         
    178                         // Make go to directory command 
    179                         if ($this->command->path_destination == "") { 
     178                        // Go to destination directory  
     179                        if ($this->command->path_destination == "none") { 
     180                                // Quick launch: no file copy needed 
    180181                                $start_command = sprintf($this->command->start_file." ".$this->command->parameters); 
    181182                        } else { 
    …… 
    292293 
    293294                unset($output);unset($return_var);unset($return_var);unset($stdout);unset($stderr); 
    294                 $tries = 3; 
     295                $tries = 6; 
    295296                do { 
    296297                        $dir = clean_path($this->session->root_path.$this->command->path_destination); 

  • trunk/webmin/lsc/include/scheduler.inc.php

    r250 r255  
    194194         
    195195                $path_source = ""; 
    196                 $path_dest = ""; 
     196                $path_dest = "none"; 
    197197                $files = array(); 
    198198                $create_delete = false; 

  • trunk/webmin/lsc/repository.cgi

    r250 r255  
    274274                ($repository_start_date!="d?s que possible" && $repository_start_date!="ASAP" ) 
    275275        ) { 
    276                 list($date, $time) = split(" ? ", $repository_start_date); 
     276                list($date, $time) = split(" [^ ]* ", $repository_start_date); 
    277277                list($day, $month, $year) = split("-", $date); 
    278278                $start_date = $year."-".$month."-".$day." ".$time.":00"; 
    …… 
    284284                ($repository_end_date!="aucune" && $repository_end_date!="none") 
    285285        ) { 
    286                 list($date, $time) = split(" ? ", $repository_end_date); 
     286                list($date, $time) = split(" [^ ]* ", $repository_end_date); 
    287287                list($day, $month, $year) = split("-", $date); 
    288288                $end_date = $year."-".$month."-".$day." ".$time.":00";